diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-06-08 10:15:27 -0500 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-06-08 10:15:27 -0500 |
commit | b55bd9ef95734a6805b11a8a8322149e885425a6 (patch) | |
tree | 769f52169d7ad85d68aea3218c7e9116f9269b25 /app/assets/stylesheets/framework/awards.scss | |
parent | c24b70682448f23d7eb01853026cfe6abdf86190 (diff) | |
parent | b4972c4b237ad270ad1a4054c2fe2439d60ee06d (diff) | |
download | gitlab-ce-25426-group-dashboard-ui.tar.gz |
Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-ui
Diffstat (limited to 'app/assets/stylesheets/framework/awards.scss')
-rw-r--r-- | app/assets/stylesheets/framework/awards.scss | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss index 75907c35b7e..19166757e64 100644 --- a/app/assets/stylesheets/framework/awards.scss +++ b/app/assets/stylesheets/framework/awards.scss @@ -1,4 +1,7 @@ .awards { + display: flex; + flex-wrap: wrap; + .emoji-icon { width: 20px; height: 20px; @@ -100,7 +103,6 @@ .award-menu-holder { display: inline-block; - position: absolute; .tooltip { white-space: nowrap; @@ -108,9 +110,11 @@ } .award-control { - margin: 0 5px 6px 0; + margin: 4px 8px 4px 0; outline: 0; position: relative; + display: block; + float: left; &.disabled { cursor: default; |