kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

created framework for badges, solving duplicate code

Browse source
This commit is contained in:
Dimitrie Hoekstra 2016-12-02 00:41:22 +01:00
parent 3c2cb28e84
commit af5de82c67
6 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/framework.scss
View file

@ -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";

10
app/assets/stylesheets/framework/badges.scss Normal file
View file

@ -0,0 +1,10 @@
.badge {
font-weight: normal;
background-color: $badge-bg;
color: $badge-color;
vertical-align: baseline;
}
.badge-dark {
background-color: $badge-bg-dark;
}

11
app/assets/stylesheets/framework/nav.scss
View file

@ -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 {

7
app/assets/stylesheets/framework/variables.scss
View file

@ -247,6 +247,13 @@ $btn-placeholder-gray: #c7c7c7;
$btn-white-active: #848484;
$btn-gray-hover: #eee;
/*
* Badges
*/
$badge-bg: #f3f3f3;
$badge-bg-dark: #eee;
$badge-color: $btn-transparent-color;
/*
* Award emoji
*/

7
app/assets/stylesheets/pages/environments.scss
View file

@ -113,13 +113,6 @@
.folder-name {
cursor: pointer;
.badge {
font-weight: normal;
background-color: #f3f3f3;
color: $gl-placeholder-color;
vertical-align: baseline;
}
}
}

3
app/assets/stylesheets/pages/pipelines.scss
View file

@ -507,9 +507,6 @@
}
.badge {
background-color: #f3f3f3;
color: $gl-text-color-light;
font-weight: normal;
margin-left: $btn-xs-side-margin;
}
}