summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAndreas Kämmerle <andreas.kaemmerle@gmail.com>2018-06-16 00:28:17 +0200
committerAndreas Kämmerle <andreas.kaemmerle@gmail.com>2018-06-16 00:28:17 +0200
commitd7faa41fbe7ab53a47e5f0cde07e409f770ac4cb (patch)
tree2b082702369ddbb1402354662db17aba7f2c303b /app/assets
parenta76066d7fad192d8c339101d9b7dd0048fe6e303 (diff)
downloadgitlab-ce-d7faa41fbe7ab53a47e5f0cde07e409f770ac4cb.tar.gz
Harmonize theme preferences previewsupdate-nav-theme-previews
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/variables.scss7
-rw-r--r--app/assets/stylesheets/pages/profiles/preferences.scss8
2 files changed, 8 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 3ee992879d1..f9e7df20927 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%;
}
}