summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-05-24 11:30:53 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-05-25 17:14:28 -0500
commit3c3402b0ae4c2f70cc421d97ad9605a9abeb9398 (patch)
treea2155f2f0e6fa633fcbdda0e09cf23600db547be /app/assets/stylesheets
parent77c7fb1469446c76c84ce5883d99e0e3debaf515 (diff)
downloadgitlab-ce-3c3402b0ae4c2f70cc421d97ad9605a9abeb9398.tar.gz
Add fade out to left side of layout nav; remove dropdown nav helper; remove controls button from mobile
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework/nav.scss64
1 files changed, 29 insertions, 35 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index bf5981bef8b..260127e3111 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -1,3 +1,24 @@
+@mixin fade($gradient-direction) {
+ visibility: visible;
+ opacity: 1;
+ position: absolute;
+ bottom: 16px;
+ width: 43px;
+ height: 30px;
+ transition-duration: .3s;
+ -webkit-transform: translateZ(0);
+ background: -webkit-linear-gradient($gradient-direction, rgba(250, 250, 250, 0.4), $background-color 45%);
+ background: -o-linear-gradient($gradient-direction, rgba(250, 250, 250, 0.4), $background-color 45%);
+ background: -moz-linear-gradient($gradient-direction, rgba(250, 250, 250, 0.4), $background-color 45%);
+ background: linear-gradient($gradient-direction, rgba(250, 250, 250, 0.4), $background-color 45%);
+
+ &.end-scroll {
+ visibility: hidden;
+ opacity: 0;
+ transition-duration: .3s;
+ }
+}
+
.nav-links {
padding: 0;
margin: 0;
@@ -210,12 +231,7 @@
padding: 7px 0 0;
@media (max-width: $screen-xs-min) {
- float: none;
- padding: 0 9px;
-
- .dropdown-new {
- width: 100%;
- }
+ display: none;
}
i {
@@ -256,31 +272,14 @@
display: none;
}
- .fade-out {
- visibility: visible;
- opacity: 1;
- position: absolute;
- bottom: 16px;
+ .fade-right {
+ @include fade(left);
right: 0;
- width: 43px;
- height: 30px;
- -webkit-transform: translateZ(0);
- background: -webkit-linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
- background: -o-linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
- background: -moz-linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
- background: linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
-
- &.end-scroll {
- visibility: hidden;
- opacity: 0;
- transition-duration: .3s;
- }
}
- @media (max-width: 790px) {
- .fade-out {
- transition-duration: .3s;
- }
+ .fade-left {
+ @include fade(right);
+ left: 0;
}
li {
@@ -306,7 +305,8 @@
}
.nav-control {
- .fade-out {
+
+ .fade-right {
right: 58px;
@media (min-width: $screen-xs-max) {
@@ -322,12 +322,6 @@
.page-with-layout-nav {
margin-top: $header-height + 2;
- &.controls-dropdown-visible {
- @media (max-width: $screen-xs-min) {
- margin-top: 96px;
- }
- }
-
.right-sidebar {
top: ($header-height * 2) + 2;
}