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
Boxiang Sun
gitlab-ce
Commits
70d9401a
Commit
70d9401a
authored
Oct 20, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace all instances of new-sidebar with contextual-sidebar
parent
a4416c39
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
18 deletions
+14
-18
app/assets/stylesheets/framework.scss
app/assets/stylesheets/framework.scss
+1
-1
app/assets/stylesheets/framework/contextual-sidebar.scss
app/assets/stylesheets/framework/contextual-sidebar.scss
+11
-15
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+1
-1
app/helpers/nav_helper.rb
app/helpers/nav_helper.rb
+1
-1
No files found.
app/assets/stylesheets/framework.scss
View file @
70d9401a
...
...
@@ -36,7 +36,7 @@
@import
"framework/secondary-navigation-elements"
;
@import
"framework/selects"
;
@import
"framework/sidebar"
;
@import
"framework/
new
-sidebar"
;
@import
"framework/
contextual
-sidebar"
;
@import
"framework/tables"
;
@import
"framework/notes"
;
@import
"framework/tabs"
;
...
...
app/assets/stylesheets/framework/
new
-sidebar.scss
→
app/assets/stylesheets/framework/
contextual
-sidebar.scss
View file @
70d9401a
@import
"framework/variables"
;
@import
'framework/tw_bootstrap_variables'
;
@import
"bootstrap/variables"
;
$active-background
:
rgba
(
0
,
0
,
0
,
.04
);
$active-hover-background
:
$active-background
;
$active-hover-color
:
$gl-text-color
;
...
...
@@ -9,16 +5,16 @@ $inactive-badge-background: rgba(0, 0, 0, .08);
$hover-background
:
rgba
(
0
,
0
,
0
,
.06
);
$hover-color
:
$gl-text-color
;
$inactive-color
:
$gl-text-color-secondary
;
$
new
-sidebar-width
:
220px
;
$
new
-sidebar-collapsed-width
:
50px
;
$
contextual
-sidebar-width
:
220px
;
$
contextual
-sidebar-collapsed-width
:
50px
;
.page-with-
new
-sidebar
{
.page-with-
contextual
-sidebar
{
@media
(
min-width
:
$screen-md-min
)
{
padding-left
:
$
new
-sidebar-collapsed-width
;
padding-left
:
$
contextual
-sidebar-collapsed-width
;
}
@media
(
min-width
:
$screen-lg-min
)
{
padding-left
:
$
new
-sidebar-width
;
padding-left
:
$
contextual
-sidebar-width
;
}
// Override position: absolute
...
...
@@ -34,7 +30,7 @@ $new-sidebar-collapsed-width: 50px;
.page-with-icon-sidebar
{
@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;
.nav-sidebar
{
position
:
fixed
;
z-index
:
400
;
width
:
$
new
-sidebar-width
;
width
:
$
contextual
-sidebar-width
;
transition
:
left
$sidebar-transition-duration
;
top
:
$header-height
;
bottom
:
0
;
...
...
@@ -103,7 +99,7 @@ $new-sidebar-collapsed-width: 50px;
&
.sidebar-icons-only
{
width
:
auto
;
min-width
:
$
new
-sidebar-collapsed-width
;
min-width
:
$
contextual
-sidebar-collapsed-width
;
.nav-sidebar-inner-scroll
{
overflow-x
:
hidden
;
...
...
@@ -168,7 +164,7 @@ $new-sidebar-collapsed-width: 50px;
}
@media
(
max-width
:
$screen-xs-max
)
{
left
:
(
-
$
new
-sidebar-width
);
left
:
(
-
$
contextual
-sidebar-width
);
}
.nav-icon-container
{
...
...
@@ -340,7 +336,7 @@ $new-sidebar-collapsed-width: 50px;
.toggle-sidebar-button
,
.close-nav-button
{
width
:
$
new
-sidebar-width
-
2px
;
width
:
$
contextual
-sidebar-width
-
2px
;
position
:
fixed
;
bottom
:
0
;
padding
:
16px
;
...
...
@@ -407,7 +403,7 @@ $new-sidebar-collapsed-width: 50px;
}
.toggle-sidebar-button
{
width
:
$
new
-sidebar-collapsed-width
-
2px
;
width
:
$
contextual
-sidebar-collapsed-width
-
2px
;
padding
:
16px
;
.collapse-text
,
...
...
app/assets/stylesheets/pages/boards.scss
View file @
70d9401a
...
...
@@ -414,7 +414,7 @@
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
{
position
:
relative
;
}
...
...
app/helpers/nav_helper.rb
View file @
70d9401a
module
NavHelper
def
page_with_sidebar_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
...
...
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