Merge branch 'master' into patch-1

This commit is contained in:
Ismail El Korchi 2020-04-10 22:39:01 +01:00 committed by GitHub
commit 5420e2d3f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 892 additions and 738 deletions

View file

@ -9,8 +9,8 @@
*/
html {
line-height: 1.15; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
line-height: 1.15;
-webkit-text-size-adjust: 100%;
}
/* Sections
@ -43,9 +43,9 @@ h1 {
*/
hr {
box-sizing: content-box; /* 1 */
height: 0; /* 1 */
overflow: visible; /* 2 */
box-sizing: content-box;
height: 0;
overflow: visible;
}
/**
@ -54,8 +54,8 @@ hr {
*/
pre {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
font-family: monospace, monospace;
font-size: 1em;
}
/* Text-level semantics
@ -75,9 +75,9 @@ a {
*/
abbr[title] {
border-bottom: none; /* 1 */
text-decoration: underline; /* 2 */
text-decoration: underline dotted; /* 2 */
border-bottom: none;
text-decoration: underline;
text-decoration: underline dotted;
}
/**
@ -97,8 +97,8 @@ strong {
code,
kbd,
samp {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
font-family: monospace, monospace;
font-size: 1em;
}
/**
@ -154,10 +154,10 @@ input,
optgroup,
select,
textarea {
font-family: inherit; /* 1 */
font-size: 100%; /* 1 */
line-height: 1.15; /* 1 */
margin: 0; /* 2 */
font-family: inherit;
font-size: 100%;
line-height: 1.15;
margin: 0;
}
/**
@ -166,7 +166,7 @@ textarea {
*/
button,
input { /* 1 */
input {
overflow: visible;
}
@ -176,7 +176,7 @@ input { /* 1 */
*/
button,
select { /* 1 */
select {
text-transform: none;
}
@ -230,12 +230,12 @@ fieldset {
*/
legend {
box-sizing: border-box; /* 1 */
color: inherit; /* 2 */
display: table; /* 1 */
max-width: 100%; /* 1 */
padding: 0; /* 3 */
white-space: normal; /* 1 */
box-sizing: border-box;
color: inherit;
display: table;
max-width: 100%;
padding: 0;
white-space: normal;
}
/**
@ -261,8 +261,8 @@ textarea {
[type="checkbox"],
[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
box-sizing: border-box;
padding: 0;
}
/**
@ -280,8 +280,8 @@ textarea {
*/
[type="search"] {
-webkit-appearance: textfield; /* 1 */
outline-offset: -2px; /* 2 */
-webkit-appearance: textfield;
outline-offset: -2px;
}
/**
@ -298,8 +298,8 @@ textarea {
*/
::-webkit-file-upload-button {
-webkit-appearance: button; /* 1 */
font: inherit; /* 2 */
-webkit-appearance: button;
font: inherit;
}
/* Interactive

View file

@ -1,15 +1,17 @@
/* Inherit box-sizing to more easily change it's value on a component level.
@link http://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ */
*,
*::before,
*::after {
box-sizing: inherit;
}
html {
box-sizing: border-box;
}
*,
*:before,
*:after { /* Inherit box-sizing to make it easier to change the property for components that leverage other behavior; see https://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ */
box-sizing: inherit;
}
body {
background: $color__background-body; /* Fallback for when there is no custom background color defined. */
background: $color__background-body; // Fallback for when there is no custom background color defined.
}
hr {
@ -22,12 +24,12 @@ hr {
@import "lists";
img {
height: auto; /* Make sure images are scaled correctly. */
max-width: 100%; /* Adhere to container width. */
height: auto; // Make sure images are scaled correctly.
max-width: 100%; // Adhere to container width.
}
figure {
margin: 1em 0; /* Extra wide images within figure tags don't overflow the content area. */
margin: 1em 0; // Extra wide images within figure tags don't overflow the content area.
}
@import "tables";

View file

@ -1,4 +1,5 @@
ul, ol {
ul,
ol {
margin: 0 0 1.5em 3em;
}
@ -17,7 +18,7 @@ li > ol {
}
dt {
font-weight: bold;
font-weight: 700;
}
dd {

View file

@ -6,10 +6,12 @@ input[type="submit"] {
border-color: $color__border-button;
border-radius: 3px;
background: $color__background-button;
color: rgba(0, 0, 0, .8);
color: rgba(0, 0, 0, 0.8);
@include font-size(0.75);
line-height: 1;
padding: .6em 1em .4em;
padding: 0.6em 1em 0.4em;
&:hover {
border-color: $color__border-button-hover;

View file

@ -1,3 +1,2 @@
@import "buttons";
@import "fields";

View file

@ -1,4 +1,5 @@
.no-sidebar {
.content-area {
float: none;
margin-left: auto;

View file

@ -3,6 +3,7 @@
max-width: 100%;
img[class*="wp-image-"] {
@include center-block;
}

View file

@ -10,8 +10,9 @@
// Loops to enumerate the classes for gallery columns.
@for $i from 2 through 9 {
.gallery-columns-#{$i} & {
max-width: map-get( $columns, $i );
max-width: map-get($columns, $i);
}
}
}

View file

@ -25,5 +25,5 @@
// Column width with margin
@mixin column-width($numberColumns: 3) {
width: map-get( $columns, $numberColumns ) - ( ( $columns__margin * ( $numberColumns - 1 ) ) / $numberColumns );
width: map-get($columns, $numberColumns) - ( ( $columns__margin * ( $numberColumns - 1 ) ) / $numberColumns );
}

View file

@ -9,7 +9,7 @@
padding: 0;
position: absolute !important;
width: 1px;
word-wrap: normal !important; /* Many screen reader and browser combinations announce broken words as they would appear visually. */
word-wrap: normal !important; // Many screen reader and browser combinations announce broken words as they would appear visually.
&:focus {
background-color: $color__background-screen;
@ -19,8 +19,10 @@
clip-path: none;
color: $color__text-screen;
display: block;
@include font-size(0.875);
font-weight: bold;
font-weight: 700;
height: auto;
left: 5px;
line-height: normal;
@ -28,7 +30,7 @@
text-decoration: none;
top: 5px;
width: auto;
z-index: 100000; /* Above WP toolbar. */
z-index: 100000; // Above WP toolbar.
}
}

View file

@ -2,15 +2,20 @@
display: inline;
float: left;
margin-right: 1.5em;
margin-bottom: 1.5em;
}
.alignright {
display: inline;
float: right;
margin-left: 1.5em;
margin-bottom: 1.5em;
}
.aligncenter {
clear: both;
@include center-block;
margin-bottom: 1.5em;
}

View file

@ -4,12 +4,15 @@
.site-header,
.site-content,
.site-footer {
&::before,
&::after {
@include clearfix;
}
&::after {
@include clearfix-after;
}
&::before,
&::after {
@include clearfix;
}
&::after {
@include clearfix-after;
}
}

View file

@ -1,10 +1,10 @@
/* Globally hidden elements when Infinite Scroll is supported and in use. */
.infinite-scroll .posts-navigation, /* Older / Newer Posts Navigation (always hidden) */
.infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling) */
/* Hide the Posts Navigation and the Footer when Infinite Scroll is in use. */
.infinite-scroll .posts-navigation,
.infinite-scroll.neverending .site-footer {
display: none;
}
/* When Infinite Scroll has reached its end we need to re-display elements that were hidden (via .neverending) before. */
/* Re-display the Theme Footer when Infinite Scroll has reached its end. */
.infinity-end.neverending .site-footer {
display: block;
}

View file

@ -4,14 +4,17 @@ a {
&:visited {
color: $color__link-visited;
}
&:hover,
&:focus,
&:active {
color: $color__link-hover;
}
&:focus {
outline: thin dotted;
}
&:hover,
&:active {
outline: 0;

View file

@ -24,6 +24,7 @@
}
li {
&:hover > ul,
&.focus > ul {
left: 100%;
@ -77,9 +78,11 @@
}
@media screen and (min-width: 37.5em) {
.menu-toggle {
display: none;
}
.main-navigation ul {
display: block;
}

View file

@ -1,8 +1,7 @@
/**
* Checkout
*/
@media screen and (min-width: 768px) {
.col2-set {
.form-row-first {
float: left;
margin-right: $columns__margin;
@ -15,6 +14,7 @@
.form-row-first,
.form-row-last {
@include column-width(2);
}
}

View file

@ -5,6 +5,7 @@
position: relative;
margin: 0;
padding: 0;
@include clearfix;
.cart-contents {
@ -31,12 +32,12 @@
line-height: 1.618;
font-size: 1em;
width: 5.3em;
font-family: 'star';
font-family: star;
font-weight: 400;
&:before {
&::before {
content: "\53\53\53\53\53";
opacity: .25;
opacity: 0.25;
float: left;
top: 0;
left: 0;
@ -52,7 +53,7 @@
padding-top: 1.5em;
}
span:before {
span::before {
content: "\53\53\53\53\53";
top: 0;
position: absolute;
@ -62,6 +63,7 @@
}
p.stars {
a {
position: relative;
height: 1em;
@ -72,7 +74,8 @@ p.stars {
margin-right: 1px;
font-weight: 400;
&:before {
&::before {
display: block;
position: absolute;
top: 0;
@ -80,25 +83,28 @@ p.stars {
width: 1em;
height: 1em;
line-height: 1;
font-family: "star";
font-family: star;
content: "\53";
color: $color__text-main;
text-indent: 0;
opacity: .25;
opacity: 0.25;
}
&:hover {
~ a:before {
~ a::before {
content: "\53";
color: $color__text-main;
opacity: .25;
opacity: 0.25;
}
}
}
&:hover {
a {
&:before {
&::before {
content: "\53";
color: $color__link;
opacity: 1;
@ -107,22 +113,25 @@ p.stars {
}
&.selected {
a.active {
&:before {
&::before {
content: "\53";
color: $color__link;
opacity: 1;
}
~ a:before {
~ a::before {
content: "\53";
color: $color__text-main;
opacity: .25;
opacity: 0.25;
}
}
a:not(.active) {
&:before {
&::before {
content: "\53";
color: $color__link;
opacity: 1;
@ -135,6 +144,7 @@ p.stars {
* Tabs
*/
.woocommerce-tabs {
ul.tabs {
list-style: none;
margin: 0;
@ -154,6 +164,7 @@ p.stars {
}
.panel {
h2:first-of-type {
margin-bottom: 1em;
}
@ -187,13 +198,16 @@ p.stars {
* Forms
*/
.form-row {
&.woocommerce-validated {
input.input-text {
box-shadow: inset 2px 0 0 $woocommerce__color-success;
}
}
&.woocommerce-invalid {
input.input-text {
box-shadow: inset 2px 0 0 $woocommerce__color-error;
}
@ -201,7 +215,7 @@ p.stars {
}
.required {
color: red;
color: #f00;
}
/**
@ -212,6 +226,7 @@ p.stars {
.woocommerce-error,
.woocommerce-noreviews,
p.no-comments {
@include clearfix;
background-color: $woocommerce__color-success;
clear: both;
@ -239,10 +254,12 @@ p.no-comments {
}
@media screen and (min-width: 48em) {
/**
* Header cart
*/
.site-header-cart {
.widget_shopping_cart {
position: absolute;
top: 100%;
@ -255,6 +272,7 @@ p.no-comments {
&:hover,
&.focus {
.widget_shopping_cart {
left: 0;
display: block;

View file

@ -1,7 +1,5 @@
/**
* Products
*/
ul.products {
@include clearfix;
margin: 0;
padding: 0;
@ -26,8 +24,11 @@ ul.products {
}
@media screen and (min-width: 48em) {
ul.products {
li.product {
@include column-width(3);
float: left;
margin-right: $columns__margin;
@ -42,22 +43,24 @@ ul.products {
}
}
.columns-1 {
ul.products {
li.product {
float: none;
width: 100%;
}
ul.products.columns-1 {
li.product {
float: none;
width: 100%;
}
}
@for $i from 2 through 6 {
.columns-#{$i} {
ul.products {
li.product {
@include column-width( $i );
}
ul.products.columns-#{$i} {
li.product {
@include column-width( $i );
}
}
}
}

View file

@ -1,8 +1,7 @@
/**
* Single Product
*/
.single-product {
div.product {
@include clearfix;
position: relative;
@ -22,6 +21,7 @@
}
.flex-control-thumbs {
@include clearfix;
margin: 0;
padding: 0;
@ -32,7 +32,7 @@
float: left;
img {
opacity: .5;
opacity: 0.5;
&.flex-active {
opacity: 1;
@ -40,6 +40,7 @@
}
&:hover {
img {
opacity: 1;
}
@ -48,9 +49,13 @@
}
@for $i from 2 through 5 {
&.woocommerce-product-gallery--columns-#{$i} {
.flex-control-thumbs {
li {
@include column-width($i);
&:nth-child(#{$i}n) {
@ -69,7 +74,8 @@
}
.stock {
&:empty:before {
&:empty::before {
display: none;
}

View file

@ -1,46 +1,49 @@
/**
* Shop tables
*/
table.shop_table_responsive {
thead {
display: none;
}
tbody {
th {
display: none;
}
}
tr {
td {
display: block;
text-align: right;
clear: both;
&:before {
content: attr(data-title) ': ';
&::before {
content: attr(data-title) ": ";
float: left;
}
&.product-remove {
a {
text-align: left;
}
&:before {
&::before {
display: none;
}
}
&.actions,
&.download-actions {
&:before {
&::before {
display: none;
}
}
&.download-actions {
.button {
display: block;
text-align: center;
@ -51,26 +54,31 @@ table.shop_table_responsive {
}
@media screen and (min-width: 48em) {
table.shop_table_responsive {
thead {
display: table-header-group;
}
tbody {
th {
display: table-cell;
}
}
tr {
th, td {
th,
td {
text-align: left;
}
td {
display: table-cell;
&:before {
&::before {
display: none;
}
}

View file

@ -2,13 +2,14 @@
* WooCommerce Price Filter
*/
.widget_price_filter {
.price_slider {
margin-bottom: 1.5em;
}
.price_slider_amount {
text-align: right;
line-height: 2.4em;
line-height: 2.4;
.button {
float: left;
@ -29,7 +30,7 @@
outline: none;
background: $color__link;
box-sizing: border-box;
margin-top: -.25em;
margin-top: -0.25em;
opacity: 1;
&:last-child {
@ -38,7 +39,7 @@
&:hover,
&.ui-state-active {
box-shadow: 0 0 0 .25em rgba(#000, 0.1);
box-shadow: 0 0 0 0.25em rgba(#000, 0.1);
}
}
@ -51,11 +52,11 @@
}
.price_slider_wrapper .ui-widget-content {
background: rgba(0,0,0,0.1);
background: rgba(0, 0, 0, 0.1);
}
.ui-slider-horizontal {
height: .5em;
height: 0.5em;
}
.ui-slider-horizontal .ui-slider-range {

View file

@ -1,6 +1,7 @@
.comment-content a {
word-wrap: break-word;
}
.bypostauthor {
display: block;
}

View file

@ -1,7 +1,7 @@
.widget {
margin: 0 0 1.5em;
/* Make sure select elements fit in widgets. */
// Make sure select elements fit in widgets.
select {
max-width: 100%;
}

View file

@ -11,9 +11,9 @@ Text Domain: _s
Tags: custom-background, custom-logo, custom-menu, featured-images, threaded-comments, translation-ready
This theme, like WordPress, is licensed under the GPL.
Use it to make something cool, have fun, and share what you've learned with others.
Use it to make something cool, have fun, and share what you've learned.
_s is based on Underscores https://underscores.me/, (C) 2012-2017 Automattic, Inc.
_s is based on Underscores https://underscores.me/, (C) 2012-2020 Automattic, Inc.
Underscores is distributed under the terms of the GNU GPL v2 or later.
Normalizing styles have been helped along thanks to the fine work of

View file

@ -2,7 +2,10 @@ p {
margin-bottom: 1.5em;
}
dfn, cite, em, i {
dfn,
cite,
em,
i {
font-style: italic;
}
@ -17,6 +20,7 @@ address {
pre {
background: $color__background-pre;
font-family: $font__pre;
@include font-size(0.9375);
line-height: $font__line-height-pre;
margin-bottom: 1.6em;
@ -25,17 +29,23 @@ pre {
padding: 1.6em;
}
code, kbd, tt, var {
code,
kbd,
tt,
var {
font-family: $font__code;
@include font-size(0.9375);
}
abbr, acronym {
abbr,
acronym {
border-bottom: 1px dotted $color__border-abbr;
cursor: help;
}
mark, ins {
mark,
ins {
background: $color__background-ins;
text-decoration: none;
}

View file

@ -1,3 +1,8 @@
h1, h2, h3, h4, h5, h6 {
h1,
h2,
h3,
h4,
h5,
h6 {
clear: both;
}

View file

@ -6,10 +6,10 @@ optgroup,
textarea {
color: $color__text-main;
font-family: $font__main;
@include font-size(1);
line-height: $font__line-height-body;
}
@import "headings";
@import "copy";

View file

@ -8,9 +8,9 @@ $color__background-ins: #fff9c0;
$color__text-screen: #21759b;
$color__text-input: #666;
$color__text-input-focus: #111;
$color__link: royalblue;
$color__link-visited: purple;
$color__link-hover: midnightblue;
$color__link: #4169e1; //royalblue
$color__link-visited: #800080; //purple
$color__link-hover: #191970; //midnightblue
$color__text-main: #404040;
$color__border-button: #ccc #ccc #bbb;

View file

@ -1,5 +1,5 @@
$font__main: sans-serif;
$font__code: Monaco, Consolas, "Andale Mono", "DejaVu Sans Mono", monospace;
$font__pre: "Courier 10 Pitch", Courier, monospace;
$font__code: monaco, consolas, "Andale Mono", "DejaVu Sans Mono", monospace;
$font__pre: "Courier 10 Pitch", courier, monospace;
$font__line-height-body: 1.5;
$font__line-height-pre: 1.6;

View file

@ -4,16 +4,12 @@ Theme Name: _s
WooCommerce styles override
*/
/**
* WooCommerce color variables
*/
// WooCommerce color variables
$woocommerce__color-error: #e2401c;
$woocommerce__color-success: #0f834d;
$woocommerce__color-info: #3D9CD2;
$woocommerce__color-info: #3d9cd2;
/**
* Imports
*/
// Imports
@import "variables-site/variables-site";
@import "mixins/mixins-master";