Commit e0172564 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Fix transitions

parent ee85ca73
.page-with-contextual-sidebar { .page-with-contextual-sidebar {
transition: padding-left, $sidebar-transition-duration; transition: padding-left $sidebar-transition-duration;
@media (min-width: $screen-md-min) { @media (min-width: $screen-md-min) {
padding-left: $contextual-sidebar-collapsed-width; padding-left: $contextual-sidebar-collapsed-width;
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
width: $contextual-sidebar-width; width: $contextual-sidebar-width;
a { a {
transition: padding, $sidebar-transition-duration; transition: padding $sidebar-transition-duration;
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
} }
.nav-sidebar { .nav-sidebar {
transition: width, $sidebar-transition-duration; transition: width $sidebar-transition-duration, left $sidebar-transition-duration;
position: fixed; position: fixed;
z-index: 400; z-index: 400;
width: $contextual-sidebar-width; width: $contextual-sidebar-width;
...@@ -128,10 +128,10 @@ ...@@ -128,10 +128,10 @@
white-space: nowrap; white-space: nowrap;
a { a {
transition: padding, $sidebar-transition-duration; transition: padding $sidebar-transition-duration;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 12px 16px; padding: 12px 15px;
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
} }
...@@ -291,7 +291,8 @@ ...@@ -291,7 +291,8 @@
> a { > a {
margin-left: 4px; margin-left: 4px;
padding-left: 12px; // Subtract width of left border on active element
padding-left: 11px;
} }
.badge { .badge {
...@@ -316,7 +317,7 @@ ...@@ -316,7 +317,7 @@
.toggle-sidebar-button, .toggle-sidebar-button,
.close-nav-button { .close-nav-button {
width: $contextual-sidebar-width - 2px; width: $contextual-sidebar-width - 2px;
transition: width, $sidebar-transition-duration; transition: width $sidebar-transition-duration;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
padding: 16px; padding: 16px;
...@@ -354,7 +355,7 @@ ...@@ -354,7 +355,7 @@
.sidebar-collapsed-desktop { .sidebar-collapsed-desktop {
.context-header { .context-header {
height: 61px; height: 60px;
width: $contextual-sidebar-collapsed-width; width: $contextual-sidebar-collapsed-width;
a { a {
...@@ -362,10 +363,6 @@ ...@@ -362,10 +363,6 @@
} }
} }
li a {
padding: 12px 15px;
}
.sidebar-top-level-items > li { .sidebar-top-level-items > li {
&.active a { &.active a {
padding-left: 12px; padding-left: 12px;
......
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