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

style dropdown header

Browse source
This commit is contained in:
Felix Niklas 2015-05-28 12:00:03 +02:00
parent 9498faaa1e
commit 48ca4ef92a
3 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/views/navigation/personal.jst.eco
View file

@ -10,8 +10,8 @@
<% end %> <% end %>
</a> </a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<% for item in item.child: %> <% for item, id in item.child: %>
<% if item.divider: %> <% if item.divider and id > 0: %>
<li class="divider"></li> <li class="divider"></li>
<% end %> <% end %>
<% if item.navheader: %> <% if item.navheader: %>

8
app/assets/stylesheets/bootstrap.css vendored
View file

@ -2638,14 +2638,6 @@ tbody.collapse.in {
right: auto; right: auto;
left: 0; left: 0;
} }
.dropdown-header {
display: block;
padding: 3px 20px;
font-size: 12px;
line-height: 1.42857143;
color: #777;
white-space: nowrap;
}
.dropdown-backdrop { .dropdown-backdrop {
position: fixed; position: fixed;
top: 0; top: 0;

19
app/assets/stylesheets/zammad.css.scss
View file

@ -1979,7 +1979,6 @@ footer {
.user-menu .dropdown-menu > li > a { .user-menu .dropdown-menu > li > a {
height: 40px; height: 40px;
padding: 0 15px;
color: #2594d4; color: #2594d4;
display: flex; display: flex;
} }
@ -3988,7 +3987,7 @@ footer {
margin: 0; margin: 0;
padding: 0; padding: 0;
min-width: 100%; min-width: 100%;
color: white; color: hsl(198,19%,72%);
text-transform: initial; text-transform: initial;
letter-spacing: 0; letter-spacing: 0;
background: hsl(234,10%,19%); background: hsl(234,10%,19%);
@ -4014,8 +4013,10 @@ footer {
margin: 0; margin: 0;
} }
.dropdown li { .dropdown li,
height: 40px; .dropup li {
height: 39px;
line-height: 38px;
padding: 0 15px; padding: 0 15px;
} }
@ -4034,9 +4035,9 @@ footer {
} }
.dropdown-menu > li > a { .dropdown-menu > li > a {
height: 40px;
line-height: 39px;
color: white; color: white;
padding: 0 15px;
margin: 0 -15px;
} }
.dropdown-menu > li > a:hover { .dropdown-menu > li > a:hover {
@ -4050,7 +4051,6 @@ footer {
.dropdown.dropdown--actions { .dropdown.dropdown--actions {
li { li {
padding: 0;
display: flex; display: flex;
align-items: center; align-items: center;
} }
@ -4079,6 +4079,11 @@ footer {
} }
} }
li.dropdown-header {
line-height: 36px;
height: 32px;
}
.recipientList, .recipientList,
.recipientList-organizationMembers { .recipientList-organizationMembers {
list-style: none; list-style: none;