Merge pull request #13898 from rellect/sass_woocommerce

Remove deep nesting where not necessary (woocommerce.scss)
This commit is contained in:
Mike Jolley 2017-04-27 12:07:29 +01:00 committed by GitHub
commit 8f5a8b0ede
1 changed files with 299 additions and 398 deletions

View File

@ -39,10 +39,8 @@ p.demo_store,
}
}
.admin-bar {
p.demo_store {
top: 32px;
}
.admin-bar p.demo_store {
top: 32px;
}
/**
@ -103,11 +101,9 @@ p.demo_store,
}
}
.quantity {
.qty {
width: 3.631em;
text-align: center;
}
.quantity .qty {
width: 3.631em;
text-align: center;
}
/**
@ -435,10 +431,8 @@ p.demo_store,
}
}
.woocommerce-variation-description {
p {
margin-bottom: 1em;
}
.woocommerce-variation-description p {
margin-bottom: 1em;
}
.reset_variations {
@ -518,71 +512,69 @@ p.demo_store,
}
}
ul.products {
li.product {
.onsale {
top: 0;
right: 0;
left: auto;
margin: -0.5em -0.5em 0 0;
}
ul.products li.product {
.onsale {
top: 0;
right: 0;
left: auto;
margin: -0.5em -0.5em 0 0;
}
h3,
.woocommerce-loop-product__title,
.woocommerce-loop-category__title {
padding: 0.5em 0;
margin: 0;
font-size: 1em;
}
h3,
.woocommerce-loop-product__title,
.woocommerce-loop-category__title {
padding: 0.5em 0;
margin: 0;
font-size: 1em;
}
a {
text-decoration: none;
}
a {
text-decoration: none;
}
a img {
width: 100%;
height: auto;
display: block;
margin: 0 0 1em;
box-shadow: none;
}
a img {
width: 100%;
height: auto;
display: block;
margin: 0 0 1em;
box-shadow: none;
}
strong {
strong {
display: block;
}
.star-rating {
font-size: 0.857em;
}
.button {
margin-top: 1em;
}
.price {
color: $highlight;
display: block;
font-weight: normal;
margin-bottom: 0.5em;
font-size: 0.857em;
del {
color: inherit;
opacity: 0.5;
display: block;
}
.star-rating {
font-size: 0.857em;
ins {
background: none;
font-weight: 700;
}
.button {
margin-top: 1em;
}
.price {
color: $highlight;
display: block;
font-weight: normal;
margin-bottom: 0.5em;
font-size: 0.857em;
del {
color: inherit;
opacity: 0.5;
display: block;
}
ins {
background: none;
font-weight: 700;
}
.from {
font-size: 0.67em;
margin: -2px 0 0 0;
text-transform: uppercase;
color: rgba(desaturate($highlight, 75%), 0.5);
}
.from {
font-size: 0.67em;
margin: -2px 0 0 0;
text-transform: uppercase;
color: rgba(desaturate($highlight, 75%), 0.5);
}
}
}
@ -689,13 +681,11 @@ p.demo_store,
}
}
&.added {
&::after {
font-family: 'WooCommerce';
content: '\e017';
margin-left: 0.53em;
vertical-align: bottom;
}
&.added::after {
font-family: 'WooCommerce';
content: '\e017';
margin-left: 0.53em;
vertical-align: bottom;
}
&:hover {
@ -915,44 +905,36 @@ p.demo_store,
}
}
.products {
.star-rating {
display: block;
margin: 0 0 0.5em;
float: none;
}
.products .star-rating {
display: block;
margin: 0 0 0.5em;
float: none;
}
.hreview-aggregate {
.star-rating {
margin: 10px 0 0;
}
.hreview-aggregate .star-rating {
margin: 10px 0 0;
}
#review_form {
#respond {
@include clearfix();
position: static;
margin: 0;
width: auto;
padding: 0;
background: transparent none;
border: 0;
#review_form #respond {
@include clearfix();
position: static;
margin: 0;
width: auto;
padding: 0;
background: transparent none;
border: 0;
p {
margin: 0 0 10px;
}
p {
margin: 0 0 10px;
}
.form-submit {
input {
left: auto;
}
}
.form-submit input {
left: auto;
}
textarea {
box-sizing: border-box;
width: 100%;
}
textarea {
box-sizing: border-box;
width: 100%;
}
}
@ -978,19 +960,13 @@ p.demo_store,
text-indent: 0;
}
&:hover {
~ a::before {
content: '\e021';
}
&:hover ~ a::before {
content: '\e021';
}
}
&:hover {
a {
&::before {
content: '\e020';
}
}
&:hover a::before {
content: '\e020';
}
&.selected {
@ -1004,10 +980,8 @@ p.demo_store,
}
}
a:not( .active ) {
&::before {
content: '\e020';
}
a:not( .active )::before {
content: '\e020';
}
}
}
@ -1074,12 +1048,10 @@ p.demo_store,
}
}
tbody:first-child {
tr:first-child {
th,
td {
border-top: 0;
}
tbody:first-child tr:first-child {
th,
td {
border-top: 0;
}
}
@ -1125,11 +1097,9 @@ p.demo_store,
&:last-child {
text-align: left;
}
.woocommerce-MyAccount-downloads-file {
&::before {
content: '\2193';
display: inline-block;
}
.woocommerce-MyAccount-downloads-file::before {
content: '\2193';
display: inline-block;
}
}
}
@ -1165,7 +1135,6 @@ p.demo_store,
min-width: 80px;
}
/**
* Cart sidebar
*/
@ -1241,17 +1210,15 @@ p.demo_store,
}
}
.cart_list {
li {
padding-left: 2em;
position: relative;
padding-top: 0;
.cart_list li {
padding-left: 2em;
position: relative;
padding-top: 0;
a.remove {
position: absolute;
top: 0;
left: 0;
}
a.remove {
position: absolute;
top: 0;
left: 0;
}
}
@ -1267,101 +1234,99 @@ p.demo_store,
/**
* Forms
*/
form {
.form-row {
padding: 3px;
margin: 0 0 6px;
form .form-row {
padding: 3px;
margin: 0 0 6px;
[placeholder]:focus::-webkit-input-placeholder {
-webkit-transition: opacity 0.5s 0.5s ease;
-moz-transition: opacity 0.5s 0.5s ease;
transition: opacity 0.5s 0.5s ease;
opacity: 0;
}
[placeholder]:focus::-webkit-input-placeholder {
-webkit-transition: opacity 0.5s 0.5s ease;
-moz-transition: opacity 0.5s 0.5s ease;
transition: opacity 0.5s 0.5s ease;
opacity: 0;
}
label {
line-height: 2;
}
label.hidden {
visibility: hidden;
}
label.inline {
display: inline;
}
select {
cursor: pointer;
margin: 0;
}
.required {
color: red;
font-weight: 700;
border: 0;
}
.input-checkbox {
display: inline;
margin: -2px 8px 0 0;
text-align: center;
vertical-align: middle;
}
input.input-text,
textarea {
box-sizing: border-box;
width: 100%;
margin: 0;
outline: 0;
line-height: 1;
}
textarea {
height: 4em;
line-height: 1.5;
display: block;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
}
.select2-container {
width: 100%;
line-height: 2em;
}
&.woocommerce-invalid {
label {
line-height: 2;
color: $red;
}
label.hidden {
visibility: hidden;
}
label.inline {
display: inline;
}
select {
cursor: pointer;
margin: 0;
}
.required {
color: red;
font-weight: 700;
border: 0;
}
.input-checkbox {
display: inline;
margin: -2px 8px 0 0;
text-align: center;
vertical-align: middle;
}
.select2-container,
input.input-text,
textarea {
box-sizing: border-box;
width: 100%;
margin: 0;
outline: 0;
line-height: 1;
select {
border-color: $red;
}
}
textarea {
height: 4em;
line-height: 1.5;
display: block;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
&.woocommerce-validated {
.select2-container,
input.input-text,
select {
border-color: $green - #111;
}
}
.select2-container {
width: 100%;
line-height: 2em;
}
::-webkit-input-placeholder {
line-height: normal;
}
&.woocommerce-invalid {
label {
color: $red;
}
.select2-container,
input.input-text,
select {
border-color: $red;
}
}
:-moz-placeholder {
line-height: normal;
}
&.woocommerce-validated {
.select2-container,
input.input-text,
select {
border-color: $green - #111;
}
}
::-webkit-input-placeholder {
line-height: normal;
}
:-moz-placeholder {
line-height: normal;
}
:-ms-input-placeholder {
line-height: normal;
}
:-ms-input-placeholder {
line-height: normal;
}
}
@ -1442,56 +1407,48 @@ p.demo_store,
/**
* Layered nav widget
*/
.widget_layered_nav {
ul {
margin: 0;
padding: 0;
border: 0;
list-style: none outside;
.widget_layered_nav ul {
margin: 0;
padding: 0;
border: 0;
list-style: none outside;
li {
@include clearfix();
padding: 0 0 1px;
list-style: none;
li {
@include clearfix();
padding: 0 0 1px;
list-style: none;
a,
span {
padding: 1px 0;
}
a,
span {
padding: 1px 0;
}
}
li.chosen {
a {
&::before {
@include iconbefore( '\e013' );
color: $red;
}
}
}
li.chosen a::before {
@include iconbefore( '\e013' );
color: $red;
}
}
.widget_layered_nav_filters {
ul {
margin: 0;
padding: 0;
border: 0;
list-style: none outside;
overflow: hidden;
zoom: 1;
.widget_layered_nav_filters ul {
margin: 0;
padding: 0;
border: 0;
list-style: none outside;
overflow: hidden;
zoom: 1;
li {
float: left;
padding: 0 1px 1px 0;
list-style: none;
li {
float: left;
padding: 0 1px 1px 0;
list-style: none;
a {
text-decoration: none;
a {
text-decoration: none;
&::before {
@include iconbefore( '\e013' );
color: $red;
}
&::before {
@include iconbefore( '\e013' );
color: $red;
}
}
}
@ -1512,9 +1469,6 @@ p.demo_store,
.button {
font-size: 1.15em;
}
.button {
float: left;
}
}
@ -1577,38 +1531,32 @@ p.demo_store,
/**
* Rating Filter Widget
*/
.widget_rating_filter {
ul {
margin: 0;
padding: 0;
border: 0;
list-style: none outside;
.widget_rating_filter ul {
margin: 0;
padding: 0;
border: 0;
list-style: none outside;
li {
@include clearfix();
padding: 0 0 1px;
list-style: none;
li {
@include clearfix();
padding: 0 0 1px;
list-style: none;
a {
padding: 1px 0;
text-decoration: none;
}
.star-rating {
float: none;
display: inline-block;
}
a {
padding: 1px 0;
text-decoration: none;
}
li.chosen {
a {
&::before {
@include iconbefore( '\e013' );
color: $red;
}
}
.star-rating {
float: none;
display: inline-block;
}
}
li.chosen a::before {
@include iconbefore( '\e013' );
color: $red;
}
}
}
@ -1690,18 +1638,8 @@ button.pswp__button--zoom:hover {
/**
* Right to left styles
*/
.rtl {
&.woocommerce {
div.product {
div.images {
.flex-control-thumbs {
li {
float: right;
}
}
}
}
}
.rtl.woocommerce div.product div.images .flex-control-thumbs li {
float: right;
}
.woocommerce-message {
@ -1738,33 +1676,26 @@ button.pswp__button--zoom:hover {
@include clearfix();
}
.addresses {
.title {
@include clearfix();
.addresses .title {
@include clearfix();
h3 {
float: left;
}
h3 {
float: left;
}
.edit {
float: right;
}
.edit {
float: right;
}
}
ol.commentlist.notes {
li.note {
ol.commentlist.notes li.note {
p.meta {
font-weight: 700;
margin-bottom: 0;
}
p.meta {
font-weight: 700;
margin-bottom: 0;
}
.description {
p:last-child {
margin-bottom: 0;
}
}
.description p:last-child {
margin-bottom: 0;
}
}
ul.digital-downloads {
@ -1808,20 +1739,16 @@ button.pswp__button--zoom:hover {
vertical-align: middle;
}
td.actions {
.coupon {
.input-text {
float: left;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
border: 1px solid darken( $secondary, 10% );
padding: 6px 6px 5px;
margin: 0 4px 0 0;
outline: 0;
line-height: 1;
}
}
td.actions .coupon .input-text {
float: left;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
border: 1px solid darken( $secondary, 10% );
padding: 6px 6px 5px;
margin: 0 4px 0 0;
outline: 0;
line-height: 1;
}
input {
@ -1852,19 +1779,15 @@ button.pswp__button--zoom:hover {
display: block;
}
.shipping-calculator-button {
&::after {
@include iconafter( '\e019' );
}
.shipping-calculator-button::after {
@include iconafter( '\e019' );
}
}
.cart_totals {
p {
small {
color: $subtext;
font-size: 0.83em;
}
p small {
color: $subtext;
font-size: 0.83em;
}
table {
@ -1910,12 +1833,8 @@ button.pswp__button--zoom:hover {
}
}
.cross-sells {
ul.products {
li.product {
margin-top: 0;
}
}
.cross-sells ul.products li.product {
margin-top: 0;
}
}
.checkout {
@ -2168,65 +2087,47 @@ button.pswp__button--zoom:hover {
/**
* Twenty Eleven specific styles
*/
#content.twentyeleven {
.woocommerce-pagination {
a {
font-size: 1em;
line-height: 1;
}
}
#content.twentyeleven .woocommerce-pagination a {
font-size: 1em;
line-height: 1;
}
/**
* Twenty Thirteen specific styles
*/
.single-product {
.twentythirteen {
.entry-summary,
#reply-title,
#respond #commentform {
padding: 0;
}
.single-product .twentythirteen {
.entry-summary,
#reply-title,
#respond #commentform {
padding: 0;
}
p.stars {
clear: both;
}
p.stars {
clear: both;
}
}
.twentythirteen {
.woocommerce-breadcrumb {
padding-top: 40px;
}
.twentythirteen .woocommerce-breadcrumb {
padding-top: 40px;
}
/**
* Twenty Fourteen specific styles
*/
.twentyfourteen {
ul.products {
li.product {
margin-top: 0 !important;
}
}
.twentyfourteen ul.products li.product {
margin-top: 0 !important;
}
/**
* Twenty Sixteen specific styles
*/
body:not( .search-results ) {
.twentysixteen {
.entry-summary {
color: inherit;
font-size: inherit;
line-height: inherit;
}
}
body:not( .search-results ) .twentysixteen .entry-summary {
color: inherit;
font-size: inherit;
line-height: inherit;
}
.twentysixteen {
.price ins {
background: inherit;
color: inherit;
}
.twentysixteen .price ins {
background: inherit;
color: inherit;
}