BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
af5de82c
Commit
af5de82c
authored
Dec 02, 2016
by
Dimitrie Hoekstra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
created framework for badges, solving duplicate code
parent
3c2cb28e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
21 deletions
+18
-21
framework.scss
app/assets/stylesheets/framework.scss
+1
-0
badges.scss
app/assets/stylesheets/framework/badges.scss
+10
-0
nav.scss
app/assets/stylesheets/framework/nav.scss
+0
-11
variables.scss
app/assets/stylesheets/framework/variables.scss
+7
-0
environments.scss
app/assets/stylesheets/pages/environments.scss
+0
-7
pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+0
-3
No files found.
app/assets/stylesheets/framework.scss
View file @
af5de82c
...
...
@@ -9,6 +9,7 @@
@import
"framework/avatar.scss"
;
@import
"framework/blocks.scss"
;
@import
"framework/buttons.scss"
;
@import
"framework/badges.scss"
;
@import
"framework/calendar.scss"
;
@import
"framework/callout.scss"
;
@import
"framework/common.scss"
;
...
...
app/assets/stylesheets/framework/badges.scss
0 → 100644
View file @
af5de82c
.badge
{
font-weight
:
normal
;
background-color
:
$badge-bg
;
color
:
$badge-color
;
vertical-align
:
baseline
;
}
.badge-dark
{
background-color
:
$badge-bg-dark
;
}
app/assets/stylesheets/framework/nav.scss
View file @
af5de82c
...
...
@@ -72,17 +72,6 @@
color
:
$black
;
font-weight
:
600
;
}
.badge
{
font-weight
:
normal
;
background-color
:
#f3f3f3
;
color
:
$btn-transparent-color
;
vertical-align
:
baseline
;
}
.badge-dark
{
background-color
:
#eee
;
}
}
&
.sub-nav
{
...
...
app/assets/stylesheets/framework/variables.scss
View file @
af5de82c
...
...
@@ -248,6 +248,13 @@ $btn-white-active: #848484;
$btn-gray-hover
:
#eee
;
/*
* Badges
*/
$badge-bg
:
#f3f3f3
;
$badge-bg-dark
:
#eee
;
$badge-color
:
$btn-transparent-color
;
/*
* Award emoji
*/
$award-emoji-menu-bg
:
#fff
;
...
...
app/assets/stylesheets/pages/environments.scss
View file @
af5de82c
...
...
@@ -113,13 +113,6 @@
.folder-name
{
cursor
:
pointer
;
.badge
{
font-weight
:
normal
;
background-color
:
#f3f3f3
;
color
:
$gl-placeholder-color
;
vertical-align
:
baseline
;
}
}
}
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
af5de82c
...
...
@@ -507,9 +507,6 @@
}
.badge
{
background-color
:
#f3f3f3
;
color
:
$gl-text-color-light
;
font-weight
:
normal
;
margin-left
:
$btn-xs-side-margin
;
}
}
...
...
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