diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-15 12:11:40 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-23 15:37:04 -0500 |
| commit | 2830cb923742dc32d790f1ec369a98f816c47067 (patch) | |
| tree | 8eb83afccb670b2f85d7a647397e9a3f924336e5 | |
| parent | db40c668de96e6dfcdb07792b881118867c2ff52 (diff) | |
| download | gitlab-ce-2830cb923742dc32d790f1ec369a98f816c47067.tar.gz | |
Consistently style image in blob and diff
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index f8674b763c8..78f425057eb 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -66,10 +66,10 @@ &.video { background: $file-image-bg; text-align: center; + padding: 30px; img, video { - padding: 20px; max-width: 80%; } } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 17a4e8fd83e..4db77752c0c 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -247,7 +247,6 @@ $dark-diff-match-bg: rgba(255, 255, 255, 0.3); $dark-diff-match-color: rgba(255, 255, 255, 0.1); $file-mode-changed: #777; $file-mode-changed: #777; -$diff-image-bg: #ddd; $diff-image-info-color: grey; $diff-swipe-border: #999; $diff-view-modes-color: grey; diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index cfb1df4df84..6c935d58b73 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -158,7 +158,7 @@ } .image { - background: $diff-image-bg; + background: $file-image-bg; text-align: center; padding: 30px; |