Skip to content

Commit

Permalink
Merge pull request #46 from magento-webdev/PR-4
Browse files Browse the repository at this point in the history 
[WebDev] Bugfixes
  • Loading branch information
Korshenko, Olexii(okorshenko) committed Oct 28, 2015
2 parents 4525716 + ba2da05 commit be268e8
Show file tree
Hide file tree
Showing 12 changed files with 475 additions and 411 deletions.
4 changes: 4 additions & 0 deletions app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,9 +558,12 @@
.product-info-main {
float: right;
}

.product.media {
float: left;
margin-bottom: @indent__m;
}

.page-layout-1column {
.product-info-main {
width: 40%;
Expand All @@ -569,6 +572,7 @@
width: 57%;
}
}

.page-layout-2columns-left,
.page-layout-2columns-right,
.page-layout-3columns {
Expand Down
155 changes: 84 additions & 71 deletions app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,105 +4,109 @@
// */

//
// Common
//--------------------------------------
// Common
// _____________________________________________

@toolbar-mode-icon-font-size: 24px;
@toolbar-element-background: @panel__background-color;

& when (@media-common = true) {

.page-products .columns {
position: relative;
z-index: 1;
}

.toolbar {
&:extend(.abs-add-clearfix all);
&-amount {
display: block;
line-height: @toolbar-mode-icon-font-size+2;
padding: 8px 0 0;
margin: 0;
vertical-align: middle;
.products.wrapper ~ .toolbar & {
display: none;
.page-products {
.columns {
position: relative;
z-index: 1;
}
}
&-products {
margin-bottom: @indent__xl;
text-align: center;
padding: 0 @indent__s;

.toolbar {
&:extend(.abs-add-clearfix all);
.pages {
display: none;
.products.wrapper ~ & {
display: block;
&-amount {
display: block;
line-height: @toolbar-mode-icon-font-size+2;
margin: 0;
padding: 8px 0 0;
vertical-align: middle;
.products.wrapper ~ .toolbar & {
display: none;
}
}
.limiter {
display: none;
.control {
display: inline-block;
&-products {
margin-bottom: @indent__xl;
padding: 0 @indent__s;
text-align: center;
&:extend(.abs-add-clearfix all);
.pages {
display: none;
.products.wrapper ~ & {
display: block;
}
}
.limiter {
display: none;
.control {
display: inline-block;
}
}
}
}
}

.sorter {
padding: 4px 0 0;
.products.wrapper ~ .toolbar & {
display: none;
}
&-options {
margin: 0 0 0 7px;
width: auto;
}
&-action {
vertical-align: top;
.lib-icon-font(
.sorter {
padding: 4px 0 0;
.products.wrapper ~ .toolbar & {
display: none;
}
&-options {
margin: 0 0 0 7px;
width: auto;
}
&-action {
vertical-align: top;
.lib-icon-font(
@icon-arrow-up,
@_icon-font-size: 28px,
@_icon-font-line-height: 32px,
@_icon-font-color: @header-icons-color,
@_icon-font-color-hover: @header-icons-color-hover,
@_icon-font-text-hide: true
);
&.sort-desc:before {
content: @icon-arrow-down;
);
&.sort-desc:before {
content: @icon-arrow-down;
}
}
}
}

.modes {
display: none;
}

.limiter {
&-options {
width: auto;
margin: 0 5px 0 7px;
}
&-label {
font-weight: 400;
}
.page-products .toolbar & {
.modes {
display: none;
}
}

.limiter {
&-options {
width: auto;
margin: 0 5px 0 7px;
}
&-label {
font-weight: 400;
}
.page-products .toolbar & {
display: none;
}
}
}

//
// Mobile
// ---------------------------------------------
// Desctop
// _____________________________________________

.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
.page-products .columns {
position: relative;
z-index: 1;
padding-top: 0;
.page-products {
.columns {
padding-top: 0;
position: relative;
z-index: 1;
}
}

.toolbar {
.products.wrapper ~ & .pages {
float: left;
Expand All @@ -111,19 +115,24 @@
float: left;
}
}

.sorter {
float: right;
}

.modes {
float: left;
display: inline-block;
float: left;
margin-right: @indent__base;

.products.wrapper ~ .toolbar & {
display: none;
}

&-label {
&:extend(.abs-visually-hidden-desktop-s all);
}

&-mode {
.lib-css(color, @text__color__muted);
border: 1px solid @border-color__base;
Expand All @@ -134,8 +143,8 @@
padding: 7px 10px;
text-align: center;
&:not(.active):hover {
background: darken(@toolbar-element-background, 7%);
.lib-css(color, @text__color__muted);
background: darken(@toolbar-element-background, 7%);
}
&:last-child {
border-right: 1px solid @border-color__base;
Expand All @@ -144,15 +153,19 @@
.lib-css(color, @primary__color__light);
}
.lib-icon-font(
@icon-grid,
@_icon-font-size: @toolbar-mode-icon-font-size,
@_icon-font-text-hide: true
@icon-grid,
@_icon-font-size: @toolbar-mode-icon-font-size,
@_icon-font-text-hide: true,
@_icon-font-color: @text__color__muted,
@_icon-font-color-hover: @text__color__muted
);
}
}

.mode-list {
.lib-icon-font-symbol(@icon-list);
}

.limiter {
float: right;
.products.wrapper ~ .toolbar & {
Expand Down
22 changes: 12 additions & 10 deletions app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@
}
.subtitle {
display: none;
}
.subtitle {
&.empty {
display: block;
font-size: 14px;
Expand Down Expand Up @@ -124,10 +122,14 @@
right: 26px;
}
}
.product.actions {
text-align: right;
> .primary, > .secondary {
display: inline;
.product {
.actions {
float: right;
margin: -24px 0 0;
text-align: right;
> .primary, > .secondary {
display: inline;
}
}
}

Expand Down Expand Up @@ -165,7 +167,7 @@
text-align: center;
white-space: normal;
&.empty {
&:extend(.abs-no-display all);
display: none;
}
.loader {
> img {
Expand All @@ -184,8 +186,8 @@
}

.minicart-items-wrapper {
.lib-css(margin, 0 -@minicart__padding-horizontal);
.lib-css(border, 1px solid @minicart__border-color);
.lib-css(margin, 0 -@minicart__padding-horizontal);
border-left: 0;
border-right: 0;
overflow-x: auto;
Expand Down Expand Up @@ -301,12 +303,12 @@
text-align: center;
width: 40px;
}
.item-update {
.update-cart-item {
.lib-font-size(11);
vertical-align: top;
}
.subtitle {
&:extend(.abs-no-display all);
display: none;
}
.action {
&.edit,
Expand Down
Loading

0 comments on commit be268e8

Please sign in to comment.