Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
572bc7bc
Commit
572bc7bc
authored
Feb 13, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove global sidebar styles
parent
4b7f0b32
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
121 deletions
+10
-121
app/assets/stylesheets/framework/animations.scss
app/assets/stylesheets/framework/animations.scss
+1
-1
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+1
-1
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+5
-113
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-3
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+2
-2
app/assets/stylesheets/print.scss
app/assets/stylesheets/print.scss
+0
-1
No files found.
app/assets/stylesheets/framework/animations.scss
View file @
572bc7bc
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
}
}
.btn
,
.btn
,
.
side-nav
-toggle
{
.
global-dropdown
-toggle
{
@include
transition
(
background-color
,
border-color
,
color
,
box-shadow
);
@include
transition
(
background-color
,
border-color
,
color
,
box-shadow
);
}
}
...
...
app/assets/stylesheets/framework/header.scss
View file @
572bc7bc
...
@@ -101,7 +101,7 @@ header {
...
@@ -101,7 +101,7 @@ header {
}
}
}
}
.
side-nav
-toggle
{
.
global-dropdown
-toggle
{
position
:
absolute
;
position
:
absolute
;
left
:
-10px
;
left
:
-10px
;
margin
:
7px
0
;
margin
:
7px
0
;
...
...
app/assets/stylesheets/framework/sidebar.scss
View file @
572bc7bc
.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
{
.content-wrapper
{
width
:
100%
;
width
:
100%
;
transition
:
padding
$sidebar-transition-duration
;
transition
:
padding
$sidebar-transition-duration
;
...
@@ -47,38 +14,6 @@
...
@@ -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
{
.nav-header-btn
{
padding
:
10px
$gl-sidebar-padding
;
padding
:
10px
$gl-sidebar-padding
;
color
:
inherit
;
color
:
inherit
;
...
@@ -94,59 +29,16 @@
...
@@ -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
{
.right-sidebar-collapsed
{
padding-right
:
0
;
padding-right
:
0
;
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
.content-wrapper
{
.content-wrapper
{
padding-right
:
$
sideba
r_collapsed_width
;
padding-right
:
$
gutte
r_collapsed_width
;
}
}
.merge-request-tabs-holder.affix
{
.merge-request-tabs-holder.affix
{
right
:
$
sideba
r_collapsed_width
;
right
:
$
gutte
r_collapsed_width
;
}
}
}
}
...
@@ -164,7 +56,7 @@ header.header-sidebar-pinned {
...
@@ -164,7 +56,7 @@ header.header-sidebar-pinned {
@media
(
min-width
:
$screen-sm-min
)
and
(
max-width
:
$screen-sm-max
)
{
@media
(
min-width
:
$screen-sm-min
)
and
(
max-width
:
$screen-sm-max
)
{
&
:not
(
.build-sidebar
)
:not
(
.wiki-sidebar
)
{
&
:not
(
.build-sidebar
)
:not
(
.wiki-sidebar
)
{
padding-right
:
$
sideba
r_collapsed_width
;
padding-right
:
$
gutte
r_collapsed_width
;
}
}
}
}
...
@@ -178,12 +70,12 @@ header.header-sidebar-pinned {
...
@@ -178,12 +70,12 @@ header.header-sidebar-pinned {
}
}
&
.with-overlay
.merge-request-tabs-holder.affix
{
&
.with-overlay
.merge-request-tabs-holder.affix
{
right
:
$
sideba
r_collapsed_width
;
right
:
$
gutte
r_collapsed_width
;
}
}
}
}
&
.with-overlay
{
&
.with-overlay
{
padding-right
:
$
sideba
r_collapsed_width
;
padding-right
:
$
gutte
r_collapsed_width
;
}
}
}
}
...
...
app/assets/stylesheets/framework/variables.scss
View file @
572bc7bc
/*
/*
* Layout
* Layout
*/
*/
$sidebar_collapsed_width
:
62px
;
$sidebar_width
:
220px
;
$gutter_collapsed_width
:
62px
;
$gutter_collapsed_width
:
62px
;
$gutter_width
:
290px
;
$gutter_width
:
290px
;
$gutter_inner_width
:
250px
;
$gutter_inner_width
:
250px
;
...
@@ -541,4 +539,4 @@ Pipeline Graph
...
@@ -541,4 +539,4 @@ Pipeline Graph
*/
*/
$stage-hover-bg
:
#eaf3fc
;
$stage-hover-bg
:
#eaf3fc
;
$stage-hover-border
:
#d1e7fc
;
$stage-hover-border
:
#d1e7fc
;
$action-icon-color
:
#d6d6d6
;
$action-icon-color
:
#d6d6d6
;
\ No newline at end of file
app/assets/stylesheets/pages/issuable.scss
View file @
572bc7bc
...
@@ -253,11 +253,11 @@
...
@@ -253,11 +253,11 @@
display
:
block
;
display
:
block
;
}
}
width
:
$
sideba
r_collapsed_width
;
width
:
$
gutte
r_collapsed_width
;
padding-top
:
0
;
padding-top
:
0
;
.block
{
.block
{
width
:
$
sideba
r_collapsed_width
-
2px
;
width
:
$
gutte
r_collapsed_width
-
2px
;
margin-left
:
-19px
;
margin-left
:
-19px
;
padding
:
15px
0
0
;
padding
:
15px
0
0
;
border-bottom
:
none
;
border-bottom
:
none
;
...
...
app/assets/stylesheets/print.scss
View file @
572bc7bc
...
@@ -31,7 +31,6 @@ nav.navbar-collapse.collapse,
...
@@ -31,7 +31,6 @@ nav.navbar-collapse.collapse,
.
blob-commit-info
,
.
blob-commit-info
,
.
file-title
,
.
file-title
,
.
file-holder
,
.
file-holder
,
.
sidebar-wrapper
,
.
nav
,
.
nav
,
.
btn
,
.
btn
,
ul
.
notes-form
,
ul
.
notes-form
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment