MAGETWO-34125: Merge MAGETWO-32073 and design changes to mainline

Natalia Momotenko · Alex Bomko · commit 6fa736fe324a · 2015-06-11T16:44:09.000+03:00
- update styles
diff --git a/setup/pub/styles/setup.css b/setup/pub/styles/setup.css
diff --git a/setup/view/magento/setup/install.phtml b/setup/view/magento/setup/install.phtml
@@ -79,21 +79,21 @@
     <p>To install sample data you should clean up you database</p>
     <button
         type="button"
-        class="btn btn-prime"
+        class="btn btn-secondary"
         ng-disabled="isDisabled"
         ng-click="startCleanup(true)">
         Clean up automatically
     </button>
     <button
         type="button"
-        class="btn btn-prime"
+        class="btn btn-secondary"
         ng-disabled="isDisabled"
         ng-click="startCleanup(false)">
         Proceed without clean up
     </button>
     <button
         type="button"
-        class="btn btn-secondary"
+        class="btn"
         ng-disabled="isDisabled"
         ng-click="hideCleanUpBox()">
         Cancel
diff --git a/setup/view/styles/components/_navigation-bar.less b/setup/view/styles/components/_navigation-bar.less
@@ -54,6 +54,10 @@
         float: right;
         margin-left: .5rem;
         margin-right: .5rem;
+        .btn {
+            padding-left: .5rem;
+            padding-right: .5rem;
+        }
     }
 }
 
diff --git a/setup/view/styles/lib/_buttons.less b/setup/view/styles/lib/_buttons.less
@@ -48,7 +48,7 @@
     display: inline-block;
     font-size: @btn__base__font-size;
     font-weight: @font-weight__semibold;
-    padding: @btn__base__padding-top .5em;
+    padding: @btn__base__padding-top .9em;
     text-align: center;
     &:hover {
         background-color: @btn__base__hover__background-color;
diff --git a/setup/view/styles/pages/_customize-your-store.less b/setup/view/styles/pages/_customize-your-store.less
@@ -9,11 +9,6 @@
             .visually-hidden();
         }
     }
-    .customize-database-clean {
-      p {
-        margin-top: @indent-m-base;
-      }
-    }
     .advanced-modules-select,
     .advanced-modules-count {
         padding-left: 1.5rem;
@@ -36,4 +31,9 @@
             }
         }
     }
+    .customize-database-clean {
+        p {
+            margin-top: @indent__m;
+        }
+    }
 }
diff --git a/setup/view/styles/pages/_install.less b/setup/view/styles/pages/_install.less
@@ -57,5 +57,8 @@
 }
 
 .install-database-clean {
-  margin-top: @indent-xl-base;
+    margin-top: @indent__xl;
+    .btn {
+        margin-right: @indent__s;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,10 @@`
`54`	`54`	`float: right;`
`55`	`55`	`margin-left: .5rem;`
`56`	`56`	`margin-right: .5rem;`
	`57`	`+ .btn {`
	`58`	`+ padding-left: .5rem;`
	`59`	`+ padding-right: .5rem;`
	`60`	`+ }`
`57`	`61`	`}`
`58`	`62`	`}`
`59`	`63`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,6 @@`
`9`	`9`	`.visually-hidden();`
`10`	`10`	`}`
`11`	`11`	`}`
`12`		`- .customize-database-clean {`
`13`		`- p {`
`14`		`- margin-top: @indent-m-base;`
`15`		`- }`
`16`		`- }`
`17`	`12`	`.advanced-modules-select,`
`18`	`13`	`.advanced-modules-count {`
`19`	`14`	`padding-left: 1.5rem;`
`@@ -36,4 +31,9 @@`
`36`	`31`	`}`
`37`	`32`	`}`
`38`	`33`	`}`
	`34`	`+ .customize-database-clean {`
	`35`	`+ p {`
	`36`	`+ margin-top: @indent__m;`
	`37`	`+ }`
	`38`	`+ }`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,8 @@`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`.install-database-clean {`
`60`		`- margin-top: @indent-xl-base;`
	`60`	`+ margin-top: @indent__xl;`
	`61`	`+ .btn {`
	`62`	`+ margin-right: @indent__s;`
	`63`	`+ }`
`61`	`64`	`}`