vendor/assets/stylesheets/_trunk.scss in active_frontend-11.1.0 vs vendor/assets/stylesheets/_trunk.scss in active_frontend-12.0.0
- old
+ new
@@ -6,21 +6,27 @@
/* # Trunk
================================================== */
.trunk {
background: $color-white;
- border-bottom: 1px solid $color-haze;
+ border-bottom: 1px solid;
+ border-color: $color-haze;
+ color: $color-gray;
left: 0;
position: fixed;
right: 0;
top: 50px;
z-index: 1040;
}
-.trunk-buffer { padding: 30px 0; }
+.trunk-buffer {
+ border-color: inherit !important;
+ padding: 30px 0;
+}
.trunk-nav,
.trunk-user {
- list-style-type: none;
+ border-color: inherit !important;
+ list-style: none;
margin: 0;
padding: 0;
}
.trunk-user {
margin: 10px auto 0 auto;
@@ -33,26 +39,28 @@
font-weight: 500;
line-height: 1;
margin: 5px;
}
.trunk-nav > li {
+ border-color: inherit;
float: left;
width: calc(33.333333% - 10px);
}
.trunk-nav > li.title,
.trunk-nav > li.divider {
- border-top: 1px solid $color-haze;
+ border-top: 1px solid;
+ border-color: inherit;
box-sizing: border-box;
display: block;
float: none;
margin: 0 0 0 5px;
overflow: hidden;
width: calc(100% - 10px);
}
.trunk-nav > li.title {
- border-bottom: 1px solid $color-haze;
- color: $color-primary;
+ border-bottom: 1px solid;
+ border-color: inherit;
font-size: 12px;
letter-spacing: 1px;
padding: 8px 10px;
text-transform: uppercase;
}
@@ -64,11 +72,10 @@
}
.trunk-nav > li > a,
.trunk-user > li > a {
@include appearance(none);
border-radius: 2px;
- color: $color-dark-gray;
cursor: pointer;
display: block;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 11px;
@@ -81,11 +88,14 @@
text-transform: uppercase;
@include transition(all 0.3s linear);
vertical-align: middle;
white-space: nowrap;
}
-.trunk-nav > li > a { border: 1px solid $color-haze; }
+.trunk-nav > li > a {
+ border: 1px solid;
+ border-color: inherit;
+}
.trunk-user > li > a { padding: 9px 0 8px 0; }
.trunk-nav > li > a:hover,
.trunk-nav > li > a:active,
.trunk-nav > li > a.active,
.trunk-nav > li > a:focus,
@@ -116,42 +126,15 @@
/* # Colors
================================================== */
.trunk-dark {
background: $color-black;
border-color: $color-dark-black;
+ color: $color-white;
}
-.trunk-dark .trunk-nav > li.title,
-.trunk-dark .trunk-nav > li > a,
-.trunk-dark .trunk-user > li > a { color: $color-gray; }
-.trunk-dark .trunk-nav > li.title,
-.trunk-dark .trunk-nav > li.divider,
-.trunk-dark .trunk-nav > li > a { border-color: $color-gray; }
-.trunk-dark .trunk-nav > li > a:hover,
-.trunk-dark .trunk-nav > li > a:active,
-.trunk-dark .trunk-nav > li > a.active,
-.trunk-dark .trunk-nav > li > a:focus,
-.trunk-dark .trunk-user > li > a:hover,
-.trunk-dark .trunk-user > li > a:active,
-.trunk-dark .trunk-user > li > a.active,
-.trunk-dark .trunk-user > li > a:focus {
- border-color: $color-primary;
- color: $color-primary;
-}
.trunk-light {
background: $color-light-haze;
border-color: $color-dark-haze;
}
-.trunk-light .trunk-nav > li.title,
-.trunk-light .trunk-nav > li.divider,
-.trunk-light .trunk-nav > li > a { border-color: $color-dark-haze; }
-.trunk-light .trunk-nav > li > a:hover,
-.trunk-light .trunk-nav > li > a:active,
-.trunk-light .trunk-nav > li > a.active,
-.trunk-light .trunk-nav > li > a:focus,
-.trunk-light .trunk-user > li > a:hover,
-.trunk-light .trunk-user > li > a:active,
-.trunk-light .trunk-user > li > a.active,
-.trunk-light .trunk-user > li > a:focus { border-color: $color-primary; }
/* # Media Queries
================================================== */
@media
only screen and (-webkit-min-device-pixel-ratio: 2),
\ No newline at end of file