Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix active style in menu dropdown

Browse source
This commit is contained in:
Felix Niklas 2016-02-02 11:46:10 +01:00
parent 15a3430ee8
commit 66529a749f
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile.lock
View file

@ -156,6 +156,7 @@ GEM
multi_json (1.11.2) multi_json (1.11.2)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql2 (0.3.20)
naught (1.1.0) naught (1.1.0)
nenv (0.2.0) nenv (0.2.0)
net-ldap (0.13.0) net-ldap (0.13.0)
@ -195,7 +196,6 @@ GEM
omniauth-oauth (~> 1.1) omniauth-oauth (~> 1.1)
parser (2.3.0.2) parser (2.3.0.2)
ast (~> 2.2) ast (~> 2.2)
pg (0.18.4)
pluginator (1.3.0) pluginator (1.3.0)
power_assert (0.2.7) power_assert (0.2.7)
powerpack (0.1.1) powerpack (0.1.1)
@ -347,13 +347,13 @@ DEPENDENCIES
libv8 libv8
mail mail
mime-types mime-types
mysql2 (~> 0.3.20)
net-ldap net-ldap
omniauth omniauth
omniauth-facebook omniauth-facebook
omniauth-google-oauth2 omniauth-google-oauth2
omniauth-linkedin omniauth-linkedin
omniauth-twitter omniauth-twitter
pg
pre-commit pre-commit
puma puma
rack-livereload rack-livereload

2
app/assets/javascripts/app/views/navigation/menu.jst.eco
View file

@ -16,7 +16,7 @@
<% if item.navheader: %> <% if item.navheader: %>
<li class="dropdown-header"><%- @T( item.navheader ) %></li> <li class="dropdown-header"><%- @T( item.navheader ) %></li>
<% end %> <% end %>
<li class="<% if @active_tab[item.target] : %>active<% end %>"><a href="<%= item.target %>"><%- @T( item.name ) %><% if item['count'] isnt undefined: %><span class="badge badge--text count"><%= item['count'] %></span><% end %></a></li> <li<%- ' class="is-active"' if @active_tab[item.target] %>><a href="<%= item.target %>"><%- @T( item.name ) %><% if item['count'] isnt undefined: %><span class="badge badge--text count"><%= item['count'] %></span><% end %></a></li>
<% end %> <% end %>
</ul> </ul>
</div> </div>

8
app/assets/stylesheets/zammad.scss
View file

@ -5503,7 +5503,7 @@ footer {
color: hsl(198,19%,72%); color: hsl(198,19%,72%);
} }
.dropdown-menu.dropdown-menu--light > li > a { .dropdown-menu.dropdown-menu--light > li {
color: hsl(202,70%,49%); color: hsl(202,70%,49%);
} }
@ -5512,10 +5512,12 @@ footer {
background: rgba(0,0,0,.05); background: rgba(0,0,0,.05);
} }
.dropdown-menu.dropdown-menu--light li:hover, .dropdown-menu.dropdown-menu--light li:hover {
.dropdown-menu.dropdown-menu--light li.is-active {
background: none; background: none;
} }
.dropdown-menu.dropdown-menu--light li.is-active {
color: white;
}
.dropdown ul { .dropdown ul {
margin: 0; margin: 0;