diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:38:29 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:38:29 +0100 |
commit | fae08104b4f0bfb9612137a4c7313d83a8ba6d84 (patch) | |
tree | 5b9bf5629e4acc0151614d7ff7f33300420445cb /app/assets/stylesheets/framework/lists.scss | |
parent | 065375ca2d482faac80897e42d82b3afdcb08d99 (diff) | |
parent | e616739e2fae12e5358d2cea40089a51468d9b4a (diff) | |
download | gitlab-ce-fae08104b4f0bfb9612137a4c7313d83a8ba6d84.tar.gz |
Merge branch 'master' into mr-broken
# Conflicts:
# app/helpers/ci_status_helper.rb
Diffstat (limited to 'app/assets/stylesheets/framework/lists.scss')
-rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index 2404f8898fe..20a22dc7cbc 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -72,13 +72,6 @@ } } -ol, ul { - &.styled { - li { - padding: 2px; - } - } -} /** light list with border-bottom between li **/ ul.bordered-list { |