Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-05-11 23:49:47 +0300
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-05-11 23:58:01 +0300
commit2bbe781d8b45fb9677f5fbe60cf86b2452ef3af4 (patch)
treef8b5d588fe4b1a41792551c34d6005cb51ae49d5 /app/assets/stylesheets/pages/awards.scss
parent4558b5b9fe9f648903ad0dc01089e6118fe0af34 (diff)
revert front end changes
Diffstat (limited to 'app/assets/stylesheets/pages/awards.scss')
-rw-r--r--app/assets/stylesheets/pages/awards.scss13
1 files changed, 6 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index 07d40f40556..37bf38fa65d 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -1,4 +1,6 @@
.awards {
+ line-height: 34px;
+
.emoji-icon {
width: 20px;
height: 20px;
@@ -7,6 +9,8 @@
.emoji-menu {
position: absolute;
+ top: 100%;
+ left: 0;
margin-top: 3px;
z-index: 1000;
min-width: 160px;
@@ -19,12 +23,7 @@
opacity: 0;
transform: scale(.2);
transform-origin: 0 -45px;
- transition: .3s cubic-bezier(.87,-.41,.19,1.44);
- transition-property: transform, opacity;
-
- &.is-aligned-right {
- transform-origin: 100% -45px;
- }
+ transition: all .3s cubic-bezier(.87,-.41,.19,1.44);
&.is-visible {
pointer-events: all;
@@ -108,7 +107,7 @@
}
&.is-loading {
- .award-control-icon-normal {
+ .award-control-icon {
display: none;
}