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
Tatuya Kamada
gitlab-ce
Commits
53312250
Commit
53312250
authored
Feb 21, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch '27934-left-align-nav' into 'master'"
This reverts merge request !9338
parent
51546e26
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
105 additions
and
84 deletions
+105
-84
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+22
-4
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+6
-4
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+18
-12
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+1
-1
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+2
-2
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+56
-57
changelogs/unreleased/27934-left-align-nav.yml
changelogs/unreleased/27934-left-align-nav.yml
+0
-4
No files found.
app/assets/stylesheets/framework/header.scss
View file @
53312250
...
@@ -148,11 +148,16 @@ header {
...
@@ -148,11 +148,16 @@ header {
}
}
.header-logo
{
.header-logo
{
display
:
inline-block
;
position
:
absolute
;
margin
:
0
8px
0
3px
;
left
:
50%
;
position
:
relative
;
top
:
7px
;
top
:
7px
;
transition-duration
:
.3s
;
transition-duration
:
.3s
;
z-index
:
999
;
#logo
{
position
:
relative
;
left
:
-50%
;
}
svg
,
svg
,
img
{
img
{
...
@@ -162,6 +167,15 @@ header {
...
@@ -162,6 +167,15 @@ header {
&
:hover
{
&
:hover
{
cursor
:
pointer
;
cursor
:
pointer
;
}
}
@media
(
max-width
:
$screen-xs-max
)
{
right
:
20px
;
left
:
auto
;
#logo
{
left
:
auto
;
}
}
}
}
.title
{
.title
{
...
@@ -169,7 +183,7 @@ header {
...
@@ -169,7 +183,7 @@ header {
padding-right
:
20px
;
padding-right
:
20px
;
margin
:
0
;
margin
:
0
;
font-size
:
18px
;
font-size
:
18px
;
max-width
:
450
px
;
max-width
:
385
px
;
display
:
inline-block
;
display
:
inline-block
;
line-height
:
$header-height
;
line-height
:
$header-height
;
font-weight
:
normal
;
font-weight
:
normal
;
...
@@ -179,6 +193,10 @@ header {
...
@@ -179,6 +193,10 @@ header {
vertical-align
:
top
;
vertical-align
:
top
;
white-space
:
nowrap
;
white-space
:
nowrap
;
@media
(
min-width
:
$screen-sm-min
)
and
(
max-width
:
$screen-sm-max
)
{
max-width
:
300px
;
}
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
max-width
:
190px
;
max-width
:
190px
;
}
}
...
...
app/assets/stylesheets/framework/nav.scss
View file @
53312250
@mixin
fade
(
$gradient-direction
,
$gradient-color
)
{
@mixin
fade
(
$gradient-direction
,
$gradient-color
)
{
visibility
:
hidden
;
visibility
:
hidden
;
opacity
:
0
;
opacity
:
0
;
z-index
:
1
;
z-index
:
2
;
position
:
absolute
;
position
:
absolute
;
bottom
:
12px
;
bottom
:
12px
;
width
:
43px
;
width
:
43px
;
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
.fa
{
.fa
{
position
:
relative
;
position
:
relative
;
top
:
6
px
;
top
:
5
px
;
font-size
:
18px
;
font-size
:
18px
;
}
}
}
}
...
@@ -79,6 +79,7 @@
...
@@ -79,6 +79,7 @@
}
}
&
.sub-nav
{
&
.sub-nav
{
text-align
:
center
;
background-color
:
$gray-normal
;
background-color
:
$gray-normal
;
.container-fluid
{
.container-fluid
{
...
@@ -286,6 +287,7 @@
...
@@ -286,6 +287,7 @@
background
:
$gray-light
;
background
:
$gray-light
;
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
transition
:
padding
$sidebar-transition-duration
;
transition
:
padding
$sidebar-transition-duration
;
text-align
:
center
;
.container-fluid
{
.container-fluid
{
position
:
relative
;
position
:
relative
;
...
@@ -351,7 +353,7 @@
...
@@ -351,7 +353,7 @@
right
:
-5px
;
right
:
-5px
;
.fa
{
.fa
{
right
:
-
28
px
;
right
:
-
7
px
;
}
}
}
}
...
@@ -381,7 +383,7 @@
...
@@ -381,7 +383,7 @@
left
:
0
;
left
:
0
;
.fa
{
.fa
{
left
:
-4
px
;
left
:
10
px
;
}
}
}
}
}
}
...
...
app/assets/stylesheets/pages/projects.scss
View file @
53312250
...
@@ -652,24 +652,30 @@ pre.light-well {
...
@@ -652,24 +652,30 @@ pre.light-well {
}
}
}
}
.
container-fluid.project-stats-container
{
.
project-last-commit
{
@media
(
m
ax-width
:
$screen-xs-max
)
{
@media
(
m
in-width
:
$screen-sm-min
)
{
padding
:
12px
0
;
margin-top
:
$gl-padding
;
}
}
}
.project-last-commit
{
&
.container-fluid
{
padding-top
:
12px
;
padding-bottom
:
12px
;
background-color
:
$gray-light
;
background-color
:
$gray-light
;
padding
:
12px
$gl-padding
;
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
border-right-width
:
0
;
border-left-width
:
0
;
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
margin-top
:
$gl-padding
;
border-right-width
:
1px
;
border-left-width
:
1px
;
}
}
}
@media
(
min-width
:
$screen-sm-min
)
{
&
.container-limited
{
@media
(
min-width
:
1281px
)
{
border-radius
:
$border-radius-base
;
border-radius
:
$border-radius-base
;
}
}
}
.ci-status
{
.ci-status
{
margin-right
:
$gl-padding
;
margin-right
:
$gl-padding
;
...
...
app/views/layouts/_page.html.haml
View file @
53312250
.page-with-sidebar
{
class:
page_gutter_class
}
.page-with-sidebar
{
class:
page_gutter_class
}
-
if
defined?
(
nav
)
&&
nav
-
if
defined?
(
nav
)
&&
nav
.layout-nav
.layout-nav
%div
{
class:
container_class
}
.container-fluid
=
render
"layouts/nav/
#{
nav
}
"
=
render
"layouts/nav/
#{
nav
}
"
.content-wrapper
{
class:
"#{layout_nav_class}"
}
.content-wrapper
{
class:
"#{layout_nav_class}"
}
=
yield
:sub_nav
=
yield
:sub_nav
...
...
app/views/layouts/header/_default.html.haml
View file @
53312250
...
@@ -61,12 +61,12 @@
...
@@ -61,12 +61,12 @@
%div
%div
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in btn-success'
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in btn-success'
%h1
.title
=
title
.header-logo
.header-logo
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'logo'
do
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'logo'
do
=
brand_header_logo
=
brand_header_logo
%h1
.title
=
title
=
yield
:header_content
=
yield
:header_content
=
render
'shared/outdated_browser'
=
render
'shared/outdated_browser'
...
...
app/views/projects/show.html.haml
View file @
53312250
...
@@ -13,8 +13,7 @@
...
@@ -13,8 +13,7 @@
=
render
"home_panel"
=
render
"home_panel"
-
if
current_user
&&
can?
(
current_user
,
:download_code
,
@project
)
-
if
current_user
&&
can?
(
current_user
,
:download_code
,
@project
)
.project-stats-container
{
class:
container_class
}
%nav
.project-stats
{
class:
container_class
}
%nav
.project-stats
%ul
.nav
%ul
.nav
%li
%li
=
link_to
project_files_path
(
@project
)
do
=
link_to
project_files_path
(
@project
)
do
...
@@ -75,7 +74,7 @@
...
@@ -75,7 +74,7 @@
Set up auto deploy
Set up auto deploy
-
if
@repository
.
commit
-
if
@repository
.
commit
.project-last-commit
.project-last-commit
{
class:
container_class
}
=
render
'projects/last_commit'
,
commit:
@repository
.
commit
,
ref:
current_ref
,
project:
@project
=
render
'projects/last_commit'
,
commit:
@repository
.
commit
,
ref:
current_ref
,
project:
@project
%div
{
class:
container_class
}
%div
{
class:
container_class
}
...
...
changelogs/unreleased/27934-left-align-nav.yml
deleted
100644 → 0
View file @
51546e26
---
title
:
Left align navigation
merge_request
:
author
:
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