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
Jérome Perrin
gitlab-ce
Commits
fc79fe7b
Commit
fc79fe7b
authored
8 years ago
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed variables & removed some for award emoji
parent
b5f3cf82
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
10 deletions
+6
-10
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-5
app/assets/stylesheets/pages/awards.scss
app/assets/stylesheets/pages/awards.scss
+5
-5
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
fc79fe7b
...
...
@@ -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
;
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/awards.scss
View file @
fc79fe7b
...
...
@@ -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
;
}
}
This diff is collapsed.
Click to expand it.
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