diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 11:30:58 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 12:03:26 +0100 |
| commit | fb7b0d6e710d462f5bef1df3195fa8b051668bfc (patch) | |
| tree | 1934efe739a32d6da5c88a58b7420a33c1c916a2 /app/assets/stylesheets/framework/variables.scss | |
| parent | f2f44579a3ae944104d76681e75a85e6d0ceb756 (diff) | |
| parent | 15e87cea3a374e8d929c28f6843170b182fe159a (diff) | |
| download | gitlab-ce-fb7b0d6e710d462f5bef1df3195fa8b051668bfc.tar.gz | |
Merge branch 'master' into update-droplab-to-webpack-versionupdate-droplab-to-webpack-version
Diffstat (limited to 'app/assets/stylesheets/framework/variables.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 97794a47df8..712eb7caf33 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -293,6 +293,8 @@ $badge-color: $gl-text-color-secondary; * Award emoji */ $award-emoji-menu-shadow: rgba(0,0,0,.175); +$award-emoji-positive-add-bg: #fed159; +$award-emoji-positive-add-lines: #bb9c13; /* * Search Box |