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

CSS improvements

Browse source 
- btn-group: merge buttons in button-groups
- nav-pills: support non-stacked nav-pills
- attributesBar--border: adds a border to the attributesBar
This commit is contained in:
Felix Niklas 2017-09-22 17:29:40 +02:00
parent d68d867866
commit 1cb4db2448
1 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -446,7 +446,6 @@ pre code.hljs {
.icon { .icon {
margin: -2px 5px 0 -2px; margin: -2px 5px 0 -2px;
fill: hsl(0,0%,60%);
} }
.icon:only-child { .icon:only-child {
@ -478,7 +477,6 @@ pre code.hljs {
color: white; color: white;
.icon { .icon {
fill: currentColor;
opacity: 1; opacity: 1;
} }
} }
@ -521,15 +519,12 @@ pre code.hljs {
&.btn--text { &.btn--text {
color: $supergood-color; color: $supergood-color;
} }
.icon {
fill: white;
}
} }
&.btn--danger { &.btn--danger {
color: white; color: white;
background: hsl(0,65%,55%); background: hsl(0,65%,55%);
&:active { &:active {
background: hsl(0,65%,45%); background: hsl(0,65%,45%);
} }
@ -555,7 +550,6 @@ pre code.hljs {
text-align: start; text-align: start;
.icon { .icon {
fill: currentColor;
opacity: 1; opacity: 1;
} }
@ -733,9 +727,22 @@ pre code.hljs {
border-top: 1px solid hsl(240,2%,92%); border-top: 1px solid hsl(240,2%,92%);
} }
.btn + .btn { .btn {
&:not(:first-child) {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
&:not(:last-child) {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-right-width: 0;
}
+ .btn {
@include bidi-style(margin-left, 0, margin-right, 10px); @include bidi-style(margin-left, 0, margin-right, 10px);
} }
}
.btn--text, .btn--textLarge { .btn--text, .btn--textLarge {
padding: 6px 10px 5px; /* reporting main.eco */ padding: 6px 10px 5px; /* reporting main.eco */
@ -3890,23 +3897,28 @@ footer {
.nav-pills > li > a, .nav-pills > li > a,
.nav-pills > li > a:focus, .nav-pills > li > a:focus,
.nav-pills > li > a:active { .nav-pills > li > a:active {
padding: 0;
height: 40px;
color: #0f94d6; color: #0f94d6;
line-height: 39px;
border-radius: 0; border-radius: 0;
border-top: 1px solid #f2f2f3;
background: transparent; /* a:focus, a:active with bg: transparent fixes gray focus bg in IE 10 */ background: transparent; /* a:focus, a:active with bg: transparent fixes gray focus bg in IE 10 */
display: flex; display: flex;
@extend .u-textTruncate; @extend .u-textTruncate;
} }
.nav-pills.nav-stacked > li > a,
.nav-pills.nav-stacked > li > a:focus,
.nav-pills.nav-stacked > li > a:active {
padding: 0;
height: 40px;
line-height: 39px;
border-top: 1px solid #f2f2f3;
}
.nav-pills > li:hover > a { .nav-pills > li:hover > a {
background: #f2f2f3; background: #f2f2f3;
} }
.nav-pills > li:hover > a, .nav-pills.nav-stacked > li:hover > a,
.nav-pills > li:hover + li:not(.active) > a { .nav-pills.nav-stacked > li:hover + li:not(.active) > a {
border-color: transparent; border-color: transparent;
} }
@ -3918,10 +3930,10 @@ footer {
border-color: initial; border-color: initial;
} }
.nav-pills > li:hover > a, .nav-pills.nav-stacked > li:hover > a,
.nav-pills > li.active > a, .nav-pills.nav-stacked > li.active > a,
.nav-pills > li.active > a:hover, .nav-pills.nav-stacked > li.active > a:hover,
.nav-pills > li.active > a:focus { .nav-pills.nav-stacked > li.active > a:focus {
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
margin-left: -10px; margin-left: -10px;
@ -5636,6 +5648,10 @@ footer {
&.is-closed { &.is-closed {
margin-bottom: -60px; margin-bottom: -60px;
} }
&--border {
border-top: 1px solid hsl(0,0%,94%);
}
} }
.newTicket { .newTicket {