diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-06-16 16:47:20 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-06-16 16:47:20 +0000 |
| commit | 7b1eb2a669ad2a44dbe89d7d289d72870cbd74e7 (patch) | |
| tree | 8298d7ed653758d50219f032530265390eed1914 | |
| parent | f733d4f8979a7570a9347186dbe0f8c663c2ff4f (diff) | |
| parent | d7faa41fbe7ab53a47e5f0cde07e409f770ac4cb (diff) | |
| download | gitlab-ce-7b1eb2a669ad2a44dbe89d7d289d72870cbd74e7.tar.gz | |
Merge branch 'update-nav-theme-previews' into 'master'
Harmonize theme preferences previews
See merge request gitlab-org/gitlab-ce!19916
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/profiles/preferences.scss | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 1cbb8b7053a..f30f296d41f 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -244,10 +244,11 @@ $tooltip-font-size: 12px; /* * Padding */ -$gl-padding-24: 24px; -$gl-padding: 16px; -$gl-padding-8: 8px; $gl-padding-4: 4px; +$gl-padding-8: 8px; +$gl-padding: 16px; +$gl-padding-24: 24px; +$gl-padding-32: 32px; $gl-col-padding: 15px; $gl-input-padding: 10px; $gl-vert-padding: 6px; diff --git a/app/assets/stylesheets/pages/profiles/preferences.scss b/app/assets/stylesheets/pages/profiles/preferences.scss index babe81cb0f7..a353f301d07 100644 --- a/app/assets/stylesheets/pages/profiles/preferences.scss +++ b/app/assets/stylesheets/pages/profiles/preferences.scss @@ -16,7 +16,7 @@ .application-theme { label { - margin: 0 $gl-padding $gl-padding 0; + margin: 0 $gl-padding-32 $gl-padding 0; text-align: center; } @@ -24,7 +24,7 @@ font-size: 0; height: 48px; border-radius: 4px; - min-width: 135px; + min-width: 112px; margin-bottom: $gl-padding-8; &.ui-indigo { @@ -75,7 +75,8 @@ .syntax-theme { label { - margin-right: 20px; + margin-right: $gl-padding-32; + margin-bottom: $gl-padding; text-align: center; .preview { @@ -84,7 +85,6 @@ img { border-radius: 4px; - max-width: 100%; } } |