diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-11-07 02:03:31 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-11-07 02:03:31 +0300 |
| commit | a46d32412ec93be2d6d10bd4bcbdd23b69d31865 (patch) | |
| tree | b017b0a0ff5628c11a42cf5c853414b46d77be10 /app/assets/stylesheets/framework/common.scss | |
| parent | cb7d63f90753617920cc6f9168a48dc998dc9ee4 (diff) | |
| parent | 243530360edac31f309bd3706b2d5117f6d526ad (diff) | |
Merge branch 'master' into 38464-k8s-apps
Conflicts:
db/schema.rb
Diffstat (limited to 'app/assets/stylesheets/framework/common.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index ea3007f5e08..393a0052114 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -28,7 +28,7 @@ pre { &.clean { background: none; - border: none; + border: 0; margin: 0; padding: 0; } @@ -142,7 +142,7 @@ li.note { img { max-width: 100%; } .note-title { li { - border-bottom: none !important; + border-bottom: 0 !important; } } } @@ -187,7 +187,7 @@ li.note { pre { background: $white-light; - border: none; + border: 0; font-size: 12px; } } @@ -386,7 +386,7 @@ img.emoji { } .hide-bottom-border { - border-bottom: none !important; + border-bottom: 0 !important; } .gl-accessibility { |