diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-26 14:26:10 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-26 14:26:10 +0300 |
| commit | c3633db6176a3e72903601400a965fc8c44a2cb1 (patch) | |
| tree | 16779d3e748b3e089d5e74663a70d6fe9d1b1d37 /app/assets/stylesheets/framework/files.scss | |
| parent | 0453d6d7ae72f0179d02ff5190122a86e304e1bb (diff) | |
| parent | f00bb1c29ea438be66b3766545a57b468ade37d4 (diff) | |
Merge branch 'master' into 'balsalmiq-support'
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'app/assets/stylesheets/framework/files.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index b8dab538fee..099187a5193 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -73,14 +73,6 @@ &.wiki { padding: 30px $gl-padding; - - .highlight { - margin-bottom: 9px; - - > pre { - margin: 0; - } - } } &.blob-no-preview { |