Merge remote-tracking branch 'webdev/MAGETWO-43072' into PR_Branch

monkeysee · monkeysee · commit 19d9cb8e874b · 2015-10-26T20:19:01.000-05:00
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_common.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_common.less
@@ -19,6 +19,12 @@
     padding-top: @main__indent-top;
 }
 
+.menu-wrapper {
+    .logo-static {
+        pointer-events: none;
+    }
+}
+
 //
 //  Header
 //  _____________________________________________
@@ -44,6 +50,10 @@
 //  Titles
 //  _____________________________________________
 
+.page-title {
+    margin-bottom: @indent__s;
+}
+
 .page-sub-title {
     font-size: 2rem;
     margin-bottom: 1.3em;
@@ -59,3 +69,13 @@
         margin-top: 1.5rem;
     }
 }
+
+//  Spinner modification for installer
+.spinner {
+    &.side {
+        float: left;
+        font-size: 2.4rem;
+        margin-left: 2rem;
+        margin-top: -5px;
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_readiness-check.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_readiness-check.less
@@ -56,7 +56,7 @@
 .readiness-check-icon {
     float: left;
     margin-left: 1.7rem;
-    margin-top: .7rem;
+    margin-top: .3rem;
 }
 
 //
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/setup.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/setup.less
@@ -52,6 +52,7 @@
 
 //  Inherit Backend components
 @import '../../../../css/source/_actions.less';
+@import '../../../../css/source/actions/_actions-switcher.less'; // ToDo UI: remove when yes/no switcher is integrated to the backend
 @import '../../../../css/source/components/_messages.less';
 @import '../../../../css/source/components/_modals_extend.less';
 @import '../../../../css/source/components/_spinner.less';
diff --git a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_menu.less b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_menu.less
@@ -25,6 +25,13 @@
                     top: -1.6rem;
                 }
             }
+            &._active {
+                > a {
+                    &:after {
+                        display: block;
+                    }
+                }
+            }
         }
         > a {
             padding-top: 1.3rem;
diff --git a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_common.less b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_common.less
@@ -13,6 +13,7 @@
 
 .page-sub-title {
     margin-bottom: 2.1rem;
+    margin-top: @indent__l;
 }
 
 .multiselect-custom {
diff --git a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/source/_forms.less b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/source/_forms.less
@@ -15,4 +15,4 @@
     letter-spacing: @letter-spacing__small;
     margin-left: .4rem;
     margin-bottom: .4rem;
-}
+}
diff --git a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/source/_typography.less b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/source/_typography.less
@@ -42,5 +42,3 @@
         margin-right: 2.4rem;
     }
 }
-
-
diff --git a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/source/_variables.less b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/source/_variables.less
@@ -36,4 +36,4 @@
 //
 //  Tables
 //  ---------------------------------------------
-@table__color: @color-very-dark-gray-black;
+@table__color: @color-very-dark-gray-black;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-switcher.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-switcher.less
@@ -0,0 +1,110 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Yes/no switcher
+//  _____________________________________________
+
+//  ToDo UI: integrate the switcher to the backend
+
+//
+//  Variables
+//  ---------------------------------------------
+
+@actions-switcher-background-color: @color-gray89;
+@actions-switcher-border-radius: 12px;
+@actions-switcher-border: 1px solid @color-gray65-lighten;
+@actions-switcher-control-background-color: @color-white;
+@actions-switcher-height: 20px;
+@actions-switcher-width: 37px;
+
+//
+
+.actions-switch {
+    -webkit-user-select: none;
+       -moz-user-select: none;
+        -ms-user-select: none;
+    height: @actions-switcher-height;
+    margin-right: 30px;
+    position: relative;
+    width: @actions-switcher-width;
+}
+
+.actions-switch-label {
+    background: @actions-switcher-background-color;
+    border-radius: @actions-switcher-border-radius;
+    border: @actions-switcher-border;
+    cursor: pointer;
+    display: block;
+    overflow: hidden;
+}
+
+.actions-switch-inner {
+    display: block;
+    margin-left: -100%;
+    transition: margin 0.3s ease-in 0s;
+    width: 200%;
+    &:before,
+    &:after {
+        border-radius: @actions-switcher-border-radius;
+        color: @color-white;
+        display: block;
+        float: left;
+        height: @actions-switcher-height;
+        line-height: 22px;
+        padding: 0;
+        width: 50%;
+    }
+    &:before {
+        background-color: @color-green-apple;
+        content: "";
+    }
+    &:after {
+        content: "";
+        text-align: right;
+    }
+}
+
+.actions-switch-indicator {
+    background: @actions-switcher-control-background-color;
+    border-radius: @actions-switcher-border-radius;
+    border: @actions-switcher-border;
+    bottom: -2px;
+    display: block;
+    position: absolute;
+    right: 15px;
+    top: 0;
+    transition: all 0.3s ease-in 0s;
+    width: 22px;
+}
+
+.actions-switch-text {
+    &:after {
+        content: attr(data-label-no);
+        display: block;
+        left: 32px;
+        margin-left: 12px;
+        position: absolute;
+    }
+}
+
+.actions-switch-checkbox {
+    display: none;
+    &:checked {
+        + .actions-switch-label {
+            .actions-switch-inner {
+                margin-left: 0;
+            }
+            .actions-switch-indicator {
+                right: 0;
+            }
+            .actions-switch-text {
+                &:after {
+                    content: attr(data-label-yes);
+                }
+            }
+        }
+    }
+}
diff --git a/setup/pub/styles/setup.css b/setup/pub/styles/setup.css
diff --git a/setup/view/magento/setup/select-version.phtml b/setup/view/magento/setup/select-version.phtml
@@ -186,14 +186,15 @@
                 <tbody>
             <tr ng-repeat="component in displayComponents | limitTo:rowLimit">
                     <td class="data-grid-indicator-cell">
-                        <div class="onoffswitch">
+                        <div class="actions-switch">
                             <input type="checkbox" name="{{component.checkboxId}}"
-                                   class="onoffswitch-checkbox" id="{{component.checkboxId}}"
+                                   class="actions-switch-checkbox" id="{{component.checkboxId}}"
                                    ng-click="AddRemoveComponentOnSliderMove(component)"
                                    ng-checked="isSelected(component.name)">
-                            <label class="onoffswitch-label" for="{{component.checkboxId}}">
-                                <span class="onoffswitch-inner"></span>
-                                <span class="onoffswitch-switch"></span>
+                            <label class="actions-switch-label" for="{{component.checkboxId}}">
+                                <span class="actions-switch-inner"></span>
+                                <span class="actions-switch-indicator"></span>
+                                <span class="actions-switch-text" data-label-yes="Yes" data-label-no="No"></span>
                             </label>
                         </div>
                     </td>

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`.readiness-check-icon {`
`57`	`57`	`float: left;`
`58`	`58`	`margin-left: 1.7rem;`
`59`		`- margin-top: .7rem;`
	`59`	`+ margin-top: .3rem;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`//`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,13 @@`
`25`	`25`	`top: -1.6rem;`
`26`	`26`	`}`
`27`	`27`	`}`
	`28`	`+ &._active {`
	`29`	`+ > a {`
	`30`	`+ &:after {`
	`31`	`+ display: block;`
	`32`	`+ }`
	`33`	`+ }`
	`34`	`+ }`
`28`	`35`	`}`
`29`	`36`	`> a {`
`30`	`37`	`padding-top: 1.3rem;`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`.page-sub-title {`
`15`	`15`	`margin-bottom: 2.1rem;`
	`16`	`+ margin-top: @indent__l;`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`.multiselect-custom {`
Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,3 @@`
`42`	`42`	`margin-right: 2.4rem;`
`43`	`43`	`}`
`44`	`44`	`}`
`45`		`-`
`46`		`-`