Commit 13720759 by Matt Toback

Merge pull request #4089 from grafana/matt-weekend-ui

Matt weekend ui
parents bf4a00b6 a2731da9
// MIXINS // MIXINS
@import "mixins/mixins"; @import "mixins/mixins";
@import "mixins/animations";
@import "mixins/buttons"; @import "mixins/buttons";
@import "mixins/breakpoints"; @import "mixins/breakpoints";
@import "mixins/grid"; @import "mixins/grid";
......
...@@ -207,6 +207,7 @@ $navbarButtonBackgroundHighlight: lighten($navbarBackground, 5%); ...@@ -207,6 +207,7 @@ $navbarButtonBackgroundHighlight: lighten($navbarBackground, 5%);
// ------------------------- // -------------------------
$side-menu-bg: $body-bg; $side-menu-bg: $body-bg;
$side-menu-item-hover-bg: $dark-4; $side-menu-item-hover-bg: $dark-4;
$side-menu-opacity: 0.97;
// Pagination // Pagination
// ------------------------- // -------------------------
......
...@@ -162,6 +162,7 @@ $input-label-bg: $gray-5; ...@@ -162,6 +162,7 @@ $input-label-bg: $gray-5;
// ------------------------- // -------------------------
$side-menu-bg: $body-bg; $side-menu-bg: $body-bg;
$side-menu-item-hover-bg: $gray-6; $side-menu-item-hover-bg: $gray-6;
$side-menu-opacity: 0.97;
// search // search
$search-shadow: 0 5px 30px 0 lighten($gray-2, 30%); $search-shadow: 0 5px 30px 0 lighten($gray-2, 30%);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
top: 52px; top: 52px;
left: 0; left: 0;
width: $side-menu-width; width: $side-menu-width;
background-color: $side-menu-bg; background-color: rgba($side-menu-bg,$side-menu-opacity);
z-index: 101; z-index: 101;
transform: translate3d(0, -100%, 0); transform: translate3d(0, -100%, 0);
visibility: hidden; visibility: hidden;
...@@ -65,15 +65,15 @@ ...@@ -65,15 +65,15 @@
opacity: 0; opacity: 0;
top: 0px; top: 0px;
left: $side-menu-width; left: $side-menu-width;
background-color: $side-menu-bg; background-color: rgba($side-menu-bg,$side-menu-opacity);
animation: dropdown-anim 100ms ease-in-out 150ms forwards; @include animation('dropdown-anim 100ms ease-in-out 100ms forwards');
z-index: -9999; z-index: -9999;
} }
} }
} }
} }
@keyframes dropdown-anim { @include keyframes(dropdown-anim) {
0% { 0% {
display: none; display: none;
opacity: 0; opacity: 0;
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
} }
100% { 100% {
opacity: 1; opacity: 1;
transform: translate3d(0,0,0) transform: translate3d(0,0,0);
} }
} }
......
@mixin keyframes($animation-name) {
@-webkit-keyframes #{$animation-name} {
@content;
}
@-moz-keyframes #{$animation-name} {
@content;
}
@-ms-keyframes #{$animation-name} {
@content;
}
@-o-keyframes #{$animation-name} {
@content;
}
@keyframes #{$animation-name} {
@content;
}
}
@mixin animation($str) {
-webkit-animation: #{$str};
-moz-animation: #{$str};
-ms-animation: #{$str};
-o-animation: #{$str};
animation: #{$str};
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment