Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-16

app/assets/stylesheets/framework/variables.scss

@@ -245,10 +245,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;

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%;
       }
     }