Merge branch 'master' into annotate_agents_that_do_not_make_events
Andrew Cantino
2 changed files with 9 additions and 1 deletions
+ 4
- 0
app/views/layouts/_navigation.html.erb
@@ -36,6 +36,10 @@ |
||
| 36 | 36 |
</li> |
| 37 | 37 |
|
| 38 | 38 |
<li> |
| 39 |
+ <%= link_to 'About', 'https://github.com/cantino/huginn', :tabindex => "-1" %> |
|
| 40 |
+ </li> |
|
| 41 |
+ |
|
| 42 |
+ <li> |
|
| 39 | 43 |
<% if user_signed_in? %> |
| 40 | 44 |
<%= link_to 'Logout', destroy_user_session_path, :method => :delete, :tabindex => "-1" %> |
| 41 | 45 |
<% else %> |
+ 5
- 1
vendor/assets/stylesheets/jquery.json-editor.css.scss
@@ -52,8 +52,12 @@ |
||
| 52 | 52 |
display: block; |
| 53 | 53 |
float: right; |
| 54 | 54 |
text-decoration: none; |
| 55 |
- padding-left: 5px; |
|
| 55 |
+ padding: 0 5px; |
|
| 56 | 56 |
border: 0 !important; |
| 57 | 57 |
color: blue; |
| 58 |
+ |
|
| 59 |
+ &:hover {
|
|
| 60 |
+ background-color: #bbb; |
|
| 61 |
+ } |
|
| 58 | 62 |
} |
| 59 | 63 |
} |