From 892c125a991150cb47106bb4661a92ee6c58a11e Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Mon, 7 Mar 2016 16:15:39 +0200 Subject: [PATCH 1/9] MAGETWO-49910: [UI] Staging. CMS. Assistance - Part2 --- .../css/source/module/_scheduled-changes.less | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_scheduled-changes.less b/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_scheduled-changes.less index 7e4faad2a1919..c4e61d821dcf4 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_scheduled-changes.less +++ b/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_scheduled-changes.less @@ -291,8 +291,25 @@ .fieldset-schedule { border-bottom: 1px solid @collapsible__border-color; + .admin__fieldset { + padding: 0; + + > :last-child { + margin-bottom: @indent__l; + } + + > .fieldset-wrapper { + &:last-child { + margin-bottom: 0; + } + } + } + .fieldset-wrapper-title { + border-bottom: 0; margin: @indent__base 0 @indent__s; + line-height: 1.2; + padding: 0; strong { font-size: 2rem; From 094a6f3be16ab5116460257a789e8e278347f251 Mon Sep 17 00:00:00 2001 From: Olga Lytvynenko Date: Fri, 11 Mar 2016 12:35:52 +0200 Subject: [PATCH 2/9] MAGETWO-49765: Info about the Images Opacity units of measurement is missed --- .../Catalog/view/adminhtml/ui_component/design_config_form.xml | 3 +++ .../view/adminhtml/ui_component/design_config_form.xml | 1 + .../Magento/backend/web/css/source/forms/_fields.less | 3 +++ 3 files changed, 7 insertions(+) diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml index a20f314e4bf34..4653f379103f2 100644 --- a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml +++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml @@ -45,6 +45,7 @@ text input watermark_image_imageOpacity + % true @@ -109,6 +110,7 @@ text input watermark_thumbnail_imageOpacity + % true @@ -173,6 +175,7 @@ text input watermark_small_image_imageOpacity + % true diff --git a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml index 66761dd0d9aef..90d81dcb90944 100644 --- a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml +++ b/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml @@ -38,6 +38,7 @@ text input watermark_swatch_image_imageOpacity + % true diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less index 14a48da5ba8ce..7ecaf435a59c1 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less @@ -312,6 +312,7 @@ // If there is a tooltip &._with-tooltip { + > .admin__control-addon, > .admin__field-option, > .admin__control-select, > .admin__control-text, @@ -330,6 +331,7 @@ // If there is a fallback reset button &._with-reset { + > .admin__control-addon, > .admin__control-text, > .admin__control-textarea { width: ~'calc(100% - @{field-fallback-reset__width} - @{field-fallback-reset-icon__margin-left} - 4px)'; // Minus space size @@ -343,6 +345,7 @@ // If both &._with-tooltip { + > .admin__control-addon, > .admin__control-text, > .admin__control-textarea { width: ~'calc(100% - @{field-fallback-reset__width} - @{field-fallback-reset-icon__margin-left} - @{field-tooltip__width} - 8px)'; // Minus 2 space sizes From 4f149e1b8f054d41b5a3e4244ba1a35e9d04c780 Mon Sep 17 00:00:00 2001 From: Olga Lytvynenko Date: Fri, 11 Mar 2016 15:26:01 +0200 Subject: [PATCH 3/9] MAGETWO-49744: Notes are implemented as help links --- .../adminhtml/ui_component/design_config_form.xml | 12 +++--------- .../adminhtml/ui_component/design_config_form.xml | 4 +--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml index a20f314e4bf34..3cf57f40cec9e 100644 --- a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml +++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml @@ -61,9 +61,7 @@ true - - Example format: 200x300. - + Example format: 200x300. @@ -125,9 +123,7 @@ true - - Example format: 200x300. - + Example format: 200x300. @@ -189,9 +185,7 @@ true - - Example format: 200x300. - + Example format: 200x300. diff --git a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml index 66761dd0d9aef..8905b3a93ab70 100644 --- a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml +++ b/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml @@ -54,9 +54,7 @@ true - - Example format: 200x300. - + Example format: 200x300. From 3db1d4ccc9a4c083a599992ff2df46cbed6153a3 Mon Sep 17 00:00:00 2001 From: Olga Lytvynenko Date: Mon, 14 Mar 2016 14:15:12 +0200 Subject: [PATCH 4/9] MAGETWO-50425: Store View and Associate to Website Help Links Wrong --- app/code/Magento/Backend/Block/Store/Switcher.php | 2 +- .../Ui/DataProvider/Product/Form/Modifier/Websites.php | 2 +- .../view/adminhtml/ui_component/catalog_rule_form.xml | 2 +- .../Customer/view/base/ui_component/customer_form.xml | 2 +- .../view/adminhtml/ui_component/sales_rule_form.xml | 2 +- .../web/css/source/forms/fields/_field-tooltips.less | 6 +++++- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php index 1874d4fb768a2..13db67156a416 100644 --- a/app/code/Magento/Backend/Block/Store/Switcher.php +++ b/app/code/Magento/Backend/Block/Store/Switcher.php @@ -16,7 +16,7 @@ class Switcher extends \Magento\Backend\Block\Template /** * URL for store switcher hint */ - const HINT_URL = 'http://docs.magento.com/m2/ce/user_guide/stores/configuration.html'; + const HINT_URL = 'http://docs.magento.com/m2/ce/user_guide/configuration/scope.html'; /** * Name of website variable diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php index e26b4d2cd0b0d..ec15cb00fc4e0 100644 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php @@ -151,7 +151,7 @@ protected function getFieldsForFieldset() $websitesList = $this->getWebsitesList(); $isNewProduct = !$this->locator->getProduct()->getId(); $tooltip = [ - 'link' => 'http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes', + 'link' => 'http://docs.magento.com/m2/ce/user_guide/configuration/scope.html', 'description' => __( 'If your Magento site has multiple views, ' . 'you can set the scope to apply to a specific view.' diff --git a/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml b/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml index 71ac90e5e8aff..363ec4c452f17 100644 --- a/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml +++ b/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml @@ -130,7 +130,7 @@ catalog_rule website_ids - http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes + http://docs.magento.com/m2/ce/user_guide/configuration/scope.html What is this? diff --git a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml index 111151c572565..35d8fcee8eb1d 100644 --- a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml +++ b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml @@ -103,7 +103,7 @@ true - http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes + http://docs.magento.com/m2/ce/user_guide/configuration/scope.html If your Magento site has multiple views, you can set the scope to apply to a specific view. diff --git a/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml b/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml index 0a2ff4744720c..622e6355c57a5 100644 --- a/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml +++ b/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml @@ -123,7 +123,7 @@ sales_rule website_ids - http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes + http://docs.magento.com/m2/ce/user_guide/configuration/scope.html What is this? diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less index fd5ef3a41adbe..07dd3e8ac67da 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less @@ -20,6 +20,7 @@ @field-tooltip-content__border-color: @color-dark-grayish-orange; @field-tooltip-content__padding: 1.5rem 2.5rem; @field-tooltip-content__width: 32rem; +@field-tooltip-content__z-index: 1; @field-tooltip-action__margin-left: 2rem; @@ -47,6 +48,9 @@ .admin__field-tooltip-action { display: inline-block; margin-left: @field-tooltip-action__margin-left; + position: relative; + z-index: @field-tooltip-content__z-index + 1; + .lib-icon-font( @icon-help__content, @icons-admin__font-name, @@ -104,5 +108,5 @@ padding: @field-tooltip-content__padding; position: absolute; width: @field-tooltip-content__width; - z-index: 1; + z-index: @field-tooltip-content__z-index; } From 4d244118b9979fe45e6feef8ae363ba077497edd Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Fri, 12 Feb 2016 14:54:37 +0200 Subject: [PATCH 5/9] MAGETWO-47606: Located in header & footer Widgets have no paddings if responsive - Formatting and sorting --- .../web/css/source/_widgets.less | 72 ++-- .../web/css/source/_widgets.less | 270 +++++++------- .../Magento_Cms/web/css/source/_widgets.less | 28 +- .../web/css/source/_widgets.less | 12 +- .../Magento_Theme/web/css/source/_module.less | 345 +++++++++--------- .../web/css/source/_widgets.less | 24 +- 6 files changed, 378 insertions(+), 373 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less index 5990aaa9f707b..6750cb55e8205 100644 --- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less +++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less @@ -4,57 +4,55 @@ // */ // -// Common -//-------------------------------------- +// Common +// _____________________________________________ & when (@media-common = true) { - -.block-product-link, -.block-category-link { - &.widget { - display: block; - margin-bottom: @indent__base; + .block-product-link, + .block-category-link { + &.widget { + display: block; + margin-bottom: @indent__base; + } } -} -.block-product-link-inline { - &.widget { - margin: 0; + .block-product-link-inline { + &.widget { + margin: 0; + } } -} -.block.widget { - .product-item-info { - width: auto; - } + .block.widget { + .product-item-info { + width: auto; + } - .pager { - padding: 0; + .pager { + padding: 0; - .toolbar-amount { - float: none; - .lib-font-size(12); - } + .toolbar-amount { + float: none; + .lib-font-size(12); + } - .pages-item-previous { - padding-left: 0; - } + .pages-item-previous { + padding-left: 0; + } - .pages-item-next { - position: relative; - } + .pages-item-next { + position: relative; + } - .items { - white-space: nowrap; + .items { + white-space: nowrap; + } } } } -} - // -// Mobile -//-------------------------------------- +// Mobile +// _____________________________________________ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) { .block.widget .products-grid .product-item, @@ -63,8 +61,8 @@ } // -// Desktop -//-------------------------------------- +// Desktop +// _____________________________________________ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { .block.widget .products-grid .product-item{ width: 100%/3 } diff --git a/app/design/frontend/Magento/blank/Magento_CatalogEvent/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_CatalogEvent/web/css/source/_widgets.less index afb2bf3167658..df757fc8298f5 100644 --- a/app/design/frontend/Magento/blank/Magento_CatalogEvent/web/css/source/_widgets.less +++ b/app/design/frontend/Magento/blank/Magento_CatalogEvent/web/css/source/_widgets.less @@ -4,179 +4,179 @@ // */ // -// Common -//-------------------------------------- +// Common +// _____________________________________________ & when (@media-common = true) { + .block-event { + .columns & { + position: relative; + z-index: 2; + } -.block-event { - .columns & { - position: relative; - z-index: 2; - } - - .block-content { - position: relative; - - > .action { - cursor: pointer; - margin-top: -6px; - position: absolute; - top: 50%; - z-index: 3; - - &.backward, - &.forward { - opacity: .5; - overflow: hidden; - width: 20px; - - .lib-icon-font( - @_icon-font-content: @icon-prev, - @_icon-font-text-hide: true, - @_icon-font-size: 55px, - @_icon-font-line-height: 30px - ); - - &:before { - margin-left: -15px; + .block-content { + position: relative; + + > .action { + cursor: pointer; + margin-top: -6px; + position: absolute; + top: 50%; + z-index: 3; + + &.backward, + &.forward { + opacity: .5; + overflow: hidden; + width: 20px; + + .lib-icon-font( + @_icon-font-content: @icon-prev, + @_icon-font-text-hide: true, + @_icon-font-size: 55px, + @_icon-font-line-height: 30px + ); + + &:before { + margin-left: -15px; + } } - } - &.backward { - left: 0; - } + &.backward { + left: 0; + } - &.forward { - right: 0; - .lib-icon-font-symbol(@icon-next); - } + &.forward { + right: 0; + .lib-icon-font-symbol(@icon-next); + } - &.inactive { - cursor: default; - display: none; - } + &.inactive { + cursor: default; + display: none; + } - &:hover { - opacity: 1; + &:hover { + opacity: 1; + } } } - } - .slider-panel { - position: relative; - overflow: hidden; - z-index: 2; - - .slider { - &:extend(.abs-reset-list all); - white-space: nowrap; - - .item { - .lib-css(background, @catalog-event-background-color); - display: inline-block; - text-align: center; - white-space: normal; - vertical-align: top; - width: 16.35%; - - .sidebar-main &, - .sidebar-additional & { - width: 100%; - } + .slider-panel { + overflow: hidden; + position: relative; + z-index: 2; - img { - max-width: 100%; - } + .slider { + &:extend(.abs-reset-list all); + white-space: nowrap; - .category-name { + .item { + .lib-css(background, @catalog-event-background-color); display: inline-block; - .lib-font-size(18); - padding: 15px 5px 0; - word-break: break-all; - } - - .ticker { - .lib-list-reset-styles(); - - li { - display: none; - margin: 0 5px; + text-align: center; + vertical-align: top; + white-space: normal; + width: 16.35%; + + .sidebar-main &, + .sidebar-additional & { + width: 100%; } - .value { - .lib-font-size(26); - font-weight: @font-weight__light; + img { + max-width: 100%; } - .label { - display: block; - .lib-font-size(13); + .category-name { + display: inline-block; + .lib-font-size(18); + padding: 15px 5px 0; + word-break: break-all; } - } - .dates { - font-weight: @font-weight__light; + .ticker { + .lib-list-reset-styles(); - .start, - .end, - .date { - display: block; - } + li { + display: none; + margin: 0 5px; + } - .start { - &:after { - content: "\2013"; - .lib-font-size(18); + .value { + .lib-font-size(26); + font-weight: @font-weight__light; + } + + .label { display: block; + .lib-font-size(13); } } - .date { - .lib-font-size(18); + .dates { font-weight: @font-weight__light; - } - .time { - .lib-font-size(13); - } - } + .start, + .end, + .date { + display: block; + } - .box-event { - .box-content { - padding: 5px 0 @indent__s; - } + .start { + &:after { + content: "\2013"; + .lib-font-size(18); + display: block; + } + } - .box-title { - font-weight: @font-weight__light; - display: block; - margin: @indent__s 0 0; - } - } + .date { + .lib-font-size(18); + font-weight: @font-weight__light; + } - .action { - &.show { - &:extend(.abs-add-box-sizing all); - display: block; - padding: 0; + .time { + .lib-font-size(13); + } + } - .category.name { - display: inline-block; - padding: 30px 10px 0; + .box-event { + .box-content { + padding: 5px 0 @indent__s; } - img { + .box-title { + font-weight: @font-weight__light; display: block; + margin: @indent__s 0 0; } } - &.event { - .lib-button-primary(); - &:extend(.abs-action-link-button all); - margin-top: 15px; + .action { + &.show { + &:extend(.abs-add-box-sizing all); + display: block; + padding: 0; + + .category.name { + display: inline-block; + padding: 30px 10px 0; + } + + img { + display: block; + } + } + + &.event { + .lib-button-primary(); + &:extend(.abs-action-link-button all); + margin-top: 15px; - &:hover { - text-decoration: none; + &:hover { + text-decoration: none; + } } } } @@ -184,5 +184,3 @@ } } } - -} diff --git a/app/design/frontend/Magento/blank/Magento_Cms/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_Cms/web/css/source/_widgets.less index 0ad93a001be84..edb1a57d11b64 100644 --- a/app/design/frontend/Magento/blank/Magento_Cms/web/css/source/_widgets.less +++ b/app/design/frontend/Magento/blank/Magento_Cms/web/css/source/_widgets.less @@ -6,25 +6,23 @@ @widgets-indent__bottom: @indent__base; // -// Common -//-------------------------------------- +// Common +// _____________________________________________ & when (@media-common = true) { - -.block-static-block, -.block-cms-link { - &.widget { - .lib-css(margin-bottom, @widgets-indent__bottom); - .links & { - margin-bottom: 0; + .block-static-block, + .block-cms-link { + &.widget { + .lib-css(margin-bottom, @widgets-indent__bottom); + .links & { + margin-bottom: 0; + } } } -} -.block-cms-link-inline { - &.widget { - margin: 0; + .block-cms-link-inline { + &.widget { + margin: 0; + } } } - -} diff --git a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_widgets.less index a8e77fb379ba3..cf332171f63af 100644 --- a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_widgets.less +++ b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_widgets.less @@ -3,8 +3,14 @@ // * See COPYING.txt for license details. // */ -.block-wishlist-search { - .form-wishlist-search { - margin: @form-field__vertical-indent 0 0; +// +// Common +// _____________________________________________ + +& when (@media-common = true) { + .block-wishlist-search { + .form-wishlist-search { + margin: @form-field__vertical-indent 0 0; + } } } diff --git a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less index 156bede39b778..c31b7f262f6a7 100644 --- a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less @@ -5,28 +5,41 @@ @import 'module/_collapsible_navigation.less'; -@message-global-note__color: @text__color; +// +// Theme variables +// _____________________________________________ + +// +// Messages +// --------------------------------------------- + @message-global-note__background: @color-yellow-light2; @message-global-note__border-color: @color-yellow-light3; +@message-global-note__color: @text__color; @message-global-note-link__color: @link__color; @message-global-note-link__color-hover: @link__hover__color; @message-global-note-link__color-active: @link__active__color; -@message-global-caution__color: @color-white; @message-global-caution__background: @color-red9; @message-global-caution__border-color: none; +@message-global-caution__color: @color-white; @message-global-caution-link__color: @link__color; @message-global-caution-link__color-hover: @link__hover__color; @message-global-caution-link__color-active: @link__active__color; +// +// Header +// --------------------------------------------- + @header__background-color: false; @header-icons-color: @color-gray56; @header-icons-color-hover: @color-gray20; @addto-color: @text__color__muted; @addto-hover-color: @primary__color; + @minicart-icons-color: @header-icons-color; @minicart-icons-color-hover: @header-icons-color-hover; @@ -41,153 +54,154 @@ @footer__background-color: false; // -// Common -//-------------------------------------- +// Common +// _____________________________________________ & when (@media-common = true) { -body { - .lib-css(background-color, @page__background-color); -} - -// -// Header -//-------------------------------------- -.page-header { - .lib-css(background-color, @header__background-color); - border-bottom: 1px solid @border-color__base; - margin-bottom: @indent__base; -} - -.header { - &.content { - padding-top: @indent__s; - position: relative; - &:extend(.abs-add-clearfix all); + body { + .lib-css(background-color, @page__background-color); } -} -.logo { - position: relative; - z-index: 5; - float: left; - max-width: 50%; - margin: 0 0 @indent__s @indent__xl; + // + // Header + // --------------------------------------------- - img { - display: block; + .page-header { + .lib-css(background-color, @header__background-color); + border-bottom: 1px solid @border-color__base; + margin-bottom: @indent__base; } - .page-print & { - float: none; + .header { + &.content { + &:extend(.abs-add-clearfix all); + padding-top: @indent__s; + position: relative; + } } -} -.page-main { - > .page-title-wrapper { - .page-title + .action { - margin-top: @indent__l; + .logo { + float: left; + margin: 0 0 @indent__s @indent__xl; + max-width: 50%; + position: relative; + z-index: 5; + + img { + display: block; } - } -} -.action.skip { - &:not(:focus) { - &:extend(.abs-visually-hidden all); + .page-print & { + float: none; + } } - &:focus { - position: absolute; - z-index: 15; - box-sizing: border-box; - width: 100%; - left: 0; - top: 0; - text-align: center; - .lib-css(background, @color-gray94); - .lib-css(padding, @indent__s); + .page-main { + > .page-title-wrapper { + .page-title + .action { + margin-top: @indent__l; + } + } } -} -// -// Global notice -//-------------------------------------- + .action.skip { + &:not(:focus) { + &:extend(.abs-visually-hidden all); + } -.message.global { - p { - margin: 0; + &:focus { + .lib-css(background, @color-gray94); + .lib-css(padding, @indent__s); + box-sizing: border-box; + left: 0; + position: absolute; + text-align: center; + top: 0; + width: 100%; + z-index: 15; + } } - &.noscript, - &.cookie { - .lib-message(@_message-type: global-note); - margin: 0; - } + // + // Global notice + // --------------------------------------------- + + .message.global { + p { + margin: 0; + } - &.cookie { - position: fixed; - bottom: 0; - left: 0; - right: 0; - z-index: 3; + &.noscript, + &.cookie { + .lib-message(@_message-type: global-note); + margin: 0; + } - .actions { - margin-top: @indent__s; + &.cookie { + bottom: 0; + left: 0; + position: fixed; + right: 0; + z-index: 3; + + .actions { + margin-top: @indent__s; + } } - } - &.demo { - .lib-message(@_message-type: global-caution); - text-align: center; - margin-bottom: 0; + &.demo { + .lib-message(@_message-type: global-caution); + margin-bottom: 0; + text-align: center; + } } -} -// -// Footer -//-------------------------------------- + // + // Footer + // --------------------------------------------- -.page-footer { - margin-top: auto; - .lib-css(background-color, @footer__background-color); -} + .page-footer { + .lib-css(background-color, @footer__background-color); + margin-top: auto; + } -.footer { - &.content { - padding-top: 25px; - margin-top: 25px; - padding-bottom: 25px; - border-top: 1px solid @border-color__base; + .footer { + &.content { + border-top: 1px solid @border-color__base; + margin-top: 25px; + padding-bottom: 25px; + padding-top: 25px; - ul { - &:extend(.abs-reset-list all); - } + ul { + &:extend(.abs-reset-list all); + } - .links { - > li { - margin: 0 0 8px; + .links { + > li { + margin: 0 0 8px; + } } - } - .switcher-store { - margin: 0 0 30px; + .switcher-store { + margin: 0 0 30px; + } } - } - .copyright, - .bugs { - display: block; - margin: 20px 0 0; + .copyright, + .bugs { + display: block; + margin: 20px 0 0; + } } -} -.page-header, -.page-footer { - .switcher { - margin-right: 10px; + .page-header, + .page-footer { + .switcher { + margin-right: 10px; - .options { - .lib-dropdown( + .options { + .lib-dropdown( @_dropdown-actions-padding: 0, @_dropdown-list-item-padding: 0, @_dropdown-toggle-icon-content: @icon-down, @@ -196,74 +210,84 @@ body { @_icon-font-size: 22px, @_icon-font-line-height: 22px, @_dropdown-list-min-width: 160px - ); + ); - ul.dropdown { - a { - display: block; - padding: 8px; + ul.dropdown { + a { + display: block; + padding: 8px; - &:hover { - text-decoration: none; + &:hover { + text-decoration: none; + } } } } - } - li { - margin: 0; - font-size: @font-size__s; - } + li { + font-size: @font-size__s; + margin: 0; + } - .label { - &:extend(.abs-visually-hidden all); + .label { + &:extend(.abs-visually-hidden all); + } + + strong { + font-weight: @font-weight__regular; + } } + } - strong { - font-weight: @font-weight__regular; + // + // Widgets + // --------------------------------------------- + + .sidebar { + .widget.block:not(:last-child), + .widget:not(:last-child) { + &:extend(.abs-margin-for-blocks-and-widgets all); } } -} -// -// Widgets -//-------------------------------------- -.sidebar { - .widget.block:not(:last-child), - .widget:not(:last-child) { - &:extend(.abs-margin-for-blocks-and-widgets all); + .widget { + clear: both; + .block-title { + &:extend(.abs-block-title all); + } } -} -.widget { - clear: both; - .block-title { - &:extend(.abs-block-title all); + .no-display { + &:extend(.abs-no-display all); } -} + // Calendar + .ui-datepicker td { + padding: 0; + } } // -// Desktop -//-------------------------------------- +// Desktop +// _____________________________________________ + .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { html, body { - height: 100%; // stretch screen area for sticky footer + height: 100%; // Stretch screen area for sticky footer } .page-wrapper { .lib-vendor-prefix-display(flex); .lib-vendor-prefix-flex-direction(column); - min-height: 100%; // stretch content area for sticky footer + min-height: 100%; // Stretch content area for sticky footer > .breadcrumbs, > .top-container, > .widget { - width: 100%; box-sizing: border-box; + width: 100%; } .ie10 &, @@ -303,8 +327,8 @@ body { } &.content { - padding: @indent__l @indent__base 0; &:extend(.abs-add-clearfix-desktop all); + padding: @indent__l @indent__base 0; } } @@ -317,9 +341,9 @@ body { } .header.panel { - padding-top: @indent__s; - padding-bottom: @indent__s; &:extend(.abs-add-clearfix-desktop all); + padding-bottom: @indent__s; + padding-top: @indent__s; } .switcher { @@ -356,9 +380,9 @@ body { .links { display: inline-block; - vertical-align: top; margin-bottom: 20px; padding: 0 50px 0 0; + vertical-align: top; } .switcher.store { @@ -373,20 +397,3 @@ body { } } } - -// -// Common -//-------------------------------------- - -& when (@media-common = true) { - -.no-display { - &:extend(.abs-no-display all); -} - -// Calendar -.ui-datepicker td { - padding: 0; -} - -} diff --git a/app/design/frontend/Magento/blank/Magento_VersionsCms/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_VersionsCms/web/css/source/_widgets.less index eb47c8c5139bd..2a00354796190 100644 --- a/app/design/frontend/Magento/blank/Magento_VersionsCms/web/css/source/_widgets.less +++ b/app/design/frontend/Magento/blank/Magento_VersionsCms/web/css/source/_widgets.less @@ -4,22 +4,20 @@ // */ // -// Common -//-------------------------------------- +// Common +// _____________________________________________ & when (@media-common = true) { - -.block-cms-hierarchy-link { - &.widget { - display: block; - margin-bottom: @indent__base; + .block-cms-hierarchy-link { + &.widget { + display: block; + margin-bottom: @indent__base; + } } -} -.block-cms-hierarchy-link-inline { - &.widget { - margin: 0; + .block-cms-hierarchy-link-inline { + &.widget { + margin: 0; + } } } - -} From 4125c2e6438ec9053d29776858089b5ac8099327 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Fri, 12 Feb 2016 17:11:37 +0200 Subject: [PATCH 6/9] MAGETWO-47606: Located in header & footer Widgets have no paddings if responsive --- .../Magento_Theme/web/css/source/_module.less | 17 +++- .../Magento_Theme/web/css/source/_module.less | 93 +++++++++---------- 2 files changed, 59 insertions(+), 51 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less index c31b7f262f6a7..9dded8e831a2a 100644 --- a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less @@ -252,18 +252,31 @@ .widget { clear: both; + .block-title { &:extend(.abs-block-title all); } } + .page-header, + .page-footer { + .widget.block { + .lib-css(margin, @indent__base 0); + } + } + .no-display { &:extend(.abs-no-display all); } + // // Calendar - .ui-datepicker td { - padding: 0; + // --------------------------------------------- + + .ui-datepicker { + td { + padding: 0; + } } } diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less index ceed52d50e34a..17b65e3434ce5 100644 --- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less @@ -312,11 +312,53 @@ } } } + + // + // Widgets + // --------------------------------------------- + + .sidebar { + .widget.block:not(:last-child), + .widget:not(:last-child) { + margin-bottom: @indent__xl; + } + } + + .widget { + clear: both; + + .block-title:extend(.abs-block-widget-title all) { + } + } + + .page-header, + .page-footer { + .widget.block { + .lib-css(margin, @indent__base 0); + } + } + + .no-display:extend(.abs-no-display all) { + } + + // + // Calendar + // --------------------------------------------- + + .ui-datepicker td { + padding: 0; + } + + .ui-tooltip { + .lib-css(background, @tooltip__background); + border: @tooltip__border-width solid @tooltip__border-color; + padding: 10px; + } } // // Navigation -// --------------------------------------------- +// _____________________________________________ .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { .customer-name, @@ -384,30 +426,6 @@ } } -// -// Common -// _____________________________________________ - -& when (@media-common = true) { - - // - // Widgets - // --------------------------------------------- - - .sidebar { - .widget.block:not(:last-child), - .widget:not(:last-child) { - margin-bottom: @indent__xl; - } - } - - .widget { - clear: both; - .block-title:extend(.abs-block-widget-title all) { - } - } -} - // // Desktop // _____________________________________________ @@ -415,7 +433,7 @@ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { html, body { - height: 100%; // Stretch screen area for sticky footer + height: 100%; // Stretch screen area for sticky footer } body { @@ -648,26 +666,3 @@ } } } - -// -// Common -// _____________________________________________ - -& when (@media-common = true) { - .no-display:extend(.abs-no-display all) { - } - - // - // Calendar - // --------------------------------------------- - - .ui-datepicker td { - padding: 0; - } - - .ui-tooltip { - border: @tooltip__border-width solid @tooltip__border-color; - .lib-css(background, @tooltip__background); - padding: 10px; - } -} From 1b9d5d8ddf77f3f7774be5d15e0c861cf2060db0 Mon Sep 17 00:00:00 2001 From: Olga Lytvynenko Date: Thu, 17 Mar 2016 12:09:08 +0200 Subject: [PATCH 7/9] MAGETWO-50232: Not clickable elements can be reached from keyboard while Merchant creates Product --- app/code/Magento/Ui/view/base/web/templates/form/fieldset.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/templates/form/fieldset.html b/app/code/Magento/Ui/view/base/web/templates/form/fieldset.html index 81538d319ac56..d9f6281c70db4 100644 --- a/app/code/Magento/Ui/view/base/web/templates/form/fieldset.html +++ b/app/code/Magento/Ui/view/base/web/templates/form/fieldset.html @@ -9,7 +9,7 @@ attr="'data-level': $data.level, 'data-index': index" data-bind="visible: $data.visible === undefined ? true: $data.visible">
From d23e38d52a4a3ddfdc28efbaf97be25a8fabc59a Mon Sep 17 00:00:00 2001 From: Olga Lytvynenko Date: Thu, 17 Mar 2016 14:07:00 +0200 Subject: [PATCH 8/9] MAGETWO-50527: Password is not autofilled on Login Form to Admin --- .../adminhtml/templates/admin/login.phtml | 53 ++++++++++--------- .../web/css/source/module/pages/_login.less | 5 -- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml index f1c516f0e7a59..2a65eac44b106 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml @@ -10,38 +10,41 @@
-
+ + +
- +
- +
- +
- - - +
getChildHtml('form.additional.info'); ?> diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less index 67543d8514167..c61a0ce00946d 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less +++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less @@ -100,11 +100,6 @@ } } -// @todo ui - Find out if this trick still relevant app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml:23 -.admin__control-dummy { - display: none; -} - // Footer .login-footer { color: @color-heathered-grey; From 64fa3a9d5bb78337dbfff0df0dac36e9605ab225 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Mon, 21 Mar 2016 10:57:53 +0200 Subject: [PATCH 9/9] MAGETWO-50679: Wrong copyright year in checkout template --- .../Magento/Checkout/view/frontend/page_layout/checkout.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml b/app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml index 6a1061bd10b6f..9a78a87649f31 100644 --- a/app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml +++ b/app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml @@ -1,7 +1,7 @@