diff options
| author | Andrey <ad@2d-arts.com> | 2015-09-28 12:03:41 +0200 |
|---|---|---|
| committer | Andrey <ad@2d-arts.com> | 2015-09-28 12:03:41 +0200 |
| commit | ad679127608ebb711bbd49268e3380a30aabb336 (patch) | |
| tree | 9fec8417e9979d6f57d68d06a1f649e334b5941e | |
| parent | ce49e49bfb40872475b82b500f5e52f6ec36b81f (diff) | |
| download | gitlab-ce-ad679127608ebb711bbd49268e3380a30aabb336.tar.gz | |
!important removed from pre
| -rw-r--r-- | app/assets/stylesheets/base/mixins.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/generic/common.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/highlight/white.scss | 7 |
3 files changed, 5 insertions, 10 deletions
diff --git a/app/assets/stylesheets/base/mixins.scss b/app/assets/stylesheets/base/mixins.scss index bba4728af36..20c62250bc1 100644 --- a/app/assets/stylesheets/base/mixins.scss +++ b/app/assets/stylesheets/base/mixins.scss @@ -157,12 +157,6 @@ pre { @include border-radius(2px); - - margin: 12px 0 12px 0 !important; - background-color: #f8fafc !important; - font-size: 13px !important; - color: #5b6169 !important; - line-height: 1.6em !important; } p > code { diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index 48fad7701ef..91dbe1ec244 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -313,7 +313,7 @@ table { } .wiki .highlight, .note-body .highlight { - margin-bottom: 9px; + margin: 12px 0 12px 0; } .wiki .code { diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss index 5de589109bd..20a144ef952 100644 --- a/app/assets/stylesheets/highlight/white.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -1,9 +1,10 @@ /* https://github.com/aahan/pygments-github-style */ pre.code.highlight.white, .code.white { - - background-color: #fff; - color: #333; + background-color: #f8fafc; + font-size: 13px; + color: #5b6169; + line-height: 1.6em; .line-numbers, .line-numbers a { |