Skip to content
Snippets Groups Projects
Commit 572bc7bc authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray
Browse files

Remove global sidebar styles

parent 4b7f0b32
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -116,7 +116,7 @@
}
 
.btn,
.side-nav-toggle {
.global-dropdown-toggle {
@include transition(background-color, border-color, color, box-shadow);
}
 
Loading
Loading
Loading
Loading
@@ -101,7 +101,7 @@ header {
}
}
 
.side-nav-toggle {
.global-dropdown-toggle {
position: absolute;
left: -10px;
margin: 7px 0;
Loading
Loading
.page-with-sidebar {
padding-bottom: 25px;
transition: padding $sidebar-transition-duration;
&.page-sidebar-pinned {
.sidebar-wrapper {
box-shadow: none;
}
}
.sidebar-wrapper {
position: fixed;
top: 0;
bottom: 0;
left: 0;
height: 100%;
width: 0;
overflow: hidden;
transition: width $sidebar-transition-duration;
box-shadow: 2px 0 16px 0 $black-transparent;
}
}
.sidebar-wrapper {
z-index: 1000;
background: $gray-light;
.nicescroll-rails-hr {
// TODO: Figure out why nicescroll doesn't hide horizontal bar
display: none!important;
}
}
.content-wrapper {
width: 100%;
transition: padding $sidebar-transition-duration;
Loading
Loading
@@ -47,38 +14,6 @@
}
}
 
.sidebar-action-buttons {
width: $sidebar_width;
position: absolute;
top: 0;
left: 0;
min-height: 50px;
padding: 5px 0;
font-size: 18px;
line-height: 30px;
.toggle-nav-collapse {
left: 0;
}
.pin-nav-btn {
right: 0;
display: none;
@media (min-width: $sidebar-breakpoint) {
display: block;
}
.fa {
transition: transform .15s;
.page-sidebar-pinned & {
transform: rotate(90deg);
}
}
}
}
.nav-header-btn {
padding: 10px $gl-sidebar-padding;
color: inherit;
Loading
Loading
@@ -94,59 +29,16 @@
}
}
 
.page-sidebar-expanded {
.sidebar-wrapper {
width: $sidebar_width;
}
}
.page-sidebar-pinned {
.content-wrapper,
.layout-nav {
@media (min-width: $sidebar-breakpoint) {
padding-left: $sidebar_width;
}
}
.merge-request-tabs-holder.affix {
@media (min-width: $sidebar-breakpoint) {
left: $sidebar_width;
}
}
&.right-sidebar-expanded {
.line-resolve-all-container {
@media (min-width: $sidebar-breakpoint) {
display: none;
}
}
}
}
header.header-sidebar-pinned {
@media (min-width: $sidebar-breakpoint) {
padding-left: ($sidebar_width + $gl-padding);
.side-nav-toggle {
display: none;
}
.header-content {
padding-left: 0;
}
}
}
.right-sidebar-collapsed {
padding-right: 0;
 
@media (min-width: $screen-sm-min) {
.content-wrapper {
padding-right: $sidebar_collapsed_width;
padding-right: $gutter_collapsed_width;
}
 
.merge-request-tabs-holder.affix {
right: $sidebar_collapsed_width;
right: $gutter_collapsed_width;
}
}
 
Loading
Loading
@@ -164,7 +56,7 @@ header.header-sidebar-pinned {
 
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
&:not(.build-sidebar):not(.wiki-sidebar) {
padding-right: $sidebar_collapsed_width;
padding-right: $gutter_collapsed_width;
}
}
 
Loading
Loading
@@ -178,12 +70,12 @@ header.header-sidebar-pinned {
}
 
&.with-overlay .merge-request-tabs-holder.affix {
right: $sidebar_collapsed_width;
right: $gutter_collapsed_width;
}
}
 
&.with-overlay {
padding-right: $sidebar_collapsed_width;
padding-right: $gutter_collapsed_width;
}
}
 
Loading
Loading
/*
* Layout
*/
$sidebar_collapsed_width: 62px;
$sidebar_width: 220px;
$gutter_collapsed_width: 62px;
$gutter_width: 290px;
$gutter_inner_width: 250px;
Loading
Loading
@@ -541,4 +539,4 @@ Pipeline Graph
*/
$stage-hover-bg: #eaf3fc;
$stage-hover-border: #d1e7fc;
$action-icon-color: #d6d6d6;
\ No newline at end of file
$action-icon-color: #d6d6d6;
Loading
Loading
@@ -253,11 +253,11 @@
display: block;
}
 
width: $sidebar_collapsed_width;
width: $gutter_collapsed_width;
padding-top: 0;
 
.block {
width: $sidebar_collapsed_width - 2px;
width: $gutter_collapsed_width - 2px;
margin-left: -19px;
padding: 15px 0 0;
border-bottom: none;
Loading
Loading
Loading
Loading
@@ -31,7 +31,6 @@ nav.navbar-collapse.collapse,
.blob-commit-info,
.file-title,
.file-holder,
.sidebar-wrapper,
.nav,
.btn,
ul.notes-form,
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment