home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity

Renamed variables & removed some for award emoji

Browse Source
This commit is contained in:
Phil Hughes
2016-03-11 09:03:08 +00:00
parent b5f3cf8218
commit fc79fe7b53
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/framework/variables.scss
+1 -5
View File
@@ -156,8 +156,4 @@ $dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color;
*/
$award-emoji-menu-bg: #FFF;
$award-emoji-menu-border: #F1F2F4;
$award-emoji-menu-radius: 3px;
$award-emoji-menu-btn-radius: 4px;
$award-emoji-menu-btn-hover-bg: #EDEDED;
$award-emoji-control-active-bg: $award-emoji-menu-btn-hover-bg;
$award-emoji-new-btn-color: #DCDCDC;
$award-emoji-new-btn-icon-color: #DCDCDC;
app/assets/stylesheets/pages/awards.scss
+5 -5
View File
@@ -17,7 +17,7 @@
font-size: 14px;
background-color: $award-emoji-menu-bg;
border: 1px solid $award-emoji-menu-border;
border-radius: $award-emoji-menu-radius;
border-radius: $border-radius-base;
box-shadow: 0 6px 12px rgba(0,0,0,.175);
.emoji-menu-content {
@@ -55,10 +55,10 @@
padding: 0;
background: none;
border: 0;
border-radius: $award-emoji-menu-btn-radius;
border-radius: $border-radius-base;
&:hover {
background-color: $award-emoji-menu-btn-hover-bg;
background-color: $white-dark;
}
.emoji-icon {
@@ -80,7 +80,7 @@
&.active,
&:active {
background-color: $award-emoji-control-active-bg;
background-color: $white-dark;
box-shadow: none;
outline: 0;
}
@@ -107,6 +107,6 @@
}
.award-control-icon {
color: $award-emoji-new-btn-color;
color: $award-emoji-new-btn-icon-color;
}
}