woocommerce/storefront
2
0
Fork 0
mirror of https://github.com/woocommerce/storefront.git synced 2025-08-20 04:00:29 +08:00
Code Issues Packages Wiki Activity Actions

Organize CSS folder and remove sass on deploy

Browse source
This commit is contained in:
Tiago Noronha 2018-02-08 18:29:45 +00:00
parent ea4880f9b9
commit f23e14293a
63 changed files with 168 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

138
Gruntfile.js
View file

@ -20,13 +20,13 @@ module.exports = function( grunt ) {
dist: {
src: [
'style.css',
'assets/sass/admin/*.css',
'assets/sass/admin/welcome-screen/welcome.css',
'assets/sass/admin/customizer/customizer.css',
'assets/sass/woocommerce/extensions/*.css',
'assets/sass/woocommerce/woocommerce.css',
'assets/sass/jetpack/jetpack.css',
'assets/sass/base/*.css'
'assets/css/admin/*.css',
'assets/css/admin/welcome-screen/welcome.css',
'assets/css/admin/customizer/customizer.css',
'assets/css/woocommerce/extensions/*.css',
'assets/css/woocommerce/woocommerce.css',
'assets/css/jetpack/jetpack.css',
'assets/css/base/*.css'
]
}
},
@ -112,29 +112,29 @@ module.exports = function( grunt ) {
},
files: [{
'style.css': 'style.scss',
'assets/sass/admin/admin.css': 'assets/sass/admin/admin.scss',
'assets/sass/admin/plugin-install.css': 'assets/sass/admin/plugin-install.scss',
'assets/sass/admin/welcome-screen/welcome.css': 'assets/sass/admin/welcome-screen/welcome.scss',
'assets/sass/admin/customizer/customizer.css': 'assets/sass/admin/customizer/customizer.scss',
'assets/sass/woocommerce/extensions/bookings.css': 'assets/sass/woocommerce/extensions/bookings.scss',
'assets/sass/woocommerce/extensions/brands.css': 'assets/sass/woocommerce/extensions/brands.scss',
'assets/sass/woocommerce/extensions/wishlists.css': 'assets/sass/woocommerce/extensions/wishlists.scss',
'assets/sass/woocommerce/extensions/ajax-layered-nav.css': 'assets/sass/woocommerce/extensions/ajax-layered-nav.scss',
'assets/sass/woocommerce/extensions/variation-swatches.css': 'assets/sass/woocommerce/extensions/variation-swatches.scss',
'assets/sass/woocommerce/extensions/composite-products.css': 'assets/sass/woocommerce/extensions/composite-products.scss',
'assets/sass/woocommerce/extensions/photography.css': 'assets/sass/woocommerce/extensions/photography.scss',
'assets/sass/woocommerce/extensions/product-reviews-pro.css': 'assets/sass/woocommerce/extensions/product-reviews-pro.scss',
'assets/sass/woocommerce/extensions/smart-coupons.css': 'assets/sass/woocommerce/extensions/smart-coupons.scss',
'assets/sass/woocommerce/extensions/deposits.css': 'assets/sass/woocommerce/extensions/deposits.scss',
'assets/sass/woocommerce/extensions/bundles.css': 'assets/sass/woocommerce/extensions/bundles.scss',
'assets/sass/woocommerce/extensions/ship-multiple-addresses.css': 'assets/sass/woocommerce/extensions/ship-multiple-addresses.scss',
'assets/sass/woocommerce/extensions/advanced-product-labels.css': 'assets/sass/woocommerce/extensions/advanced-product-labels.scss',
'assets/sass/woocommerce/extensions/mix-and-match.css': 'assets/sass/woocommerce/extensions/mix-and-match.scss',
'assets/sass/woocommerce/extensions/memberships.css': 'assets/sass/woocommerce/extensions/memberships.scss',
'assets/sass/woocommerce/extensions/quick-view.css': 'assets/sass/woocommerce/extensions/quick-view.scss',
'assets/sass/woocommerce/woocommerce.css': 'assets/sass/woocommerce/woocommerce.scss',
'assets/sass/jetpack/jetpack.css': 'assets/sass/jetpack/jetpack.scss',
'assets/sass/base/icons.css': 'assets/sass/base/icons.scss'
'assets/css/admin/admin.css': 'assets/css/admin/admin.scss',
'assets/css/admin/plugin-install.css': 'assets/css/admin/plugin-install.scss',
'assets/css/admin/welcome-screen/welcome.css': 'assets/css/admin/welcome-screen/welcome.scss',
'assets/css/admin/customizer/customizer.css': 'assets/css/admin/customizer/customizer.scss',
'assets/css/woocommerce/extensions/bookings.css': 'assets/css/woocommerce/extensions/bookings.scss',
'assets/css/woocommerce/extensions/brands.css': 'assets/css/woocommerce/extensions/brands.scss',
'assets/css/woocommerce/extensions/wishlists.css': 'assets/css/woocommerce/extensions/wishlists.scss',
'assets/css/woocommerce/extensions/ajax-layered-nav.css': 'assets/css/woocommerce/extensions/ajax-layered-nav.scss',
'assets/css/woocommerce/extensions/variation-swatches.css': 'assets/css/woocommerce/extensions/variation-swatches.scss',
'assets/css/woocommerce/extensions/composite-products.css': 'assets/css/woocommerce/extensions/composite-products.scss',
'assets/css/woocommerce/extensions/photography.css': 'assets/css/woocommerce/extensions/photography.scss',
'assets/css/woocommerce/extensions/product-reviews-pro.css': 'assets/css/woocommerce/extensions/product-reviews-pro.scss',
'assets/css/woocommerce/extensions/smart-coupons.css': 'assets/css/woocommerce/extensions/smart-coupons.scss',
'assets/css/woocommerce/extensions/deposits.css': 'assets/css/woocommerce/extensions/deposits.scss',
'assets/css/woocommerce/extensions/bundles.css': 'assets/css/woocommerce/extensions/bundles.scss',
'assets/css/woocommerce/extensions/ship-multiple-addresses.css': 'assets/css/woocommerce/extensions/ship-multiple-addresses.scss',
'assets/css/woocommerce/extensions/advanced-product-labels.css': 'assets/css/woocommerce/extensions/advanced-product-labels.scss',
'assets/css/woocommerce/extensions/mix-and-match.css': 'assets/css/woocommerce/extensions/mix-and-match.scss',
'assets/css/woocommerce/extensions/memberships.css': 'assets/css/woocommerce/extensions/memberships.scss',
'assets/css/woocommerce/extensions/quick-view.css': 'assets/css/woocommerce/extensions/quick-view.scss',
'assets/css/woocommerce/woocommerce.css': 'assets/css/woocommerce/woocommerce.scss',
'assets/css/jetpack/jetpack.css': 'assets/css/jetpack/jetpack.scss',
'assets/css/base/icons.css': 'assets/css/base/icons.scss'
}]
}
},
@ -148,37 +148,37 @@ module.exports = function( grunt ) {
},
admin: {
expand: true,
cwd: 'assets/sass/admin/',
cwd: 'assets/css/admin/',
src: ['*.css'],
dest: 'assets/sass/admin/',
dest: 'assets/css/admin/',
ext: '.css'
},
welcome: {
expand: true,
cwd: 'assets/sass/admin/welcome-screen/',
cwd: 'assets/css/admin/welcome-screen/',
src: ['*.css'],
dest: 'assets/sass/admin/welcome-screen/',
dest: 'assets/css/admin/welcome-screen/',
ext: '.css'
},
customizer: {
expand: true,
cwd: 'assets/sass/admin/customizer/',
cwd: 'assets/css/admin/customizer/',
src: ['*.css'],
dest: 'assets/sass/admin/customizer/',
dest: 'assets/css/admin/customizer/',
ext: '.css'
},
jetpack: {
expand: true,
cwd: 'assets/sass/jetpack/',
cwd: 'assets/css/jetpack/',
src: ['*.css'],
dest: 'assets/sass/jetpack/',
dest: 'assets/css/jetpack/',
ext: '.css'
},
woocommerce: {
expand: true,
cwd: 'assets/sass/woocommerce/',
cwd: 'assets/css/woocommerce/',
src: ['*.css'],
dest: 'assets/sass/woocommerce/',
dest: 'assets/css/woocommerce/',
ext: '.css'
}
},
@ -188,13 +188,13 @@ module.exports = function( grunt ) {
css: {
files: [
'style.scss',
'assets/sass/admin/welcome-screen/*.scss',
'assets/sass/woocommerce/*.scss',
'assets/sass/jetpack/*.scss',
'assets/sass/base/*.scss',
'assets/sass/components/*.scss',
'assets/sass/utils/*.scss',
'assets/sass/vendors/*.scss'
'assets/css/admin/welcome-screen/*.scss',
'assets/css/woocommerce/*.scss',
'assets/css/jetpack/*.scss',
'assets/css/base/*.scss',
'assets/css/components/*.scss',
'assets/css/sass/utils/*.scss',
'assets/css/sass/vendors/*.scss'
],
tasks: [
'sass',
@ -286,7 +286,9 @@ module.exports = function( grunt ) {
'!package.json',
'!node_modules/**',
'!.DS_Store',
'!npm-debug.log'
'!npm-debug.log',
'!assets/css/sass/**',
'!assets/css/**/*.scss'
],
dest: 'storefront',
expand: true,
@ -370,26 +372,26 @@ module.exports = function( grunt ) {
ext: '-rtl.css',
src: [
'style.css',
'assets/sass/woocommerce/extensions/bookings.css',
'assets/sass/woocommerce/extensions/brands.css',
'assets/sass/woocommerce/extensions/wishlists.css',
'assets/sass/woocommerce/extensions/ajax-layered-nav.css',
'assets/sass/woocommerce/extensions/variation-swatches.css',
'assets/sass/woocommerce/extensions/composite-products.css',
'assets/sass/woocommerce/extensions/photography.css',
'assets/sass/woocommerce/extensions/product-reviews-pro.css',
'assets/sass/woocommerce/extensions/smart-coupons.css',
'assets/sass/woocommerce/extensions/deposits.css',
'assets/sass/woocommerce/extensions/bundles.css',
'assets/sass/woocommerce/extensions/ship-multiple-addresses.css',
'assets/sass/woocommerce/extensions/advanced-product-labels.css',
'assets/sass/woocommerce/extensions/mix-and-match.css',
'assets/sass/woocommerce/extensions/memberships.css',
'assets/sass/woocommerce/extensions/quick-view.css',
'assets/sass/woocommerce/woocommerce.css',
'assets/sass/admin/welcome-screen/welcome.css',
'assets/sass/jetpack/jetpack.css',
'assets/sass/base/icons.css'
'assets/css/woocommerce/extensions/bookings.css',
'assets/css/woocommerce/extensions/brands.css',
'assets/css/woocommerce/extensions/wishlists.css',
'assets/css/woocommerce/extensions/ajax-layered-nav.css',
'assets/css/woocommerce/extensions/variation-swatches.css',
'assets/css/woocommerce/extensions/composite-products.css',
'assets/css/woocommerce/extensions/photography.css',
'assets/css/woocommerce/extensions/product-reviews-pro.css',
'assets/css/woocommerce/extensions/smart-coupons.css',
'assets/css/woocommerce/extensions/deposits.css',
'assets/css/woocommerce/extensions/bundles.css',
'assets/css/woocommerce/extensions/ship-multiple-addresses.css',
'assets/css/woocommerce/extensions/advanced-product-labels.css',
'assets/css/woocommerce/extensions/mix-and-match.css',
'assets/css/woocommerce/extensions/memberships.css',
'assets/css/woocommerce/extensions/quick-view.css',
'assets/css/woocommerce/woocommerce.css',
'assets/css/admin/welcome-screen/welcome.css',
'assets/css/jetpack/jetpack.css',
'assets/css/base/icons.css'
]
}
},

0
assets/sass/admin/admin.scss → assets/css/admin/admin.scss
View file

0
assets/sass/admin/buttons.scss → assets/css/admin/buttons.scss
View file

0
assets/sass/admin/customizer/customizer.scss → assets/css/admin/customizer/customizer.scss
View file

0
assets/sass/admin/plugin-install.scss → assets/css/admin/plugin-install.scss
View file

6
assets/sass/admin/welcome-screen/welcome.scss → assets/css/admin/welcome-screen/welcome.scss
View file

@ -1,7 +1,7 @@
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../../../assets/css/sass/utils/variables';
@import '../../../../assets/css/sass/utils/mixins';
@import '../../../../assets/css/sass/vendors/modular-scale';
$green: #45B964;

0
assets/sass/base/_base.scss → assets/css/base/_base.scss
View file

0
assets/sass/base/_layout.scss → assets/css/base/_layout.scss
View file

8
assets/sass/base/icons.scss → assets/css/base/icons.scss
View file

@ -6,10 +6,10 @@
// Utilities
// Sass tools and helpers used across the project.
@import '../utils/variables';
@import '../utils/mixins';
@import '../vendors/font-awesome/font-awesome';
@import '../vendors/modular-scale';
@import '../sass/utils/variables';
@import '../sass/utils/mixins';
@import '../sass/vendors/font-awesome/font-awesome';
@import '../sass/vendors/modular-scale';
.site-search {
.widget_product_search {

6
assets/sass/jetpack/jetpack.scss → assets/css/jetpack/jetpack.scss
View file

@ -4,9 +4,9 @@
// Imports
@import 'bourbon';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
@import '../../../assets/sass/vendors/modular-scale';
@import '../sass/utils/variables';
@import '../sass/utils/mixins';
@import '../sass/vendors/modular-scale';
/**
* Widgets

0
assets/sass/utils/_mixins.scss → assets/css/sass/utils/_mixins.scss
View file

0
assets/sass/utils/_variables.scss → assets/css/sass/utils/_variables.scss
View file

0
assets/sass/vendors/_modular-scale.scss → assets/css/sass/vendors/_modular-scale.scss vendored
View file

0
assets/sass/vendors/_normalize.scss → assets/css/sass/vendors/_normalize.scss vendored
View file

0
assets/sass/vendors/font-awesome/_animated.scss → assets/css/sass/vendors/font-awesome/_animated.scss vendored
View file

0
assets/sass/vendors/font-awesome/_bordered-pulled.scss → assets/css/sass/vendors/font-awesome/_bordered-pulled.scss vendored
View file

0
assets/sass/vendors/font-awesome/_core.scss → assets/css/sass/vendors/font-awesome/_core.scss vendored
View file

0
assets/sass/vendors/font-awesome/_fixed-width.scss → assets/css/sass/vendors/font-awesome/_fixed-width.scss vendored
View file

0
assets/sass/vendors/font-awesome/_icons.scss → assets/css/sass/vendors/font-awesome/_icons.scss vendored
View file

0
assets/sass/vendors/font-awesome/_larger.scss → assets/css/sass/vendors/font-awesome/_larger.scss vendored
View file

0
assets/sass/vendors/font-awesome/_list.scss → assets/css/sass/vendors/font-awesome/_list.scss vendored
View file

0
assets/sass/vendors/font-awesome/_mixins.scss → assets/css/sass/vendors/font-awesome/_mixins.scss vendored
View file

0
assets/sass/vendors/font-awesome/_path.scss → assets/css/sass/vendors/font-awesome/_path.scss vendored
View file

0
assets/sass/vendors/font-awesome/_rotated-flipped.scss → assets/css/sass/vendors/font-awesome/_rotated-flipped.scss vendored
View file

0
assets/sass/vendors/font-awesome/_screen-reader.scss → assets/css/sass/vendors/font-awesome/_screen-reader.scss vendored
View file

0
assets/sass/vendors/font-awesome/_stacked.scss → assets/css/sass/vendors/font-awesome/_stacked.scss vendored
View file

0
assets/sass/vendors/font-awesome/_variables.scss → assets/css/sass/vendors/font-awesome/_variables.scss vendored
View file

0
assets/sass/vendors/font-awesome/font-awesome.scss → assets/css/sass/vendors/font-awesome/font-awesome.scss vendored
View file

0
assets/sass/vendors/modular-scale/_calc.scss → assets/css/sass/vendors/modular-scale/_calc.scss vendored
View file

0
assets/sass/vendors/modular-scale/_function-list.scss → assets/css/sass/vendors/modular-scale/_function-list.scss vendored
View file

0
assets/sass/vendors/modular-scale/_function.scss → assets/css/sass/vendors/modular-scale/_function.scss vendored
View file

0
assets/sass/vendors/modular-scale/_generate-list.scss → assets/css/sass/vendors/modular-scale/_generate-list.scss vendored
View file

0
assets/sass/vendors/modular-scale/_pow.scss → assets/css/sass/vendors/modular-scale/_pow.scss vendored
View file

0
assets/sass/vendors/modular-scale/_ratios.scss → assets/css/sass/vendors/modular-scale/_ratios.scss vendored
View file

0
assets/sass/vendors/modular-scale/_respond.scss → assets/css/sass/vendors/modular-scale/_respond.scss vendored
View file

0
assets/sass/vendors/modular-scale/_round-px.scss → assets/css/sass/vendors/modular-scale/_round-px.scss vendored
View file

0
assets/sass/vendors/modular-scale/_sort-list.scss → assets/css/sass/vendors/modular-scale/_sort-list.scss vendored
View file

0
assets/sass/vendors/modular-scale/_tests.scss → assets/css/sass/vendors/modular-scale/_tests.scss vendored
View file

6
assets/sass/woocommerce/extensions/advanced-product-labels.scss → assets/css/woocommerce/extensions/advanced-product-labels.scss
View file

@ -6,8 +6,8 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/utils/variables';
@import '../../sass/vendors/modular-scale';
.wapl-flash,
.wapl-flash .product-label {
@ -35,4 +35,4 @@
.wapl-label {
margin-bottom: ms(-1);
}
}

8
assets/sass/woocommerce/extensions/ajax-layered-nav.scss → assets/css/woocommerce/extensions/ajax-layered-nav.scss
View file

@ -6,9 +6,9 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
@import '../../sass/vendors/modular-scale';
.widget_layered_nav {
ul.colors {
@ -104,4 +104,4 @@
}
}
}
}
}

8
assets/sass/woocommerce/extensions/bookings.scss → assets/css/woocommerce/extensions/bookings.scss
View file

@ -6,10 +6,10 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
@import '../../../../node_modules/susy/sass/susy';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/vendors/modular-scale';
#wc-bookings-booking-form {
border: 0;
@ -114,4 +114,4 @@
table.my_account_bookings {
font-size: ms(-1);
}
}
}

6
assets/sass/woocommerce/extensions/brands.scss → assets/css/woocommerce/extensions/brands.scss
View file

@ -6,8 +6,8 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
.header-widget-region {
.widget_brand_thumbnails {
@ -29,4 +29,4 @@
}
}
}
}
}

6
assets/sass/woocommerce/extensions/bundles.scss → assets/css/woocommerce/extensions/bundles.scss
View file

@ -6,10 +6,10 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
@import '../../../../node_modules/susy/sass/susy';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/vendors/modular-scale';
.bundle_form {
div.bundled_product_summary {

6
assets/sass/woocommerce/extensions/composite-products.scss → assets/css/woocommerce/extensions/composite-products.scss
View file

@ -6,10 +6,10 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
@import '../../../../node_modules/susy/sass/susy';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/vendors/modular-scale';
.composite_summary .summary_element {

6
assets/sass/woocommerce/extensions/deposits.scss → assets/css/woocommerce/extensions/deposits.scss
View file

@ -6,9 +6,9 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
@import '../../sass/vendors/modular-scale';
/**
* Style

6
assets/sass/woocommerce/extensions/memberships.scss → assets/css/woocommerce/extensions/memberships.scss
View file

@ -6,10 +6,10 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
@import '../../../../node_modules/susy/sass/susy';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/vendors/modular-scale';
.woocommerce,
.woocommerce-page {

6
assets/sass/woocommerce/extensions/mix-and-match.scss → assets/css/woocommerce/extensions/mix-and-match.scss
View file

@ -6,8 +6,8 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/utils/variables';
@import '../../sass/vendors/modular-scale';
.mnm_table {
.product-thumbnail,
@ -51,4 +51,4 @@
.mnm_image {
max-width: ms(6);
}
}

8
assets/sass/woocommerce/extensions/photography.scss → assets/css/woocommerce/extensions/photography.scss
View file

@ -6,10 +6,10 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
@import '../../../../node_modules/susy/sass/susy';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/vendors/modular-scale';
.woocommerce,
.woocommerce-page {
@ -51,4 +51,4 @@
border: 0;
}
}
}
}

6
assets/sass/woocommerce/extensions/product-reviews-pro.scss → assets/css/woocommerce/extensions/product-reviews-pro.scss
View file

@ -6,10 +6,10 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
@import '../../../../node_modules/susy/sass/susy';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/vendors/modular-scale';
.woocommerce,
.woocommerce-page {

8
assets/sass/woocommerce/extensions/quick-view.scss → assets/css/woocommerce/extensions/quick-view.scss
View file

@ -6,9 +6,9 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
@import '../../sass/vendors/modular-scale';
.quick-view-button {
span {
@ -20,4 +20,4 @@ div.quick-view div.quick-view-image a.button {
@include button();
line-height: inherit;
display: block;
}
}

8
assets/sass/woocommerce/extensions/ship-multiple-addresses.scss → assets/css/woocommerce/extensions/ship-multiple-addresses.scss
View file

@ -6,10 +6,10 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
@import '../../../../node_modules/susy/sass/susy';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/vendors/modular-scale';
.woocommerce-page {
.woocommerce-checkout-review-order-table {
@ -92,4 +92,4 @@
@include span(6 of 12);
}
}
}
}

4
assets/sass/woocommerce/extensions/smart-coupons.scss → assets/css/woocommerce/extensions/smart-coupons.scss
View file

@ -5,9 +5,9 @@
/**
* Imports
*/
@import '../../../../assets/sass/utils/variables';
@import '../../sass/utils/variables';
@import '../../../../node_modules/susy/sass/susy';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/vendors/modular-scale';
.woocommerce,
.woocommerce-page {

8
assets/sass/woocommerce/extensions/variation-swatches.scss → assets/css/woocommerce/extensions/variation-swatches.scss
View file

@ -6,9 +6,9 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
@import '../../sass/vendors/modular-scale';
.variations-table {
margin: 0;
@ -63,4 +63,4 @@
a#variations_clear {
display: block;
margin: 1em 0 ms(3);
}
}

8
assets/sass/woocommerce/extensions/wishlists.scss → assets/css/woocommerce/extensions/wishlists.scss
View file

@ -6,10 +6,10 @@
* Imports
*/
@import 'bourbon';
@import '../../../../assets/sass/utils/variables';
@import '../../../../assets/sass/utils/mixins';
@import '../../sass/utils/variables';
@import '../../sass/utils/mixins';
@import '../../../../node_modules/susy/sass/susy';
@import '../../../../assets/sass/vendors/modular-scale';
@import '../../sass/vendors/modular-scale';
#wl-wrapper.wl-button-wrap {
padding: ms(3) 0 0 0;
@ -97,4 +97,4 @@
}
}
}
}
}

6
assets/sass/woocommerce/woocommerce.scss → assets/css/woocommerce/woocommerce.scss
View file

@ -6,10 +6,10 @@
* Imports
*/
@import 'bourbon';
@import '../../../assets/sass/utils/variables';
@import '../../../assets/sass/utils/mixins';
@import '../sass/utils/variables';
@import '../sass/utils/mixins';
@import '../../../node_modules/susy/sass/susy';
@import '../../../assets/sass/vendors/modular-scale';
@import '../sass/vendors/modular-scale';
// Star font, FontAwesome doesn't work :(
@font-face {

2
inc/admin/class-storefront-admin.php
View file

@ -38,7 +38,7 @@ if ( ! class_exists( 'Storefront_Admin' ) ) :
global $storefront_version;
if ( 'appearance_page_storefront-welcome' === $hook_suffix ) {
wp_enqueue_style( 'storefront-welcome-screen', get_template_directory_uri() . '/assets/sass/admin/welcome-screen/welcome.css', $storefront_version );
wp_enqueue_style( 'storefront-welcome-screen', get_template_directory_uri() . '/assets/css/admin/welcome-screen/welcome.css', $storefront_version );
wp_style_add_data( 'storefront-welcome-screen', 'rtl', 'replace' );
}
}

4
inc/admin/class-storefront-plugin-install.php
View file

@ -40,7 +40,7 @@ if ( ! class_exists( 'Storefront_Plugin_Install' ) ) :
wp_enqueue_script( 'storefront-plugin-install', get_template_directory_uri() . '/assets/js/admin/plugin-install' . $suffix . '.js', array( 'jquery', 'updates' ), $storefront_version, 'all' );
wp_enqueue_style( 'storefront-plugin-install', get_template_directory_uri() . '/assets/sass/admin/plugin-install.css', array(), $storefront_version, 'all' );
wp_enqueue_style( 'storefront-plugin-install', get_template_directory_uri() . '/assets/css/admin/plugin-install.css', array(), $storefront_version, 'all' );
}
/**
@ -130,4 +130,4 @@ if ( ! class_exists( 'Storefront_Plugin_Install' ) ) :
endif;
return new Storefront_Plugin_Install();
return new Storefront_Plugin_Install();

2
inc/class-storefront.php
View file

@ -223,7 +223,7 @@ if ( ! class_exists( 'Storefront' ) ) :
wp_enqueue_style( 'storefront-style', get_template_directory_uri() . '/style.css', '', $storefront_version );
wp_style_add_data( 'storefront-style', 'rtl', 'replace' );
wp_enqueue_style( 'storefront-icons', get_template_directory_uri() . '/assets/sass/base/icons.css', '', $storefront_version );
wp_enqueue_style( 'storefront-icons', get_template_directory_uri() . '/assets/css/base/icons.css', '', $storefront_version );
wp_style_add_data( 'storefront-icons', 'rtl', 'replace' );
/**

2
inc/jetpack/class-storefront-jetpack.php
View file

@ -94,7 +94,7 @@ if ( ! class_exists( 'Storefront_Jetpack' ) ) :
public function jetpack_scripts() {
global $storefront_version;
wp_enqueue_style( 'storefront-jetpack-style', get_template_directory_uri() . '/assets/sass/jetpack/jetpack.css', '', $storefront_version );
wp_enqueue_style( 'storefront-jetpack-style', get_template_directory_uri() . '/assets/css/jetpack/jetpack.css', '', $storefront_version );
wp_style_add_data( 'storefront-jetpack-style', 'rtl', 'replace' );
}

4
inc/nux/class-storefront-nux-admin.php
View file

@ -45,7 +45,7 @@ if ( ! class_exists( 'Storefront_NUX_Admin' ) ) :
$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
wp_enqueue_style( 'storefront-admin-nux', get_template_directory_uri() . '/assets/sass/admin/admin.css', '', $storefront_version );
wp_enqueue_style( 'storefront-admin-nux', get_template_directory_uri() . '/assets/css/admin/admin.css', '', $storefront_version );
wp_enqueue_script( 'storefront-admin-nux', get_template_directory_uri() . '/assets/js/admin/admin' . $suffix . '.js', array( 'jquery' ), $storefront_version, 'all' );
@ -327,4 +327,4 @@ if ( ! class_exists( 'Storefront_NUX_Admin' ) ) :
endif;
return new Storefront_NUX_Admin();
return new Storefront_NUX_Admin();

2
inc/nux/class-storefront-nux-guided-tour.php
View file

@ -56,7 +56,7 @@ if ( ! class_exists( 'Storefront_NUX_Guided_Tour' ) ) :
$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
wp_enqueue_style( 'sp-guided-tour', get_template_directory_uri() . '/assets/sass/admin/customizer/customizer.css', array(), $storefront_version, 'all' );
wp_enqueue_style( 'sp-guided-tour', get_template_directory_uri() . '/assets/css/admin/customizer/customizer.css', array(), $storefront_version, 'all' );
wp_enqueue_script( 'sf-guided-tour', get_template_directory_uri() . '/assets/js/admin/customizer' . $suffix . '.js', array( 'jquery', 'wp-backbone' ), $storefront_version, true );

34
inc/woocommerce/class-storefront-woocommerce.php
View file

@ -95,7 +95,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
wp_enqueue_style( 'storefront-woocommerce-style', get_template_directory_uri() . '/assets/sass/woocommerce/woocommerce.css', array(), $storefront_version );
wp_enqueue_style( 'storefront-woocommerce-style', get_template_directory_uri() . '/assets/css/woocommerce/woocommerce.css', array(), $storefront_version );
wp_style_add_data( 'storefront-woocommerce-style', 'rtl', 'replace' );
wp_register_script( 'storefront-header-cart', get_template_directory_uri() . '/assets/js/woocommerce/header-cart' . $suffix . '.js', array(), $storefront_version, true );
@ -204,7 +204,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* Bookings
*/
if ( $this->is_woocommerce_extension_activated( 'WC_Bookings' ) ) {
wp_enqueue_style( 'storefront-woocommerce-bookings-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/bookings.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-bookings-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/bookings.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-bookings-style', 'rtl', 'replace' );
}
@ -212,7 +212,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* Brands
*/
if ( $this->is_woocommerce_extension_activated( 'WC_Brands' ) ) {
wp_enqueue_style( 'storefront-woocommerce-brands-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/brands.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-brands-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/brands.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-brands-style', 'rtl', 'replace' );
}
@ -220,7 +220,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* Wishlists
*/
if ( $this->is_woocommerce_extension_activated( 'WC_Wishlists_Wishlist' ) ) {
wp_enqueue_style( 'storefront-woocommerce-wishlists-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/wishlists.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-wishlists-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/wishlists.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-wishlists-style', 'rtl', 'replace' );
}
@ -228,7 +228,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* AJAX Layered Nav
*/
if ( $this->is_woocommerce_extension_activated( 'SOD_Widget_Ajax_Layered_Nav' ) ) {
wp_enqueue_style( 'storefront-woocommerce-ajax-layered-nav-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/ajax-layered-nav.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-ajax-layered-nav-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/ajax-layered-nav.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-ajax-layered-nav-style', 'rtl', 'replace' );
}
@ -236,7 +236,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* Variation Swatches
*/
if ( $this->is_woocommerce_extension_activated( 'WC_SwatchesPlugin' ) ) {
wp_enqueue_style( 'storefront-woocommerce-variation-swatches-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/variation-swatches.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-variation-swatches-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/variation-swatches.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-variation-swatches-style', 'rtl', 'replace' );
}
@ -244,7 +244,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* Composite Products
*/
if ( $this->is_woocommerce_extension_activated( 'WC_Composite_Products' ) ) {
wp_enqueue_style( 'storefront-woocommerce-composite-products-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/composite-products.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-composite-products-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/composite-products.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-composite-products-style', 'rtl', 'replace' );
}
@ -252,7 +252,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* WooCommerce Photography
*/
if ( $this->is_woocommerce_extension_activated( 'WC_Photography' ) ) {
wp_enqueue_style( 'storefront-woocommerce-photography-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/photography.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-photography-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/photography.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-photography-style', 'rtl', 'replace' );
}
@ -260,7 +260,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* Product Reviews Pro
*/
if ( $this->is_woocommerce_extension_activated( 'WC_Product_Reviews_Pro' ) ) {
wp_enqueue_style( 'storefront-woocommerce-product-reviews-pro-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/product-reviews-pro.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-product-reviews-pro-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/product-reviews-pro.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-product-reviews-pro-style', 'rtl', 'replace' );
}
@ -268,7 +268,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* WooCommerce Smart Coupons
*/
if ( $this->is_woocommerce_extension_activated( 'WC_Smart_Coupons' ) ) {
wp_enqueue_style( 'storefront-woocommerce-smart-coupons-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/smart-coupons.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-smart-coupons-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/smart-coupons.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-smart-coupons-style', 'rtl', 'replace' );
}
@ -276,7 +276,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* WooCommerce Deposits
*/
if ( $this->is_woocommerce_extension_activated( 'WC_Deposits' ) ) {
wp_enqueue_style( 'storefront-woocommerce-deposits-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/deposits.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-deposits-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/deposits.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-deposits-style', 'rtl', 'replace' );
}
@ -284,7 +284,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* WooCommerce Product Bundles
*/
if ( $this->is_woocommerce_extension_activated( 'WC_Bundles' ) ) {
wp_enqueue_style( 'storefront-woocommerce-bundles-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/bundles.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-bundles-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/bundles.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-bundles-style', 'rtl', 'replace' );
}
@ -292,7 +292,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* WooCommerce Multiple Shipping Addresses
*/
if ( $this->is_woocommerce_extension_activated( 'WC_Ship_Multiple' ) ) {
wp_enqueue_style( 'storefront-woocommerce-sma-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/ship-multiple-addresses.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-sma-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/ship-multiple-addresses.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-sma-style', 'rtl', 'replace' );
}
@ -300,7 +300,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* WooCommerce Advanced Product Labels
*/
if ( $this->is_woocommerce_extension_activated( 'Woocommerce_Advanced_Product_Labels' ) ) {
wp_enqueue_style( 'storefront-woocommerce-apl-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/advanced-product-labels.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-apl-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/advanced-product-labels.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-apl-style', 'rtl', 'replace' );
}
@ -308,7 +308,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* WooCommerce Mix and Match
*/
if ( $this->is_woocommerce_extension_activated( 'WC_Mix_and_Match' ) ) {
wp_enqueue_style( 'storefront-woocommerce-mix-and-match-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/mix-and-match.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-mix-and-match-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/mix-and-match.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-mix-and-match-style', 'rtl', 'replace' );
}
@ -316,7 +316,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* WooCommerce Memberships
*/
if ( $this->is_woocommerce_extension_activated( 'WC_Memberships' ) ) {
wp_enqueue_style( 'storefront-woocommerce-memberships-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/memberships.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-memberships-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/memberships.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-memberships-style', 'rtl', 'replace' );
}
@ -324,7 +324,7 @@ if ( ! class_exists( 'Storefront_WooCommerce' ) ) :
* WooCommerce Quick View
*/
if ( $this->is_woocommerce_extension_activated( 'WC_Quick_View' ) ) {
wp_enqueue_style( 'storefront-woocommerce-quick-view-style', get_template_directory_uri() . '/assets/sass/woocommerce/extensions/quick-view.css', 'storefront-woocommerce-style' );
wp_enqueue_style( 'storefront-woocommerce-quick-view-style', get_template_directory_uri() . '/assets/css/woocommerce/extensions/quick-view.css', 'storefront-woocommerce-style' );
wp_style_add_data( 'storefront-woocommerce-quick-view-style', 'rtl', 'replace' );
}

12
style.scss
View file

@ -40,15 +40,15 @@ Note: Do not edit this file. If you wish to add your own CSS we strongly recomme
// Vendors
// External libraries and frameworks.
@import 'assets/sass/vendors/normalize';
@import 'assets/sass/vendors/modular-scale';
@import 'assets/css/sass/vendors/normalize';
@import 'assets/css/sass/vendors/modular-scale';
// Utilities
// Sass tools and helpers used across the project.
@import 'assets/sass/utils/variables';
@import 'assets/sass/utils/mixins';
@import 'assets/css/sass/utils/variables';
@import 'assets/css/sass/utils/mixins';
// Base
// Includes all the main Storefront css.
@import 'assets/sass/base/base';
@import 'assets/sass/base/layout';
@import 'assets/css/base/base';
@import 'assets/css/base/layout';