diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-20 19:33:04 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-03-21 12:36:46 +0100 |
commit | a2484ae05282835e3c8e4665ec569843330860ab (patch) | |
tree | 1e05629a57a98b1b18f16c168ecd1878a1896ae1 | |
parent | 21e54d947d13988f1d7cd2502d456525af310f25 (diff) | |
download | gitlab-ce-a2484ae05282835e3c8e4665ec569843330860ab.tar.gz |
Merge branch 'css-zero-unit-again' into 'master'
Fix a few remaining uses of `0px`.
See #14299 for more information.
cc: @jschatz1
See merge request !3310
-rw-r--r-- | app/assets/stylesheets/framework/avatar.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/selects.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss index b7ffa3e6ffb..5aa425dab6c 100644 --- a/app/assets/stylesheets/framework/avatar.scss +++ b/app/assets/stylesheets/framework/avatar.scss @@ -16,7 +16,7 @@ } &.group-avatar, &.project-avatar, &.avatar-tile { - @include border-radius(0px); + @include border-radius(0); } &.s16 { width: 16px; height: 16px; margin-right: 6px; } diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index b3371229d5a..fa7944cdabe 100644 --- a/app/assets/stylesheets/framework/selects.scss +++ b/app/assets/stylesheets/framework/selects.scss @@ -41,7 +41,7 @@ } .select2-drop { - @include box-shadow(rgba(76, 86, 103, 0.247059) 0px 0px 1px 0px, rgba(31, 37, 50, 0.317647) 0px 2px 18px 0px); + @include box-shadow(rgba(76, 86, 103, 0.247059) 0 0 1px 0, rgba(31, 37, 50, 0.317647) 0 2px 18px 0); @include border-radius ($border-radius-default); border: none; } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 82c5069638d..4caf11929f8 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -37,7 +37,7 @@ .dropdown-menu { left: auto; width: auto; - right: 0px; + right: 0; max-width: 240px; } } |