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
0619e111
Commit
0619e111
authored
May 07, 2019
by
Marcel van Remmerden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adapt code to style guidelines
parent
a0c4c121
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+7
-7
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/header.scss
View file @
0619e111
...
@@ -86,8 +86,7 @@
...
@@ -86,8 +86,7 @@
margin
:
5px
2px
5px
-8px
;
margin
:
5px
2px
5px
-8px
;
border-radius
:
$border-radius-default
;
border-radius
:
$border-radius-default
;
&
.js-canary-badge
{
&
.badge
{
padding
:
0
;
font-size
:
12px
;
font-size
:
12px
;
border-radius
:
100px
;
border-radius
:
100px
;
margin-top
:
6px
;
margin-top
:
6px
;
...
@@ -98,10 +97,11 @@
...
@@ -98,10 +97,11 @@
background-color
:
$green-500
;
background-color
:
$green-500
;
}
}
span
{
.color-label
{
line-height
:
15px
;
line-height
:
15px
;
}
}
span
:hover
{
.color-label
:hover
{
text-decoration
:
none
;
text-decoration
:
none
;
}
}
}
}
...
...
app/views/layouts/header/_default.html.haml
View file @
0619e111
...
@@ -17,8 +17,8 @@
...
@@ -17,8 +17,8 @@
-
if
logo_text
.
present?
-
if
logo_text
.
present?
%span
.logo-text.d-none.d-lg-block.prepend-left-8
%span
.logo-text.d-none.d-lg-block.prepend-left-8
=
logo_text
=
logo_text
=
link_to
'https://next.gitlab.com'
,
class:
'label-link js-canary-badge badge badge-pill green-badge align-self-center'
,
target: :_blank
do
=
link_to
'https://next.gitlab.com'
,
class:
'label-link js-canary-badge badge badge-pill green-badge align-self-center
p-0
'
,
target: :_blank
do
%span
.
badge.
color-label.has-tooltip
%span
.color-label.has-tooltip
=
_
(
'Next'
)
=
_
(
'Next'
)
-
if
current_user
-
if
current_user
...
...
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