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
e52f0721
Commit
e52f0721
authored
May 07, 2019
by
Marcel van Remmerden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add badge link and adapt visual style to badges
parent
cf5c8e73
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+15
-0
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+3
-2
No files found.
app/assets/stylesheets/framework/header.scss
View file @
e52f0721
...
@@ -85,6 +85,21 @@
...
@@ -85,6 +85,21 @@
padding
:
2px
8px
;
padding
:
2px
8px
;
margin
:
5px
2px
5px
-8px
;
margin
:
5px
2px
5px
-8px
;
border-radius
:
$border-radius-default
;
border-radius
:
$border-radius-default
;
&
.js-canary-badge
{
padding
:
0
;
font-size
:
12px
;
border-radius
:
100px
;
margin-top
:
6px
;
&
:hover
,
&
:active
,
&
:focus
{
background-color
:
#1aaa55
;
}
span
{
line-height
:
15px
;
&
:hover
{
text-decoration
:
none
;
}
}
}
}
}
.project-item-select
{
.project-item-select
{
...
...
app/views/layouts/header/_default.html.haml
View file @
e52f0721
...
@@ -17,7 +17,8 @@
...
@@ -17,7 +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
%span
.js-canary-badge.badge.badge-pill.green-badge.align-self-center
=
link_to
'https://next.gitlab.com'
,
class:
'label-link js-canary-badge badge badge-pill green-badge align-self-center'
,
target: :_blank
do
%span
.badge.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