Commit 70d9401a authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Replace all instances of new-sidebar with contextual-sidebar

parent a4416c39
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
@import "framework/secondary-navigation-elements"; @import "framework/secondary-navigation-elements";
@import "framework/selects"; @import "framework/selects";
@import "framework/sidebar"; @import "framework/sidebar";
@import "framework/new-sidebar"; @import "framework/contextual-sidebar";
@import "framework/tables"; @import "framework/tables";
@import "framework/notes"; @import "framework/notes";
@import "framework/tabs"; @import "framework/tabs";
......
@import "framework/variables";
@import 'framework/tw_bootstrap_variables';
@import "bootstrap/variables";
$active-background: rgba(0, 0, 0, .04); $active-background: rgba(0, 0, 0, .04);
$active-hover-background: $active-background; $active-hover-background: $active-background;
$active-hover-color: $gl-text-color; $active-hover-color: $gl-text-color;
...@@ -9,16 +5,16 @@ $inactive-badge-background: rgba(0, 0, 0, .08); ...@@ -9,16 +5,16 @@ $inactive-badge-background: rgba(0, 0, 0, .08);
$hover-background: rgba(0, 0, 0, .06); $hover-background: rgba(0, 0, 0, .06);
$hover-color: $gl-text-color; $hover-color: $gl-text-color;
$inactive-color: $gl-text-color-secondary; $inactive-color: $gl-text-color-secondary;
$new-sidebar-width: 220px; $contextual-sidebar-width: 220px;
$new-sidebar-collapsed-width: 50px; $contextual-sidebar-collapsed-width: 50px;
.page-with-new-sidebar { .page-with-contextual-sidebar {
@media (min-width: $screen-md-min) { @media (min-width: $screen-md-min) {
padding-left: $new-sidebar-collapsed-width; padding-left: $contextual-sidebar-collapsed-width;
} }
@media (min-width: $screen-lg-min) { @media (min-width: $screen-lg-min) {
padding-left: $new-sidebar-width; padding-left: $contextual-sidebar-width;
} }
// Override position: absolute // Override position: absolute
...@@ -34,7 +30,7 @@ $new-sidebar-collapsed-width: 50px; ...@@ -34,7 +30,7 @@ $new-sidebar-collapsed-width: 50px;
.page-with-icon-sidebar { .page-with-icon-sidebar {
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
padding-left: $new-sidebar-collapsed-width; padding-left: $contextual-sidebar-collapsed-width;
} }
} }
...@@ -85,7 +81,7 @@ $new-sidebar-collapsed-width: 50px; ...@@ -85,7 +81,7 @@ $new-sidebar-collapsed-width: 50px;
.nav-sidebar { .nav-sidebar {
position: fixed; position: fixed;
z-index: 400; z-index: 400;
width: $new-sidebar-width; width: $contextual-sidebar-width;
transition: left $sidebar-transition-duration; transition: left $sidebar-transition-duration;
top: $header-height; top: $header-height;
bottom: 0; bottom: 0;
...@@ -103,7 +99,7 @@ $new-sidebar-collapsed-width: 50px; ...@@ -103,7 +99,7 @@ $new-sidebar-collapsed-width: 50px;
&.sidebar-icons-only { &.sidebar-icons-only {
width: auto; width: auto;
min-width: $new-sidebar-collapsed-width; min-width: $contextual-sidebar-collapsed-width;
.nav-sidebar-inner-scroll { .nav-sidebar-inner-scroll {
overflow-x: hidden; overflow-x: hidden;
...@@ -168,7 +164,7 @@ $new-sidebar-collapsed-width: 50px; ...@@ -168,7 +164,7 @@ $new-sidebar-collapsed-width: 50px;
} }
@media (max-width: $screen-xs-max) { @media (max-width: $screen-xs-max) {
left: (-$new-sidebar-width); left: (-$contextual-sidebar-width);
} }
.nav-icon-container { .nav-icon-container {
...@@ -340,7 +336,7 @@ $new-sidebar-collapsed-width: 50px; ...@@ -340,7 +336,7 @@ $new-sidebar-collapsed-width: 50px;
.toggle-sidebar-button, .toggle-sidebar-button,
.close-nav-button { .close-nav-button {
width: $new-sidebar-width - 2px; width: $contextual-sidebar-width - 2px;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
padding: 16px; padding: 16px;
...@@ -407,7 +403,7 @@ $new-sidebar-collapsed-width: 50px; ...@@ -407,7 +403,7 @@ $new-sidebar-collapsed-width: 50px;
} }
.toggle-sidebar-button { .toggle-sidebar-button {
width: $new-sidebar-collapsed-width - 2px; width: $contextual-sidebar-collapsed-width - 2px;
padding: 16px; padding: 16px;
.collapse-text, .collapse-text,
......
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
margin: 5px; margin: 5px;
} }
.page-with-new-sidebar.page-with-sidebar .issue-boards-sidebar { .page-with-contextual-sidebar.page-with-sidebar .issue-boards-sidebar {
.issuable-sidebar-header { .issuable-sidebar-header {
position: relative; position: relative;
} }
......
module NavHelper module NavHelper
def page_with_sidebar_class def page_with_sidebar_class
class_name = page_gutter_class class_name = page_gutter_class
class_name << 'page-with-new-sidebar' if defined?(@left_sidebar) && @left_sidebar class_name << 'page-with-contextual-sidebar' if defined?(@left_sidebar) && @left_sidebar
class_name << 'page-with-icon-sidebar' if collapsed_sidebar? && @left_sidebar class_name << 'page-with-icon-sidebar' if collapsed_sidebar? && @left_sidebar
class_name class_name
......
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