pulled from upstream

This commit is contained in:
Ratnakar 2014-09-29 10:40:14 +05:30
commit 0c7d2bdca0
330 changed files with 8029 additions and 5823 deletions

View File

@ -27,3 +27,8 @@ trim_trailing_whitespace = false
insert_final_newline = false insert_final_newline = false
indent_style = space indent_style = space
indent_size = 2 indent_size = 2
[*.yml]
insert_final_newline = false
indent_style = space
indent_size = 2

3
.gitignore vendored
View File

@ -12,6 +12,9 @@ sftp-config.json
/node_modules/ /node_modules/
/deploy/ /deploy/
# Sass
.sass-cache/
# OS X metadata # OS X metadata
.DS_Store .DS_Store

View File

@ -27,27 +27,6 @@ module.exports = function( grunt ) {
] ]
}, },
// Compile all .less files.
less: {
compile: {
options: {
// These paths are searched for @imports
paths: ['<%= dirs.css %>/']
},
files: [{
expand: true,
cwd: '<%= dirs.css %>/',
src: [
'*.less',
'!woocommerce-base.less',
'!mixins.less'
],
dest: '<%= dirs.css %>/',
ext: '.css'
}]
}
},
// Minify .js files. // Minify .js files.
uglify: { uglify: {
options: { options: {
@ -73,7 +52,7 @@ module.exports = function( grunt ) {
'<%= dirs.js %>/admin/jquery.flot.pie.min.js': ['<%= dirs.js %>/admin/jquery.flot.pie.js'], '<%= dirs.js %>/admin/jquery.flot.pie.min.js': ['<%= dirs.js %>/admin/jquery.flot.pie.js'],
'<%= dirs.js %>/admin/jquery.flot.resize.min.js': ['<%= dirs.js %>/admin/jquery.flot.resize.js'], '<%= dirs.js %>/admin/jquery.flot.resize.min.js': ['<%= dirs.js %>/admin/jquery.flot.resize.js'],
'<%= dirs.js %>/admin/jquery.flot.stack.min.js': ['<%= dirs.js %>/admin/jquery.flot.stack.js'], '<%= dirs.js %>/admin/jquery.flot.stack.min.js': ['<%= dirs.js %>/admin/jquery.flot.stack.js'],
'<%= dirs.js %>/admin/jquery.flot.time.min.js': ['<%= dirs.js %>/admin/jquery.flot.time.js'], '<%= dirs.js %>/admin/jquery.flot.time.min.js': ['<%= dirs.js %>/admin/jquery.flot.time.js']
} }
}, },
frontend: { frontend: {
@ -87,7 +66,23 @@ module.exports = function( grunt ) {
dest: '<%= dirs.js %>/frontend/', dest: '<%= dirs.js %>/frontend/',
ext: '.min.js' ext: '.min.js'
}] }]
}
}, },
// Compile all .scss files.
sass: {
compile: {
options: {
sourcemap: 'none'
},
files: [{
expand: true,
cwd: '<%= dirs.css %>/',
src: ['*.scss'],
dest: '<%= dirs.css %>/',
ext: '.css'
}]
}
}, },
// Minify all .css files. // Minify all .css files.
@ -103,9 +98,9 @@ module.exports = function( grunt ) {
// Watch changes for assets. // Watch changes for assets.
watch: { watch: {
less: { css: {
files: ['<%= dirs.css %>/*.less'], files: ['<%= dirs.css %>/*.scss'],
tasks: ['less', 'cssmin'] tasks: ['sass', 'cssmin']
}, },
js: { js: {
files: [ files: [
@ -197,7 +192,7 @@ module.exports = function( grunt ) {
apigen: { apigen: {
command: [ command: [
'cd apigen/', 'cd apigen/',
'php apigen.php --source ../ --destination ../wc-apidocs --download yes --template-config ./templates/woodocs/config.neon --title "WooCommerce" --exclude "*/mijireh/*" --exclude "*/includes/libraries/*" --exclude "*/api/*" --exclude "*/i18n/*" --exclude "*/node_modules/*" --exclude "*/deploy/*" --exclude "*/apigen/*" --exclude "*/wc-apidocs/*"', 'php apigen.php --source ../ --destination ../wc-apidocs --download yes --template-config ./templates/woodocs/config.neon --title "WooCommerce" --exclude "*/mijireh/*" --exclude "*/includes/libraries/*" --exclude "*/api/*" --exclude "*/i18n/*" --exclude "*/node_modules/*" --exclude "*/deploy/*" --exclude "*/apigen/*" --exclude "*/wc-apidocs/*"'
].join( '&&' ) ].join( '&&' )
} }
}, },
@ -238,9 +233,9 @@ module.exports = function( grunt ) {
// Load NPM tasks to be used here // Load NPM tasks to be used here
grunt.loadNpmTasks( 'grunt-shell' ); grunt.loadNpmTasks( 'grunt-shell' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' ); grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-less' );
grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
grunt.loadNpmTasks( 'grunt-contrib-uglify' ); grunt.loadNpmTasks( 'grunt-contrib-uglify' );
grunt.loadNpmTasks( 'grunt-contrib-sass' );
grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
grunt.loadNpmTasks( 'grunt-contrib-watch' ); grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-contrib-copy' ); grunt.loadNpmTasks( 'grunt-contrib-copy' );
grunt.loadNpmTasks( 'grunt-contrib-clean' ); grunt.loadNpmTasks( 'grunt-contrib-clean' );
@ -249,11 +244,15 @@ module.exports = function( grunt ) {
// Register tasks // Register tasks
grunt.registerTask( 'default', [ grunt.registerTask( 'default', [
'less', 'css',
'cssmin',
'uglify' 'uglify'
]); ]);
grunt.registerTask( 'css', [
'sass',
'cssmin'
]);
grunt.registerTask( 'docs', [ grunt.registerTask( 'docs', [
'clean:apigen', 'clean:apigen',
'shell:apigen' 'shell:apigen'

View File

@ -4,6 +4,11 @@ Welcome to the WooCommerce repository on GitHub. Here you can browse the source,
If you are not a developer, please use the [WooCommerce plugin page](http://wordpress.org/plugins/woocommerce/) on WordPress.org. If you are not a developer, please use the [WooCommerce plugin page](http://wordpress.org/plugins/woocommerce/) on WordPress.org.
## Documentation
* The [WooCommerce docs site](http://docs.woothemes.com/documentation/plugins/woocommerce/)
* [WooCommerce API Docs](http://docs.woothemes.com/wc-apidocs/)
* [WooCommerce REST API Docs](http://docs.woocommercev2.apiary.io/)
## Support ## Support
This repository is not suitable for support. Please don't use our issue tracker for support requests, but for core WooCommerce issues only. Support can take place in the appropriate channels: This repository is not suitable for support. Please don't use our issue tracker for support requests, but for core WooCommerce issues only. Support can take place in the appropriate channels:
@ -14,3 +19,5 @@ Support requests in issues on this repository will be closed on sight.
## Contributing to WooCommerce ## Contributing to WooCommerce
If you have a patch, or stumbled upon an issue with WooCommerce core, you can contribute this back to the code. Please read our [contributor guidelines](https://github.com/woothemes/woocommerce/blob/master/CONTRIBUTING.md) for more information how you can do this. If you have a patch, or stumbled upon an issue with WooCommerce core, you can contribute this back to the code. Please read our [contributor guidelines](https://github.com/woothemes/woocommerce/blob/master/CONTRIBUTING.md) for more information how you can do this.
If you have an idea for WooComerce, see the [Roadmap Trello board](https://trello.com/b/YgRbpuze/woocommerce-roadmap).

200
assets/css/_mixins.scss Normal file
View File

@ -0,0 +1,200 @@
$woocommerce: #ad74a2;
$green: #7ad03a;
$red: #a00;
$orange: #ffba00;
$blue: #2ea2cc;
@mixin clearfix() {
*zoom: 1;
&:before,
&:after {
content: " ";
display: table;
}
&:after {
clear: both;
}
}
@mixin border_radius($radius: 4px) {
-webkit-border-radius:$radius;
border-radius:$radius;
}
@mixin border_radius_right($radius: 4px) {
-webkit-border-top-right-radius: $radius;
-webkit-border-bottom-right-radius: $radius;
border-top-right-radius: $radius;
border-bottom-right-radius: $radius;
}
@mixin border_radius_left($radius: 4px) {
-webkit-border-top-left-radius: $radius;
-webkit-border-bottom-left-radius: $radius;
border-top-left-radius: $radius;
border-bottom-left-radius: $radius;
}
@mixin border_radius_bottom($radius: 4px) {
-webkit-border-bottom-left-radius: $radius;
-webkit-border-bottom-right-radius: $radius;
border-bottom-left-radius: $radius;
border-bottom-right-radius: $radius;
}
@mixin border_radius_top($radius: 4px) {
-webkit-border-top-left-radius: $radius;
-webkit-border-top-right-radius: $radius;
border-top-left-radius: $radius;
border-top-right-radius: $radius;
}
@mixin opacity( $opacity: 0.75 ) {
filter: unquote("alpha(opacity=$opacity * 100)");
-moz-opacity: $opacity;
-khtml-opacity: $opacity;
opacity: $opacity;
}
@mixin box_shadow($shadow_x: 3px, $shadow_y: 3px, $shadow_rad: 3px, $shadow_in: 3px, $shadow_color: #888) {
box-shadow: $shadow_x $shadow_y $shadow_rad $shadow_in $shadow_color;
-webkit-box-shadow: $shadow_x $shadow_y $shadow_rad $shadow_in $shadow_color;
}
@mixin inset_box_shadow($shadow_x: 3px, $shadow_y: 3px, $shadow_rad: 3px, $shadow_in: 3px, $shadow_color: #888) {
box-shadow: inset $shadow_x $shadow_y $shadow_rad $shadow_in $shadow_color;
-webkit-box-shadow: inset $shadow_x $shadow_y $shadow_rad $shadow_in $shadow_color;
}
@mixin text_shadow($shadow_x: 3px, $shadow_y: 3px, $shadow_rad: 3px, $shadow_color: #fff) {
text-shadow: $shadow_x $shadow_y $shadow_rad $shadow_color;
}
@mixin vertical_gradient($from: #000, $to: #fff) {
background: $from;
background: -webkit-gradient(linear, left top, left bottom, from($from), to($to));
background: -webkit-linear-gradient($from, $to);
background: -moz-linear-gradient(center top, $from 0%, $to 100%);
background: -moz-gradient(center top, $from 0%, $to 100%);
}
@mixin transition($selector: all, $animation: ease-in-out, $duration: .2s) {
-webkit-transition: $selector $animation $duration;
-moz-transition: $selector $animation $duration;
-o-transition: $selector $animation $duration;
transition: $selector $animation $duration;
}
@mixin scale($ratio: 1.5) {
-webkit-transform: scale($ratio);
-moz-transform: scale($ratio);
-ms-transform: scale($ratio);
-o-transform: scale($ratio);
transform: scale($ratio);
}
@mixin borderbox() {
-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-moz-box-sizing: border-box; /* Firefox, other Gecko */
box-sizing: border-box; /* Opera/IE 8+ */
}
@mixin darkorlighttextshadow($a, $opacity: .8) {
@if lightness($a) >= 65% {
@include text_shadow(0, -1px, 0, rgba(0, 0, 0, $opacity));
} @else {
@include text_shadow(0, 1px, 0, rgba(255, 255, 255, $opacity));
}
}
/**
* Objects
*/
@mixin menu() {
@include clearfix();
li {
display: inline-block;
}
}
@mixin mediaright() {
@include clearfix();
img {
float: right;
height: auto;
}
}
@mixin medialeft() {
@include clearfix();
img {
float: right;
height: auto;
}
}
@mixin ir() {
display: block;
text-indent: -9999px;
position: relative;
height: 1em;
width: 1em;
}
@mixin icon( $glyph: "\e001" ) {
font-family: 'WooCommerce';
speak: none;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
-webkit-font-smoothing: antialiased;
margin:0;
text-indent: 0;
position: absolute;
top:0;
left:0;
width:100%;
height: 100%;
text-align: center;
content: $glyph;
}
@mixin iconbefore( $glyph: "\e001" ) {
font-family: 'WooCommerce';
speak: none;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
-webkit-font-smoothing: antialiased;
margin-right:7px;
content: $glyph;
}
@mixin iconafter( $glyph: "\e001" ) {
font-family: 'WooCommerce';
speak: none;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
-webkit-font-smoothing: antialiased;
margin-left: 7px;
content: $glyph;
}
// Common styles.
.clear {
clear: both;
}
.nobr {
white-space: nowrap;
}

View File

@ -0,0 +1,11 @@
$primary: #ad74a2; // Primary colour for buttons (alt)
$primarytext: desaturate(lighten($primary, 50%), 18%); // Text on primary colour bg
$secondary: desaturate(lighten($primary, 40%), 18%); // Secondary buttons
$secondarytext: desaturate(darken($secondary, 60%), 18%); // Text on secondary colour bg
$highlight: adjust-hue($primary, 150deg); // Prices, In stock labels, sales flash
$highlightext: desaturate(lighten($highlight, 50%), 18%); // Text on highlight colour bg
$contentbg: #fff; // Content BG - Tabs (active state)
$subtext: #777; // small, breadcrumbs etc

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
/* =Mixins /* =Mixins
-------------------------------------------------------------- */ -------------------------------------------------------------- */
@import "mixins.less"; @import "mixins";
/* =Custom Font /* =Custom Font
@ -160,13 +160,13 @@ table.wc_status_table {
background: transparent none; background: transparent none;
} }
mark.yes { mark.yes {
color: @green; color: $green;
} }
mark.no { mark.no {
color: #999; color: #999;
} }
mark.error { mark.error {
color: @red; color: $red;
} }
ul { ul {
margin: 0; margin: 0;
@ -279,104 +279,6 @@ ul.wc_coupon_list, .column-coupon_code {
overflow: hidden; overflow: hidden;
zoom: 1; zoom: 1;
clear: both; clear: both;
.code {
margin-right: 6px;
}
li.code {
margin: 0 6px 12px 0 !important;
}
.code, .code a, .code span {
&:before, &:after {
content: "";
display: block;
position: absolute;
width: 8px;
height: 4px;
background: #f7f7f7;
-webkit-border-radius:2px;
-moz-border-radius:2px;
-o-border-radius:2px;
border-radius:2px;
-moz-box-shadow: 0 2px 0 0 rgba(255,255,255,0.3), inset 0 2px 0 0 rgba(0,0,0,0.1);
-webkit-box-shadow: 0 2px 0 0 rgba(255,255,255,0.3), inset 0 2px 0 0 rgba(0,0,0,0.1);
box-shadow: 0 2px 0 0 rgba(255,255,255,0.3), inset 0 2px 0 0 rgba(0,0,0,0.1);
}
}
.code {
overflow: hidden;
vertical-align: middle;
margin: 0 8px 0 0;
background: #ececec;
color: #21759A;
text-shadow: 0 1px 0 #ddd;
padding: 2px;
position: relative;
float: left;
line-height: 1em;
-moz-box-shadow: 0 2px 0 0 #dddddd;
-webkit-box-shadow: 0 2px 0 0 #dddddd;
box-shadow: 0 2px 0 0 #dddddd;
font-weight: bold;
&:before {
bottom: 5px;
left: 0;
margin: 0 0 0 -4px;
}
&:after {
top: 5px;
left: 0;
margin: 0 0 0 -4px;
}
a, span {
float: left;
padding: 0 4px;
color: #21759A;
&:before {
bottom: 5px;
right: 0;
margin: 0 -4px 0 0;
}
&:after {
content: "";
top: 5px;
right: 0;
margin: 0 -4px 0 0;
}
span {
border: 1px dashed #ccc;
padding: .5em 6px;
-webkit-border-radius:2px;
-moz-border-radius:2px;
-o-border-radius:2px;
border-radius:2px;
&:before {
top: 50%;
left: 0;
margin: -2px 0 0 -4px;
}
&:after {
top: 50%;
right: 0;
margin: -2px -4px 0 0;
}
}
}
&:hover {
background: #975e83;
color: #fff;
text-shadow: 0 1px 0 #5a324b;
a, span {
color: #fff;
span {
border: 1px dashed #bb82a7;
}
}
}
}
} }
ul.wc_coupon_list_block { ul.wc_coupon_list_block {
margin: 0; margin: 0;
@ -401,7 +303,7 @@ ul.wc_coupon_list_block {
/* Orders */ /* Orders */
.button.wc-reload { .button.wc-reload {
.ir; @include ir();
padding:0; padding:0;
-webkit-border-radius:100%; -webkit-border-radius:100%;
border-radius:100%; border-radius:100%;
@ -409,7 +311,7 @@ ul.wc_coupon_list_block {
width:24px !important; width:24px !important;
display: inline-block; display: inline-block;
&:after { &:after {
.icon( "\e031" ); @include icon( "\e031" );
line-height: 22px; line-height: 22px;
} }
} }
@ -616,7 +518,7 @@ ul.wc_coupon_list_block {
background: #fff; background: #fff;
padding: 12px; padding: 12px;
background:#f8f8f8; background:#f8f8f8;
.clearfix; @include clearfix();
line-height: 2em; line-height: 2em;
text-align: right; text-align: right;
p { p {
@ -685,7 +587,7 @@ ul.wc_coupon_list_block {
} }
} }
.refunded-total { .refunded-total {
color: @red; color: $red;
} }
} }
.refund-actions { .refund-actions {
@ -711,6 +613,11 @@ ul.wc_coupon_list_block {
.amount { .amount {
white-space: nowrap; white-space: nowrap;
} }
.add-items {
.description {
margin-right: 10px;
}
}
} }
.woocommerce_order_items_wrapper { .woocommerce_order_items_wrapper {
margin: 0; margin: 0;
@ -899,33 +806,33 @@ ul.wc_coupon_list_block {
tr.fee { tr.fee {
.thumb div { .thumb div {
.ir(); @include ir();
font-size: 14px; font-size: 14px;
margin: 6px; margin: 6px;
&:before { &:before {
.icon( "\e007" ); @include icon( "\e007" );
color: #bbbbbb; color: #bbbbbb;
} }
} }
} }
tr.refund { tr.refund {
.thumb div { .thumb div {
.ir(); @include ir();
font-size: 14px; font-size: 14px;
margin: 6px; margin: 6px;
&:before { &:before {
.icon( "\e014" ); @include icon( "\e014" );
color: #bbbbbb; color: #bbbbbb;
} }
} }
} }
tr.shipping { tr.shipping {
.thumb div { .thumb div {
.ir(); @include ir();
font-size: 14px; font-size: 14px;
margin: 6px; margin: 6px;
&:before { &:before {
.icon( "\e01a" ); @include icon( "\e01a" );
color: #bbbbbb; color: #bbbbbb;
} }
} }
@ -936,13 +843,13 @@ ul.wc_coupon_list_block {
th.line_tax, td.line_tax { th.line_tax, td.line_tax {
padding: 8px 16px 8px 8px; padding: 8px 16px 8px 8px;
.delete-order-tax { .delete-order-tax {
.ir; @include ir();
font-size: 12px; font-size: 12px;
visibility: hidden; visibility: hidden;
float: right; float: right;
margin: 2px -16px 0 0; margin: 2px -16px 0 0;
&:before { &:before {
.icon( "\e013" ); @include icon( "\e013" );
color:white; color:white;
background-color: #000; background-color: #000;
-webkit-border-radius:100%; -webkit-border-radius:100%;
@ -951,8 +858,8 @@ ul.wc_coupon_list_block {
box-shadow:0 1px 2px rgba(0,0,0,0.2); box-shadow:0 1px 2px rgba(0,0,0,0.2);
} }
&:hover:before { &:hover:before {
border-color: @red; border-color: $red;
background-color: @red; background-color: $red;
} }
} }
&:hover { &:hover {
@ -963,7 +870,7 @@ ul.wc_coupon_list_block {
} }
small.refunded { small.refunded {
display: block; display: block;
color: @red; color: $red;
white-space: nowrap; white-space: nowrap;
} }
} }
@ -971,11 +878,11 @@ ul.wc_coupon_list_block {
.wc-order-items-editable { .wc-order-items-editable {
.edit-order-item { .edit-order-item {
.ir; @include ir();
display: inline-block; display: inline-block;
margin: 0 .5em 0 0; margin: 0 .5em 0 0;
&:before { &:before {
.icon; @include icon;
content: "\e603"; content: "\e603";
color: #999; color: #999;
} }
@ -987,17 +894,17 @@ ul.wc_coupon_list_block {
} }
.delete-order-item, .delete-order-item,
.delete_refund { .delete_refund {
.ir; @include ir();
display: inline-block; display: inline-block;
margin: 0; margin: 0;
&:before { &:before {
.icon; @include icon;
content: "\e013"; content: "\e013";
color: #999; color: #999;
} }
&:hover { &:hover {
&:before { &:before {
color: @red; color: $red;
} }
} }
} }
@ -1123,23 +1030,23 @@ ul.wc_coupon_list_block {
width:45px; width:45px;
text-align: center; text-align: center;
mark { mark {
.ir; @include ir();
background: none; background: none;
font-size: 1.4em; font-size: 1.4em;
margin: 0 auto; margin: 0 auto;
} }
mark.pending, mark.completed, mark.on-hold, mark.failed, mark.cancelled, mark.processing, mark.refunded { mark.pending, mark.completed, mark.on-hold, mark.failed, mark.cancelled, mark.processing, mark.refunded {
&:after { &:after {
.icon; @include icon;
} }
} }
mark.pending:after { mark.pending:after {
content: "\e012"; content: "\e012";
color: @orange; color: $orange;
} }
mark.completed:after { mark.completed:after {
content: "\e015"; content: "\e015";
color: @blue; color: $blue;
} }
mark.on-hold:after { mark.on-hold:after {
content: "\e033"; content: "\e033";
@ -1151,7 +1058,7 @@ ul.wc_coupon_list_block {
} }
mark.cancelled:after { mark.cancelled:after {
content: "\e013"; content: "\e013";
color: @red; color: $red;
} }
mark.processing:after { mark.processing:after {
content: "\e011"; content: "\e011";
@ -1168,34 +1075,34 @@ ul.wc_coupon_list_block {
} }
.column-customer_message { .column-customer_message {
.note-on { .note-on {
.ir; @include ir();
margin:0 auto; margin:0 auto;
color: #999; color: #999;
&:after { &:after {
.icon( "\e026" ); @include icon( "\e026" );
line-height: 16px; line-height: 16px;
} }
} }
} }
.column-order_notes { .column-order_notes {
.note-on { .note-on {
.ir; @include ir();
margin:0 auto; margin:0 auto;
color: #999; color: #999;
&:after { &:after {
.icon( "\e027" ); @include icon( "\e027" );
line-height: 16px; line-height: 16px;
} }
} }
} }
.order_actions { .order_actions {
.processing, .complete, .view { .processing, .complete, .view {
.ir; @include ir();
padding:0 !important; padding:0 !important;
height: 2em !important; height: 2em !important;
width:2em; width:2em;
&:after { &:after {
.icon; @include icon;
line-height: 1.85; line-height: 1.85;
} }
} }
@ -1211,12 +1118,12 @@ ul.wc_coupon_list_block {
} }
.user_actions { .user_actions {
.edit, .link, .view { .edit, .link, .view {
.ir; @include ir();
padding:0 !important; padding:0 !important;
height: 2em !important; height: 2em !important;
width:2em; width:2em;
&:after { &:after {
.icon; @include icon;
line-height: 1.85; line-height: 1.85;
} }
} }
@ -1242,12 +1149,12 @@ ul.wc_coupon_list_block {
.attribute-actions { .attribute-actions {
width:2em; width:2em;
.configure-terms { .configure-terms {
.ir; @include ir();
padding:0 !important; padding:0 !important;
height: 2em !important; height: 2em !important;
width:2em; width:2em;
&:after { &:after {
.icon("\e01c"); @include icon("\e01c");
line-height: 1.85; line-height: 1.85;
} }
} }
@ -1278,7 +1185,7 @@ ul.order_notes {
} }
} }
a.delete_note { a.delete_note {
color: @red color: $red
} }
.note_content:after { .note_content:after {
content: ""; content: "";
@ -1368,10 +1275,10 @@ table.wp-list-table {
text-align: left !important; text-align: left !important;
} }
span.wc-image, span.wc-featured, span.wc-type { span.wc-image, span.wc-featured, span.wc-type {
.ir; @include ir();
margin:0 auto; margin:0 auto;
&:before { &:before {
.icon( "\e00c" ); @include icon( "\e00c" );
} }
} }
span.wc-featured { span.wc-featured {
@ -1398,10 +1305,10 @@ table.wp-list-table {
} }
} }
span.product-type { span.product-type {
.ir; @include ir();
font-size:1.2em; font-size:1.2em;
&:before { &:before {
.icon( "\e006" ); @include icon( "\e006" );
} }
&.grouped:before { &.grouped:before {
content: "\e002"; content: "\e002";
@ -1421,7 +1328,7 @@ table.wp-list-table {
} }
mark.instock { mark.instock {
font-weight: bold; font-weight: bold;
color: @green; color: $green;
background: transparent none; background: transparent none;
line-height: 1; line-height: 1;
} }
@ -1432,11 +1339,11 @@ table.wp-list-table {
line-height: 1; line-height: 1;
} }
.order-notes_head, .notes_head, .status_head { .order-notes_head, .notes_head, .status_head {
.ir; @include ir();
margin:0 auto; margin:0 auto;
&:after { &:after {
.icon; @include icon;
} }
} }
.order-notes_head:after { .order-notes_head:after {
@ -1472,7 +1379,7 @@ table.wp-list-table {
/* Settings */ /* Settings */
mark.notice { mark.notice {
background: #fff; background: #fff;
color: @red; color: $red;
margin: 0 0 0 10px; margin: 0 0 0 10px;
} }
a.export_rates, a.import_rates { a.export_rates, a.import_rates {
@ -1484,7 +1391,7 @@ a.export_rates, a.import_rates {
table.wc_tax_rates, table.wc_input_table { table.wc_tax_rates, table.wc_input_table {
width: 100%; width: 100%;
span.tips { span.tips {
color: @blue; color: $blue;
} }
td { td {
padding: 0; padding: 0;
@ -1625,12 +1532,12 @@ img.help_tip {
.status-enabled, .status-disabled { .status-enabled, .status-disabled {
font-size:1.4em; font-size:1.4em;
.ir; @include ir();
} }
.status-enabled { .status-enabled {
&:before { &:before {
.icon( "\e015" ); @include icon( "\e015" );
color: @woocommerce; color: $woocommerce;
} }
} }
@ -1679,7 +1586,7 @@ img.help_tip {
} }
span.help_tip { span.help_tip {
cursor: help; cursor: help;
color: @blue; color: $blue;
} }
th { th {
position: relative; position: relative;
@ -1813,7 +1720,7 @@ img.help_tip {
#product_images_container { #product_images_container {
padding: 0 0 0 9px; padding: 0 0 0 9px;
ul { ul {
.clearfix; @include clearfix();
margin: 0; margin: 0;
padding: 0; padding: 0;
li.image, li.add, li.wc-metabox-sortable-placeholder { li.image, li.add, li.wc-metabox-sortable-placeholder {
@ -1840,7 +1747,7 @@ img.help_tip {
border: 3px dashed #dddddd; border: 3px dashed #dddddd;
position: relative; position: relative;
&:after { &:after {
.icon( "\e00c" ); @include icon( "\e00c" );
font-size:2.618em; font-size:2.618em;
line-height: 72px; line-height: 72px;
color: #ddd; color: #ddd;
@ -1867,19 +1774,19 @@ img.help_tip {
} }
} }
a.view { a.view {
.ir; @include ir();
font-size:1.4em; font-size:1.4em;
&:before { &:before {
.icon( "\e00c" ); @include icon( "\e00c" );
background-color: #000; background-color: #000;
color: #fff; color: #fff;
} }
} }
a.delete { a.delete {
.ir; @include ir();
font-size:1.4em; font-size:1.4em;
&:before { &:before {
.icon( "\e013" ); @include icon( "\e013" );
color:white; color:white;
background-color: #000; background-color: #000;
-webkit-border-radius:100%; -webkit-border-radius:100%;
@ -1887,7 +1794,7 @@ img.help_tip {
box-shadow:0 1px 2px rgba(0,0,0,0.2); box-shadow:0 1px 2px rgba(0,0,0,0.2);
} }
&:hover:before { &:hover:before {
background-color: @red; background-color: $red;
} }
} }
} }
@ -2016,7 +1923,7 @@ img.help_tip {
border-bottom: 1px solid #f5f5f5; border-bottom: 1px solid #f5f5f5;
border-top: 1px solid #eaeaea; border-top: 1px solid #eaeaea;
&:before { &:before {
.iconbefore( "\e028" ); @include iconbefore( "\e028" );
} }
} }
@ -2110,7 +2017,7 @@ img.help_tip {
} }
.add.button:before { .add.button:before {
.iconbefore( "\e007" ); @include iconbefore( "\e007" );
} }
} }
h4.wc-settings-sub-title { h4.wc-settings-sub-title {
@ -2209,15 +2116,15 @@ img.help_tip {
cursor: pointer; cursor: pointer;
} }
.delete { .delete {
.ir; @include ir();
&:before { &:before {
.icon; @include icon;
content: "\e013"; content: "\e013";
color: #999; color: #999;
} }
&:hover { &:hover {
&:before { &:before {
color: @red; color: $red;
} }
} }
} }
@ -2279,7 +2186,7 @@ img.help_tip {
.req { .req {
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
color: @red; color: $red;
} }
} }
.description { .description {
@ -2537,7 +2444,7 @@ img.help_tip {
line-height: 22px; line-height: 22px;
text-decoration: none; text-decoration: none;
&:before { &:before {
.iconbefore( "\e036" ); @include iconbefore( "\e036" );
font-size: .8em; font-size: .8em;
color: #999; color: #999;
} }
@ -2830,7 +2737,7 @@ img.ui-datepicker-trigger { vertical-align: middle; margin-top: -1px; cursor: po
display: block; display: block;
text-decoration: none; text-decoration: none;
&:before { &:before {
.iconbefore( "\e00a" ); @include iconbefore( "\e00a" );
margin-right:4px; margin-right:4px;
} }
} }
@ -2918,7 +2825,7 @@ img.ui-datepicker-trigger { vertical-align: middle; margin-top: -1px; cursor: po
border-right-width: 0; border-right-width: 0;
padding: 10px; padding: 10px;
margin:0; margin:0;
color: @blue; color: $blue;
border-top-width:0; border-top-width:0;
background-image: -webkit-gradient(linear,left bottom,left top,from(#ececec),to(#f9f9f9)); background-image: -webkit-gradient(linear,left bottom,left top,from(#ececec),to(#f9f9f9));
background-image: -webkit-linear-gradient(bottom,#ececec,#f9f9f9); background-image: -webkit-linear-gradient(bottom,#ececec,#f9f9f9);
@ -2926,7 +2833,7 @@ img.ui-datepicker-trigger { vertical-align: middle; margin-top: -1px; cursor: po
background-image: -o-linear-gradient(bottom,#ececec,#f9f9f9); background-image: -o-linear-gradient(bottom,#ececec,#f9f9f9);
background-image: linear-gradient(to top,#ececec,#f9f9f9); background-image: linear-gradient(to top,#ececec,#f9f9f9);
&.section_title:hover { &.section_title:hover {
color:@red; color:$red;
} }
} }
.section_title { .section_title {
@ -2934,7 +2841,7 @@ img.ui-datepicker-trigger { vertical-align: middle; margin-top: -1px; cursor: po
span { span {
display: block; display: block;
&:after { &:after {
.iconafter( "\e035" ); @include iconafter( "\e035" );
float: right; float: right;
font-size:.9em; font-size:.9em;
line-height: 1.618; line-height: 1.618;
@ -3032,7 +2939,7 @@ img.ui-datepicker-trigger { vertical-align: middle; margin-top: -1px; cursor: po
&:hover { &:hover {
box-shadow: box-shadow:
inset 0 -1px 0 0 #dfdfdf, inset 0 -1px 0 0 #dfdfdf,
inset 300px 0 0 fade(#9c5d90,10%); inset 300px 0 0 rgba(156, 93, 144, 0.1);
border-right: 5px solid #9c5d90 !important; border-right: 5px solid #9c5d90 !important;
padding-left:1.5em; padding-left:1.5em;
color: #9c5d90; color: #9c5d90;
@ -3117,12 +3024,12 @@ img.ui-datepicker-trigger { vertical-align: middle; margin-top: -1px; cursor: po
.column-wc_actions { .column-wc_actions {
a.edit, a.edit,
a.view { a.view {
.ir; @include ir();
padding:0 !important; padding:0 !important;
height: 2em !important; height: 2em !important;
width:2em; width:2em;
&:after { &:after {
.icon; @include icon;
line-height: 1.85; line-height: 1.85;
} }
} }
@ -3343,7 +3250,7 @@ table.bar_chart {
} }
} }
@import 'chosen.less'; @import 'chosen';
.chosen-container-single .chosen-single { .chosen-container-single .chosen-single {
abbr { abbr {

View File

@ -1 +1 @@
.clear{clear:both}.nobr{white-space:nowrap}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format('embedded-opentype'),url(../fonts/WooCommerce.woff) format('woff'),url(../fonts/WooCommerce.ttf) format('truetype'),url(../fonts/WooCommerce.svg#WooCommerce) format('svg');font-weight:400;font-style:normal}ul.woocommerce_stats{overflow:hidden;zoom:1}ul.woocommerce_stats li{width:25%;padding:0 1em;float:left;font-size:.8em;border-left:1px solid #fff;border-right:1px solid #ececec;text-align:center;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}ul.woocommerce_stats li:first-child{border-left:0}ul.woocommerce_stats li:last-child{border-right:0}ul.woocommerce_stats strong{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:4em;line-height:1.2em;font-weight:400;text-align:center;display:block}#woocommerce_dashboard_status .inside{padding:0;margin:0}#woocommerce_dashboard_status .wc_status_list{overflow:hidden;margin:0}#woocommerce_dashboard_status .wc_status_list li{width:50%;float:left;padding:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0;border-top:1px solid #ececec;color:#aaa}#woocommerce_dashboard_status .wc_status_list li a{display:block;color:#aaa;padding:9px 12px;-webkit-transition:all ease .5s;position:relative;font-size:12px}#woocommerce_dashboard_status .wc_status_list li a .wc_sparkline{width:4em;height:2em;display:block;float:right;position:absolute;right:0;top:50%;margin-right:12px;margin-top:-1.25em}#woocommerce_dashboard_status .wc_status_list li a strong{font-size:18px;line-height:1.2em;font-weight:400;display:block;color:#21759b}#woocommerce_dashboard_status .wc_status_list li a:hover{color:#2ea2cc}#woocommerce_dashboard_status .wc_status_list li a:hover strong,#woocommerce_dashboard_status .wc_status_list li a:hover:before{color:#2ea2cc!important}#woocommerce_dashboard_status .wc_status_list li a:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0 12px 12px 0;text-indent:0;top:0;left:0;height:100%;text-align:center;content:"\e001";font-size:2em;position:relative;width:auto;line-height:1.2em;color:#464646;float:left}#woocommerce_dashboard_status .wc_status_list li:first-child{border-top:0}#woocommerce_dashboard_status .wc_status_list li.sales-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.sales-this-month a:before{content:"\e01f"}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month a:before{content:"\e006"}#woocommerce_dashboard_status .wc_status_list li.processing-orders{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.processing-orders a:before{content:"\e011";color:#7ad03a}#woocommerce_dashboard_status .wc_status_list li.on-hold-orders a:before{content:"\e033";color:#999}#woocommerce_dashboard_status .wc_status_list li.low-in-stock{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.low-in-stock a:before{content:"\e02c";color:#ffba00}#woocommerce_dashboard_status .wc_status_list li.out-of-stock a:before{content:"\e02c";color:#a00}#woocommerce_dashboard_recent_reviews li{line-height:1.5em;margin-bottom:12px}#woocommerce_dashboard_recent_reviews h4.meta{line-height:1.4;margin:-.2em 0 0;font-weight:400;color:#999}#woocommerce_dashboard_recent_reviews blockquote{padding:0;margin:0}#woocommerce_dashboard_recent_reviews .avatar{float:left;margin:0 10px 5px 0}#woocommerce_dashboard_recent_reviews .star-rating{float:right;overflow:hidden;position:relative;height:1.5em;line-height:1.5;margin-left:.5em;width:5.4em;font-family:WooCommerce!important}#woocommerce_dashboard_recent_reviews .star-rating:before{content:"\e021\e021\e021\e021\e021";color:#b3b3b3;float:left;top:0;left:0;position:absolute;letter-spacing:.1em}#woocommerce_dashboard_recent_reviews .star-rating span{overflow:hidden;float:left;top:0;left:0;position:absolute;padding-top:1.5em}#woocommerce_dashboard_recent_reviews .star-rating span:before{content:"\e020\e020\e020\e020\e020";top:0;position:absolute;left:0;letter-spacing:.1em;color:#9c5d90}#dash-right-now li.product-count a:before{font-family:WooCommerce;content:"\e01d"} @charset "UTF-8";.clear{clear:both}.nobr{white-space:nowrap}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}ul.woocommerce_stats{overflow:hidden;zoom:1}ul.woocommerce_stats li{width:25%;padding:0 1em;float:left;font-size:.8em;border-left:1px solid #fff;border-right:1px solid #ececec;text-align:center;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}ul.woocommerce_stats li:first-child{border-left:0}ul.woocommerce_stats li:last-child{border-right:0}ul.woocommerce_stats strong{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:4em;line-height:1.2em;font-weight:400;text-align:center;display:block}#woocommerce_dashboard_status .inside{padding:0;margin:0}#woocommerce_dashboard_status .wc_status_list{overflow:hidden;margin:0}#woocommerce_dashboard_status .wc_status_list li{width:50%;float:left;padding:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0;border-top:1px solid #ececec;color:#aaa}#woocommerce_dashboard_status .wc_status_list li a{display:block;color:#aaa;padding:9px 12px;-webkit-transition:all ease .5s;position:relative;font-size:12px}#woocommerce_dashboard_status .wc_status_list li a .wc_sparkline{width:4em;height:2em;display:block;float:right;position:absolute;right:0;top:50%;margin-right:12px;margin-top:-1.25em}#woocommerce_dashboard_status .wc_status_list li a strong{font-size:18px;line-height:1.2em;font-weight:400;display:block;color:#21759b}#woocommerce_dashboard_status .wc_status_list li a:hover{color:#2ea2cc}#woocommerce_dashboard_status .wc_status_list li a:hover strong,#woocommerce_dashboard_status .wc_status_list li a:hover:before{color:#2ea2cc!important}#woocommerce_dashboard_status .wc_status_list li a:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0 12px 12px 0;text-indent:0;top:0;left:0;height:100%;text-align:center;content:"";font-size:2em;position:relative;width:auto;line-height:1.2em;color:#464646;float:left}#woocommerce_dashboard_status .wc_status_list li:first-child{border-top:0}#woocommerce_dashboard_status .wc_status_list li.sales-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.sales-this-month a:before{content:"\e01f"}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month a:before{content:"\e006"}#woocommerce_dashboard_status .wc_status_list li.processing-orders{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.processing-orders a:before{content:"\e011";color:#7ad03a}#woocommerce_dashboard_status .wc_status_list li.on-hold-orders a:before{content:"\e033";color:#999}#woocommerce_dashboard_status .wc_status_list li.low-in-stock{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.low-in-stock a:before{content:"\e02c";color:#ffba00}#woocommerce_dashboard_status .wc_status_list li.out-of-stock a:before{content:"\e02c";color:#a00}#woocommerce_dashboard_recent_reviews li{line-height:1.5em;margin-bottom:12px}#woocommerce_dashboard_recent_reviews h4.meta{line-height:1.4;margin:-.2em 0 0;font-weight:400;color:#999}#woocommerce_dashboard_recent_reviews blockquote{padding:0;margin:0}#woocommerce_dashboard_recent_reviews .avatar{float:left;margin:0 10px 5px 0}#woocommerce_dashboard_recent_reviews .star-rating{float:right;overflow:hidden;position:relative;height:1.5em;line-height:1.5;margin-left:.5em;width:5.4em;font-family:WooCommerce!important}#woocommerce_dashboard_recent_reviews .star-rating:before{content:"\e021\e021\e021\e021\e021";color:#b3b3b3;float:left;top:0;left:0;position:absolute;letter-spacing:.1em}#woocommerce_dashboard_recent_reviews .star-rating span{overflow:hidden;float:left;top:0;left:0;position:absolute;padding-top:1.5em}#woocommerce_dashboard_recent_reviews .star-rating span:before{content:"\e020\e020\e020\e020\e020";top:0;position:absolute;left:0;letter-spacing:.1em;color:#9c5d90}#dash-right-now li.product-count a:before{font-family:WooCommerce;content:"\e01d"}

View File

@ -1,4 +1,4 @@
@import 'mixins.less'; @import 'mixins';
@font-face { @font-face {
font-family: 'WooCommerce'; font-family: 'WooCommerce';
@ -99,7 +99,7 @@ ul.woocommerce_stats {
} }
&:before { &:before {
.icon(); @include icon();
font-size: 2em; font-size: 2em;
position: relative; position: relative;
width: auto; width: auto;
@ -132,7 +132,7 @@ ul.woocommerce_stats {
border-right: 1px solid #ececec; border-right: 1px solid #ececec;
a:before { a:before {
content: "\e011"; content: "\e011";
color: @green; color: $green;
} }
} }
li.on-hold-orders { li.on-hold-orders {
@ -145,13 +145,13 @@ ul.woocommerce_stats {
border-right: 1px solid #ececec; border-right: 1px solid #ececec;
a:before { a:before {
content: "\e02c"; content: "\e02c";
color: @orange; color: $orange;
} }
} }
li.out-of-stock { li.out-of-stock {
a:before { a:before {
content: "\e02c"; content: "\e02c";
color: @red; color: $red;
} }
} }
} }
@ -187,7 +187,7 @@ ul.woocommerce_stats {
font-family: 'WooCommerce' !important; font-family: 'WooCommerce' !important;
&:before { &:before {
content: "\e021\e021\e021\e021\e021"; content: "\e021\e021\e021\e021\e021";
color: darken( #ccc, 10 ); color: darken( #ccc, 10% );
float: left; float: left;
top: 0; top: 0;
left: 0; left: 0;

View File

@ -1 +1 @@
.clear{clear:both}.nobr{white-space:nowrap}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format('embedded-opentype'),url(../fonts/WooCommerce.woff) format('woff'),url(../fonts/WooCommerce.ttf) format('truetype'),url(../fonts/WooCommerce.svg#WooCommerce) format('svg');font-weight:400;font-style:normal}#adminmenu #toplevel_page_woocommerce .menu-icon-generic div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e03d";font-size:1.3em!important}#adminmenu #menu-posts-product .menu-icon-post div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e01d";font-size:1.3em!important}span.mce_woocommerce_shortcodes_button{background-image:none!important;display:block;text-indent:-9999px;position:relative;height:1em;width:1em}span.mce_woocommerce_shortcodes_button:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"\e01d";font-size:.9em;line-height:1.2}.wc_plugin_upgrade_notice{font-weight:400;color:#fff;background:#d54d21;padding:1em;margin:9px 0}.wc_plugin_upgrade_notice a{color:#fff;text-decoration:underline}.wc_plugin_upgrade_notice:before{content:"\f348";display:inline-block;font:400 18px/1 dashicons;speak:none;margin:0 8px 0 -2px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:top} @charset "UTF-8";.clear{clear:both}.nobr{white-space:nowrap}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}#adminmenu #toplevel_page_woocommerce .menu-icon-generic div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e03d";font-size:1.3em!important}#adminmenu #menu-posts-product .menu-icon-post div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e01d";font-size:1.3em!important}span.mce_woocommerce_shortcodes_button{background-image:none!important;display:block;text-indent:-9999px;position:relative;height:1em;width:1em}span.mce_woocommerce_shortcodes_button:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";font-size:.9em;line-height:1.2}.wc_plugin_upgrade_notice{font-weight:400;color:#fff;background:#d54d21;padding:1em;margin:9px 0}.wc_plugin_upgrade_notice a{color:#fff;text-decoration:underline}.wc_plugin_upgrade_notice:before{content:"\f348";display:inline-block;font:400 18px/1 dashicons;speak:none;margin:0 8px 0 -2px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:top}

View File

@ -1,6 +1,6 @@
/* =Mixins /* =Mixins
-------------------------------------------------------------- */ -------------------------------------------------------------- */
@import "mixins.less"; @import 'mixins';
/* Icon Font */ /* Icon Font */
@font-face { @font-face {
@ -28,9 +28,9 @@
span.mce_woocommerce_shortcodes_button { span.mce_woocommerce_shortcodes_button {
background-image: none !important; background-image: none !important;
.ir; @include ir();
&:before { &:before {
.icon( "\e01d" ); @include icon( "\e01d" );
font-size:.9em; font-size:.9em;
line-height: 1.2; line-height: 1.2;
} }

View File

@ -1,166 +0,0 @@
@woocommerce: #ad74a2;
@green: #7ad03a;
@red: #a00;
@orange: #ffba00;
@blue: #2ea2cc;
.clearfix() {
*zoom:1;
&:before,
&:after {
content: " ";
display: table;
}
&:after {
clear: both;
}
}
.border_radius(@radius:4px) {
-webkit-border-radius:@radius;
border-radius:@radius;
}
.border_radius_right(@radius:4px) {
-webkit-border-top-right-radius: @radius;
-webkit-border-bottom-right-radius: @radius;
border-top-right-radius: @radius;
border-bottom-right-radius: @radius;
}
.border_radius_left(@radius:4px) {
-webkit-border-top-left-radius: @radius;
-webkit-border-bottom-left-radius: @radius;
border-top-left-radius: @radius;
border-bottom-left-radius: @radius;
}
.border_radius_bottom(@radius:4px) {
-webkit-border-bottom-left-radius: @radius;
-webkit-border-bottom-right-radius: @radius;
border-bottom-left-radius: @radius;
border-bottom-right-radius: @radius;
}
.border_radius_top(@radius:4px) {
-webkit-border-top-left-radius: @radius;
-webkit-border-top-right-radius: @radius;
border-top-left-radius: @radius;
border-top-right-radius: @radius;
}
.opacity(@opacity:0.75) {
filter:~"alpha(opacity=@opacity * 100)";
-moz-opacity:@opacity;
-khtml-opacity: @opacity;
opacity: @opacity;
}
.box_shadow(@shadow_x:3px, @shadow_y:3px, @shadow_rad:3px, @shadow_in:3px, @shadow_color:#888) {
box-shadow:@shadow_x @shadow_y @shadow_rad @shadow_in @shadow_color;
-webkit-box-shadow:@shadow_x @shadow_y @shadow_rad @shadow_in @shadow_color;
}
.inset_box_shadow(@shadow_x:3px, @shadow_y:3px, @shadow_rad:3px, @shadow_in:3px, @shadow_color:#888) {
box-shadow:inset @shadow_x @shadow_y @shadow_rad @shadow_in @shadow_color;
-webkit-box-shadow:inset @shadow_x @shadow_y @shadow_rad @shadow_in @shadow_color;
}
.text_shadow(@shadow_x:3px, @shadow_y:3px, @shadow_rad:3px, @shadow_color:#fff) {
text-shadow:@shadow_x @shadow_y @shadow_rad @shadow_color;
}
.vertical_gradient(@from: #000, @to: #FFF) {
background: @from;
background: -webkit-gradient(linear, left top, left bottom, from(@from), to(@to));
background: -webkit-linear-gradient(@from, @to);
background: -moz-linear-gradient(center top, @from 0%, @to 100%);
background: -moz-gradient(center top, @from 0%, @to 100%);
}
.transition(@selector:all, @animation:ease-in-out, @duration:.2s) {
-webkit-transition:@selector @animation @duration;
-moz-transition:@selector @animation @duration;
-o-transition:@selector @animation @duration;
transition:@selector @animation @duration;
}
.scale(@ratio:1.5){
-webkit-transform:scale(@ratio);
-moz-transform:scale(@ratio);
-ms-transform:scale(@ratio);
-o-transform:scale(@ratio);
transform:scale(@ratio);
}
.borderbox () {
-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-moz-box-sizing: border-box; /* Firefox, other Gecko */
box-sizing: border-box; /* Opera/IE 8+ */
}
.clear { clear: both; }
.nobr { white-space: nowrap; }
.darkorlighttextshadow ( @a, @opacity: 0.8 ) when (lightness(@a) >= 65%) { .text_shadow( 0, -1px, 0, rgba(0,0,0,@opacity) ); }
.darkorlighttextshadow ( @a, @opacity: 0.8 ) when (lightness(@a) < 65%) { .text_shadow( 0, 1px, 0, rgba(255,255,255,@opacity) ); }
/**
* Objects
*/
.menu() {
.clearfix;
li {
display: inline-block;
}
}
.mediaright() {
.clearfix;
img {
float:right;
height:auto;
}
}
.medialeft() {
.clearfix;
img {
float:right;
height:auto;
}
}
.ir() {
display: block;
text-indent: -9999px;
position: relative;
height:1em;
width:1em;
}
.icon( @glyph: "\e001" ) {
font-family: 'WooCommerce';
speak: none;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
-webkit-font-smoothing: antialiased;
margin:0;
text-indent: 0;
position: absolute;
top:0;
left:0;
width:100%;
height: 100%;
text-align: center;
content: @glyph;
}
.iconbefore( @glyph: "\e001" ) {
font-family: 'WooCommerce';
speak: none;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
-webkit-font-smoothing: antialiased;
margin-right:7px;
content: @glyph;
}
.iconafter( @glyph: "\e001" ) {
font-family: 'WooCommerce';
speak: none;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
-webkit-font-smoothing: antialiased;
margin-left:7px;
content: @glyph;
}

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
@import 'mixins.less'; @import 'mixins';
// Load the WooCommerce font // Load the WooCommerce font
@font-face { @font-face {
@ -12,9 +12,9 @@
font-style: normal; font-style: normal;
} }
// Functions // Mixins
.button() { @mixin button() {
.border_radius(100%); @include border_radius(100%);
height:1em; height:1em;
width:1em; width:1em;
text-shadow:0 1px 2px rgba(0,0,0,0.5); text-shadow:0 1px 2px rgba(0,0,0,0.5);
@ -22,7 +22,7 @@
color: #fff !important; color: #fff !important;
font-size:16px !important; font-size:16px !important;
line-height: 1em; line-height: 1em;
.transition; @include transition();
&:hover { &:hover {
background-color: #000; background-color: #000;
} }
@ -32,10 +32,10 @@
div.pp_woocommerce { div.pp_woocommerce {
.pp_content_container { .pp_content_container {
background: #fff; background: #fff;
.border_radius(3px); @include border_radius(3px);
.box_shadow(0,1px,30px,0,rgba(0,0,0,0.25)); @include box_shadow(0,1px,30px,0,rgba(0,0,0,0.25));
padding:20px 0; padding:20px 0;
.clearfix; @include clearfix();
} }
.pp_loaderIcon { .pp_loaderIcon {
background: url(../images/ajax-loader.gif) center no-repeat; background: url(../images/ajax-loader.gif) center no-repeat;
@ -49,8 +49,8 @@ div.pp_woocommerce {
a { a {
border:1px solid rgba(0,0,0,0.5); border:1px solid rgba(0,0,0,0.5);
background: #fff; background: #fff;
.box_shadow(0,1px,2px,0,rgba(0,0,0,0.2)); @include box_shadow(0,1px,2px,0,rgba(0,0,0,0.2));
.border_radius(2px); @include border_radius(2px);
display: block; display: block;
&:hover { &:hover {
border-color:#000; border-color:#000;
@ -68,7 +68,7 @@ div.pp_woocommerce {
// Next / Previous // Next / Previous
.pp_previous, .pp_next { .pp_previous, .pp_next {
&:before { &:before {
.button; @include button();
font-family: 'WooCommerce'; font-family: 'WooCommerce';
content: "\e00b"; content: "\e00b";
text-indent: 0; text-indent: 0;
@ -114,7 +114,7 @@ div.pp_woocommerce {
position: relative; position: relative;
} }
.pp_close { .pp_close {
.button; @include button();
top:-.5em; top:-.5em;
right:-.5em; right:-.5em;
font-size:1.618em !important; font-size:1.618em !important;
@ -133,7 +133,7 @@ div.pp_woocommerce {
} }
// Buttons // Buttons
.pp_arrow_previous, .pp_arrow_next { .pp_arrow_previous, .pp_arrow_next {
.button; @include button();
position: relative; position: relative;
margin-top:-1px; margin-top:-1px;
&:before { &:before {
@ -159,7 +159,7 @@ div.pp_woocommerce {
} }
} }
a.pp_expand, a.pp_contract { a.pp_expand, a.pp_contract {
.button; @include button();
right:auto; right:auto;
left:-.5em; left:-.5em;
top:-.5em; top:-.5em;
@ -202,7 +202,7 @@ div.pp_woocommerce {
div.pp_woocommerce { div.pp_woocommerce {
left: 5% !important; left: 5% !important;
right:5% !important; right:5% !important;
.borderbox; @include borderbox();
width: 90% !important; width: 90% !important;
.pp_gallery, .pp_previous, .pp_next, .pp_expand, .pp_contract { .pp_gallery, .pp_previous, .pp_next, .pp_expand, .pp_contract {
display: none !important; display: none !important;
@ -228,11 +228,13 @@ div.pp_woocommerce {
} }
.pp_content { .pp_content {
width:100% !important; width:100% !important;
img { #pp_full_res{
& > img{
width:100% !important; width:100% !important;
height:auto !important; height:auto !important;
} }
} }
}
.currentTextHolder { .currentTextHolder {
line-height: 3; line-height: 3;
} }

View File

@ -1,11 +0,0 @@
@primary: #ad74a2; /* Primary colour for buttons (alt) */
@primarytext: desaturate(lighten(@primary,50%),18%); /* Text on primary colour bg */
@secondary: desaturate(lighten(@primary,40%),18%); /* Secondary buttons */
@secondarytext: desaturate(darken(@secondary,60%),18%); /* Text on secondary colour bg */
@highlight: spin( @primary, 150 ); /* Prices, In stock labels, sales flash */
@highlightext: desaturate(lighten(@highlight,50%),18%); /* Text on highlight colour bg */
@contentbg: #fff; /* Content BG - Tabs (active state) */
@subtext: #777; /* small, breadcrumbs etc */

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,5 @@
@import "mixins.less"; @import 'mixins';
@import "woocommerce-base.less"; /* Contains base colours like @primary */ @import 'woocommerce-base'; // Contains base colours like $primary
.woocommerce, .woocommerce-page { .woocommerce, .woocommerce-page {
@ -7,7 +7,7 @@
-------------------------------------------------------------- */ -------------------------------------------------------------- */
.col2-set { .col2-set {
.clearfix; @include clearfix();
width: 100%; width: 100%;
.col-1 { .col-1 {
float:left; float:left;
@ -33,7 +33,7 @@
width: 48%; width: 48%;
} }
div.thumbnails { div.thumbnails {
.clearfix; @include clearfix();
a { a {
float:left; float:left;
width: 30.75%; width: 30.75%;
@ -54,12 +54,12 @@
.woocommerce-tabs { .woocommerce-tabs {
clear:both; clear:both;
ul.tabs { ul.tabs {
.menu; @include menu();
} }
} }
#reviews { #reviews {
.comment { .comment {
.mediaright; @include mediaright();
} }
} }
} }
@ -74,7 +74,9 @@
-------------------------------------------------------------- */ -------------------------------------------------------------- */
.related, .upsells.products { .related, .upsells.products {
.clearfix(); @include clearfix();
clear: both;
ul.products, ul { ul.products, ul {
float:none; float:none;
li.product { li.product {
@ -89,7 +91,7 @@
ul.products { ul.products {
clear:both; clear:both;
.clearfix; @include clearfix();
li.product { li.product {
float:left; float:left;
margin: 0 3.8% 2.992em 0; margin: 0 3.8% 2.992em 0;
@ -156,7 +158,7 @@
.woocommerce-pagination { .woocommerce-pagination {
ul.page-numbers { ul.page-numbers {
.menu; @include menu();
} }
} }
@ -182,7 +184,7 @@
} }
.cart-collaterals { .cart-collaterals {
.clearfix; @include clearfix();
width: 100%; width: 100%;
.related { .related {
width: 30.75%; width: 30.75%;
@ -203,7 +205,7 @@
} }
.shipping_calculator { .shipping_calculator {
width: 48%; width: 48%;
.clearfix; @include clearfix();
clear: right; clear: right;
float: right; float: right;
.col2-set { .col2-set {
@ -224,7 +226,7 @@
ul.cart_list, ul.product_list_widget { ul.cart_list, ul.product_list_widget {
li { li {
.mediaright; @include mediaright();
} }
} }
@ -233,7 +235,7 @@
form { form {
.form-row { .form-row {
.clearfix; @include clearfix();
label { label {
display:block; display:block;
&.checkbox { &.checkbox {
@ -244,7 +246,7 @@
width: 100%; width: 100%;
} }
.input-text { .input-text {
.borderbox; @include borderbox();
width:100%; width:100%;
} }
} }

View File

@ -2,7 +2,7 @@
* This stylesheet optimises the default WooCommerce layout when viewed on smaller screens. * This stylesheet optimises the default WooCommerce layout when viewed on smaller screens.
*/ */
@import "mixins.less"; @import 'mixins';
.woocommerce, .woocommerce-page { .woocommerce, .woocommerce-page {
@ -53,12 +53,12 @@
text-align: left; text-align: left;
.coupon { .coupon {
float:none; float:none;
.clearfix; @include clearfix();
padding-bottom:.5em; padding-bottom:.5em;
} }
input, .button, .input-text { input, .button, .input-text {
width:48%; width:48%;
.borderbox; @include borderbox();
} }
.input-text + .button, .button.alt { .input-text + .button, .button.alt {
float: right; float: right;
@ -93,7 +93,7 @@
#place_order { #place_order {
float: none; float: none;
width:100%; width:100%;
.borderbox; @include borderbox();
margin-bottom:1em; margin-bottom:1em;
} }
} }

File diff suppressed because one or more lines are too long

View File

@ -1,10 +1,10 @@
@import "mixins.less"; @import 'mixins';
@import "woocommerce-base.less"; /* Contains base colours like @primary */ @import 'woocommerce-base'; // Contains base colours like $primary
/* Colours */ // Colours
@tertiary: @primary; /* Price slider bar / layered nav UI */ $tertiary: $primary; // Price slider bar / layered nav UI
@tertiarytext: @primarytext; /* Text on tertiary colour bg */ $tertiarytext: $primarytext; // Text on tertiary colour bg
@quaternary: desaturate( darken( @tertiary, 45%), 40% ); /* Price slider bg */ $quaternary: desaturate(darken($tertiary, 45%), 40%); // Price slider bg
/* =Custom Font /* =Custom Font
-------------------------------------------------------------- */ -------------------------------------------------------------- */
@ -41,11 +41,11 @@ p.demo_store {
font-size: 1em; font-size: 1em;
padding: .5em 0; padding: .5em 0;
text-align: center; text-align: center;
.vertical_gradient( @primary, darken(@primary, 10) ); @include vertical_gradient( $primary, darken($primary, 10%) );
border: 1px solid darken(@primary, 10); border: 1px solid darken($primary, 10%);
color: @primarytext; color: $primarytext;
z-index: 99998; z-index: 99998;
.inset_box_shadow( 0, 0, 0, 3px, rgba(255,255,255,0.2) ); @include inset_box_shadow( 0, 0, 0, 3px, rgba(255,255,255,0.2) );
} }
.admin-bar { // Styles applied when the admin bar is present .admin-bar { // Styles applied when the admin bar is present
@ -58,13 +58,13 @@ p.demo_store {
-------------------------------------------------------------- */ -------------------------------------------------------------- */
.wc-forward, .wc-forward a { .wc-forward, .wc-forward a {
&:after { &:after {
.iconafter( "\e029" ); @include iconafter( "\e029" );
font-size:.75em; font-size:.75em;
} }
} }
.wc-backward, .wc-backward a { .wc-backward, .wc-backward a {
&:before { &:before {
.iconbefore( "\e02f" ); @include iconbefore( "\e02f" );
font-size:.75em; font-size:.75em;
} }
} }
@ -77,12 +77,12 @@ p.demo_store {
padding: 1em 1em 1em 3.5em !important; padding: 1em 1em 1em 3.5em !important;
margin: 0 0 2em !important; margin: 0 0 2em !important;
position: relative; position: relative;
.border_radius(4px); @include border_radius(4px);
.vertical_gradient( lighten( @secondary, 2 ), @secondary ); @include vertical_gradient( lighten( $secondary, 2% ), $secondary );
color: @secondarytext; color: $secondarytext;
.text_shadow( 0, 1px, 0, lighten( @secondary, 4 ) ); @include text_shadow( 0, 1px, 0, lighten( $secondary, 4% ) );
list-style:none outside !important; list-style:none outside !important;
.clearfix(); @include clearfix();
width: auto; width: auto;
-webkit-box-shadow: -webkit-box-shadow:
inset 0 -2px 6px rgba(0,0,0,0.05), inset 0 -2px 6px rgba(0,0,0,0.05),
@ -110,8 +110,8 @@ p.demo_store {
color: #fff; color: #fff;
text-shadow:0 1px 0 rgba(0,0,0,0.2); text-shadow:0 1px 0 rgba(0,0,0,0.2);
padding-top:1em; padding-top:1em;
.border_radius_bottom(4px); @include border_radius_bottom(4px);
.inset_box_shadow(0,-1px,0,0,rgba(0,0,0,0.1)); @include inset_box_shadow(0,-1px,0,0,rgba(0,0,0,0.1));
} }
.button { .button {
@ -152,20 +152,20 @@ p.demo_store {
small.note { small.note {
display:block; display:block;
color: @subtext; color: $subtext;
font-size: 11px; font-size: 11px;
line-height: 21px; line-height: 21px;
margin-top: 10px; margin-top: 10px;
} }
.woocommerce-breadcrumb{ .woocommerce-breadcrumb{
.clearfix(); @include clearfix();
margin: 0 0 1em; margin: 0 0 1em;
padding: 0; padding: 0;
font-size: 0.92em; font-size: 0.92em;
color: @subtext; color: $subtext;
a { a {
color: @subtext; color: $subtext;
} }
} }
@ -185,14 +185,14 @@ p.demo_store {
/* Price */ /* Price */
span.price, p.price { span.price, p.price {
color: @highlight; color: $highlight;
font-size: 1.25em; font-size: 1.25em;
ins { ins {
background: inherit; background: inherit;
} }
del { del {
font-size: 0.67em; font-size: 0.67em;
color:fade( desaturate( @highlight, 75% ), 50% ); color: rgba(desaturate($highlight, 75%), 0.5);
} }
} }
@ -201,7 +201,7 @@ p.demo_store {
font-size: 0.92em; font-size: 0.92em;
} }
.stock { .stock {
color: @highlight; color: $highlight;
} }
.out-of-stock { .out-of-stock {
color: red; color: red;
@ -214,8 +214,8 @@ p.demo_store {
display:block; display:block;
width: 100%; width: 100%;
height:auto; height:auto;
.box_shadow(0,1px,2px,0,rgba(0,0,0,0.3)); @include box_shadow(0,1px,2px,0,rgba(0,0,0,0.3));
.transition(); @include transition();
} }
div.thumbnails { div.thumbnails {
padding-top: 1em; padding-top: 1em;
@ -258,12 +258,12 @@ p.demo_store {
position: relative; position: relative;
li { li {
border: 1px solid darken( @secondary, 10 ); border: 1px solid darken( $secondary, 10% );
.vertical_gradient( @secondary, darken( @secondary, 10 ) ); @include vertical_gradient( $secondary, darken( $secondary, 10% ) );
display: inline-block; display: inline-block;
position: relative; position: relative;
z-index: 0; z-index: 0;
.border_radius_top(4px); @include border_radius_top(4px);
box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2), inset 0 1px 0 rgba(255,255,255,0.6); box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2), inset 0 1px 0 rgba(255,255,255,0.6);
margin: 0 -5px; margin: 0 -5px;
padding: 0 1em; padding: 0 1em;
@ -272,20 +272,20 @@ p.demo_store {
display: inline-block; display: inline-block;
padding: .5em 0; padding: .5em 0;
font-weight:bold; font-weight:bold;
color: @secondarytext; color: $secondarytext;
.darkorlighttextshadow( @secondarytext ); @include darkorlighttextshadow( $secondarytext );
text-decoration: none; text-decoration: none;
&:hover { &:hover {
text-decoration:none; text-decoration:none;
color: lighten( @secondarytext, 10 ); color: lighten( $secondarytext, 10% );
} }
} }
&.active { &.active {
background: @contentbg; background: $contentbg;
z-index: 2; z-index: 2;
border-bottom-color: @contentbg; border-bottom-color: $contentbg;
a { a {
color: inherit; color: inherit;
@ -293,15 +293,15 @@ p.demo_store {
} }
&:before { &:before {
box-shadow: 2px 2px 0 @contentbg; box-shadow: 2px 2px 0 $contentbg;
} }
&:after { &:after {
box-shadow: -2px 2px 0 @contentbg; box-shadow: -2px 2px 0 $contentbg;
} }
} }
&:before, &:after { &:before, &:after {
border: 1px solid darken( @secondary, 10 ); border: 1px solid darken( $secondary, 10% );
position:absolute; position:absolute;
bottom: -1px; bottom: -1px;
width: 5px; width: 5px;
@ -314,7 +314,7 @@ p.demo_store {
-moz-border-bottom-right-radius: 4px; -moz-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
border-width: 0 1px 1px 0; border-width: 0 1px 1px 0;
box-shadow: 2px 2px 0 darken( @secondary, 10 ); box-shadow: 2px 2px 0 darken( $secondary, 10% );
} }
&:after { &:after {
right: -6px; right: -6px;
@ -322,7 +322,7 @@ p.demo_store {
-moz-border-bottom-left-radius: 4px; -moz-border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
border-width: 0 0 1px 1px; border-width: 0 0 1px 1px;
box-shadow: -2px 2px 0 darken( @secondary, 10 ); box-shadow: -2px 2px 0 darken( $secondary, 10% );
} }
} }
&:before { &:before {
@ -331,7 +331,7 @@ p.demo_store {
width: 100%; width: 100%;
bottom: 0; bottom: 0;
left: 0; left: 0;
border-bottom: 1px solid darken( @secondary, 10 ); border-bottom: 1px solid darken( $secondary, 10% );
z-index: 1; z-index: 1;
} }
} }
@ -344,13 +344,13 @@ p.demo_store {
/* Cart button */ /* Cart button */
p.cart { p.cart {
margin-bottom: 2em; margin-bottom: 2em;
.clearfix(); @include clearfix();
} }
/* add to cart forms */ /* add to cart forms */
form.cart { form.cart {
margin-bottom: 2em; margin-bottom: 2em;
.clearfix(); @include clearfix();
div.quantity { div.quantity {
float:left; float:left;
margin: 0 4px 0 0; margin: 0 4px 0 0;
@ -416,10 +416,10 @@ p.demo_store {
top: 6px; top: 6px;
left: 6px; left: 6px;
margin: 0; margin: 0;
.border_radius(20px); @include border_radius(20px);
.vertical_gradient( lighten( @highlight, 10), @highlight ); @include vertical_gradient( lighten( $highlight, 10%), $highlight );
.text_shadow( 0, -1px, 0, @highlight ); @include text_shadow( 0, -1px, 0, $highlight );
color: @highlightext; color: $highlightext;
-webkit-box-shadow: -webkit-box-shadow:
inset 0 1px 0 rgba(255,255,255,0.3), inset 0 1px 0 rgba(255,255,255,0.3),
inset 0 -1px 0 rgba(0,0,0,0.2), inset 0 -1px 0 rgba(0,0,0,0.2),
@ -442,7 +442,7 @@ p.demo_store {
padding: 0; padding: 0;
list-style:none outside; list-style:none outside;
clear:both; clear:both;
.clearfix(); @include clearfix();
li { li {
list-style:none outside; list-style:none outside;
} }
@ -469,23 +469,23 @@ p.demo_store {
height:auto; height:auto;
display:block; display:block;
margin: 0 0 8px; margin: 0 0 8px;
.box_shadow(0,1px,2px,0,rgba(0,0,0,0.3)); @include box_shadow(0,1px,2px,0,rgba(0,0,0,0.3));
.transition(); @include transition();
} }
a:hover img { a:hover img {
.box_shadow(0,1px,3px,0,rgba(0,0,0,0.4)); @include box_shadow(0,1px,3px,0,rgba(0,0,0,0.4));
} }
strong { strong {
display:block; display:block;
} }
.price { .price {
color: @highlight; color: $highlight;
display: block; display: block;
font-weight: normal; font-weight: normal;
margin-bottom: .5em; margin-bottom: .5em;
del { del {
font-size: 0.67em; font-size: 0.67em;
color:fade( desaturate( @highlight, 75% ), 50% ); color: rgba(desaturate($highlight, 75%), 0.5);
margin: -2px 0 0 0; margin: -2px 0 0 0;
} }
ins { ins {
@ -495,7 +495,7 @@ p.demo_store {
font-size: 0.67em; font-size: 0.67em;
margin: -2px 0 0 0; margin: -2px 0 0 0;
text-transform: uppercase; text-transform: uppercase;
color:fade( desaturate( @highlight, 75% ), 50% ); color: rgba(desaturate($highlight, 75%), 0.5);
} }
} }
} }
@ -517,11 +517,11 @@ p.demo_store {
white-space: nowrap; white-space: nowrap;
padding:0; padding:0;
clear: both; clear: both;
border: 1px solid darken( @secondary, 10 ); border: 1px solid darken( $secondary, 10% );
border-right: 0; border-right: 0;
margin: 1px; margin: 1px;
li { li {
border-right: 1px solid darken( @secondary, 10 ); border-right: 1px solid darken( $secondary, 10% );
padding: 0; padding: 0;
margin: 0; margin: 0;
float: left; float: left;
@ -539,8 +539,8 @@ p.demo_store {
display: block; display: block;
} }
span.current, a:hover, a:focus { span.current, a:hover, a:focus {
background: @secondary; background: $secondary;
color: darken( @secondary, 40 ); color: darken( $secondary, 40% );
} }
} }
} }
@ -561,13 +561,13 @@ p.demo_store {
padding: 6px 10px; padding: 6px 10px;
text-decoration:none; text-decoration:none;
font-weight:bold; font-weight:bold;
.border_radius(2px); @include border_radius(2px);
left: auto; left: auto;
text-shadow:0 1px 0 @secondary + #111; text-shadow:0 1px 0 $secondary + #111;
color: @secondarytext; color: $secondarytext;
.darkorlighttextshadow( @secondarytext ); @include darkorlighttextshadow( $secondarytext );
border: 1px solid darken( @secondary, 20 ); border: 1px solid darken( $secondary, 20% );
.vertical_gradient( @secondary, darken( @secondary, 10 ) ); @include vertical_gradient( $secondary, darken( $secondary, 10% ) );
white-space: nowrap; white-space: nowrap;
display: inline-block; display: inline-block;
@ -585,8 +585,8 @@ p.demo_store {
0 1px 2px rgba(0,0,0,0.1); 0 1px 2px rgba(0,0,0,0.1);
&.loading { &.loading {
color: lighten( @secondarytext, 10 ); color: lighten( $secondarytext, 10% );
border: 1px solid @secondary; border: 1px solid $secondary;
&:before { &:before {
content: ""; content: "";
@ -613,7 +613,7 @@ p.demo_store {
} }
&:hover { &:hover {
.vertical_gradient( @secondary, darken( @secondary, 15 ) ); @include vertical_gradient( $secondary, darken( $secondary, 15% ) );
text-decoration:none; text-decoration:none;
} }
@ -622,24 +622,24 @@ p.demo_store {
} }
&.alt { &.alt {
.vertical_gradient( @primary, darken( @primary, 10 ) ); @include vertical_gradient( $primary, darken( $primary, 10% ) );
border-color: darken(@primary, 20); border-color: darken($primary, 20%);
color: @primarytext; color: $primarytext;
.darkorlighttextshadow( @primarytext, 0.6 ); @include darkorlighttextshadow( $primarytext, 0.6 );
&:hover { &:hover {
.vertical_gradient( @primary, darken( @primary, 15 ) ); @include vertical_gradient( $primary, darken( $primary, 15% ) );
color:@primarytext + #111; color:$primarytext + #111;
.darkorlighttextshadow( @primarytext + #111, 0.6 ); @include darkorlighttextshadow( $primarytext + #111, 0.6 );
} }
} }
&:disabled, &:disabled,
&.disabled { &.disabled {
color: lighten( @secondarytext, 30 ); color: lighten( $secondarytext, 30% );
border: 1px solid darken( @secondary, 10 ); border: 1px solid darken( $secondary, 10% );
background: @secondary; background: $secondary;
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
@ -678,12 +678,12 @@ p.demo_store {
padding: 0; padding: 0;
margin: 0; margin: 0;
text-align: center; text-align: center;
border: 1px solid darken( @secondary, 20 ); border: 1px solid darken( $secondary, 20% );
border-right: 0; border-right: 0;
.border_radius_right(0); @include border_radius_right(0);
.inset_box_shadow( 0, 0, 2px, 0, @secondary ); @include inset_box_shadow( 0, 0, 2px, 0, $secondary );
font-weight:bold; font-weight:bold;
.border_radius_left(2px); @include border_radius_left(2px);
-moz-appearance: textfield; /* Hide buttons for Firefox 29 and later */ -moz-appearance: textfield; /* Hide buttons for Firefox 29 and later */
} }
@ -708,12 +708,12 @@ p.demo_store {
cursor: pointer; cursor: pointer;
line-height: 13px; line-height: 13px;
font-size: 12px; font-size: 12px;
.border_radius(2px); @include border_radius(2px);
color: @secondarytext; color: $secondarytext;
.darkorlighttextshadow( @secondarytext ); @include darkorlighttextshadow( $secondarytext );
border: 1px solid darken( @secondary, 20 ); border: 1px solid darken( $secondary, 20% );
.vertical_gradient( @secondary, darken( @secondary, 10 ) ); @include vertical_gradient( $secondary, darken( $secondary, 10% ) );
-webkit-box-shadow: -webkit-box-shadow:
inset 0 -1px 0 rgba(0,0,0,0.075), inset 0 -1px 0 rgba(0,0,0,0.075),
@ -729,7 +729,7 @@ p.demo_store {
0 1px 2px rgba(0,0,0,0.1); 0 1px 2px rgba(0,0,0,0.1);
&:hover { &:hover {
.vertical_gradient( @secondary, darken( @secondary, 15 ) ); @include vertical_gradient( $secondary, darken( $secondary, 15% ) );
} }
} }
@ -737,13 +737,13 @@ p.demo_store {
top: 0; top: 0;
right: 0; right: 0;
border-bottom: 0; border-bottom: 0;
.border_radius_bottom(0); @include border_radius_bottom(0);
} }
.minus { .minus {
bottom: 0; bottom: 0;
right: 0; right: 0;
.border_radius_top(0); @include border_radius_top(0);
} }
} }
@ -752,13 +752,13 @@ p.demo_store {
#reviews { #reviews {
h2 small { h2 small {
float: right; float: right;
color: @subtext; color: $subtext;
font-size: 15px; font-size: 15px;
line-height: 21px; line-height: 21px;
margin: 10px 0 0 0; margin: 10px 0 0 0;
a { a {
text-decoration:none; text-decoration:none;
color: @subtext; color: $subtext;
} }
} }
h3 { h3 {
@ -774,13 +774,13 @@ p.demo_store {
} }
#comments { #comments {
.add_review { .add_review {
.clearfix(); @include clearfix();
} }
h2 { h2 {
clear:none; clear:none;
} }
ol.commentlist { ol.commentlist {
.clearfix(); @include clearfix();
margin: 0; margin: 0;
width: 100%; width: 100%;
background:none; background:none;
@ -793,7 +793,7 @@ p.demo_store {
background: 0; background: 0;
border: 0; border: 0;
.meta { .meta {
color: @subtext; color: $subtext;
font-size: 0.75em; font-size: 0.75em;
} }
img.avatar { img.avatar {
@ -804,17 +804,17 @@ p.demo_store {
padding: 3px; padding: 3px;
width: 32px; width: 32px;
height:auto; height:auto;
background: @secondary; background: $secondary;
border: 1px solid darken( @secondary, 3 ); border: 1px solid darken( $secondary, 3% );
margin: 0; margin: 0;
line-height: 1; line-height: 1;
} }
.comment-text { .comment-text {
margin: 0 0 0 50px; margin: 0 0 0 50px;
border: 1px solid darken( @secondary, 3 ); border: 1px solid darken( $secondary, 3% );
.border_radius(4px); @include border_radius(4px);
padding: 1em 1em 0; padding: 1em 1em 0;
.clearfix(); @include clearfix();
p { p {
margin: 0 0 1em; margin: 0 0 1em;
} }
@ -832,8 +832,8 @@ p.demo_store {
} }
} }
#respond { #respond {
border: 1px solid darken( @secondary, 3 ); border: 1px solid darken( $secondary, 3% );
.border_radius(4px); @include border_radius(4px);
padding: 1em 1em 0; padding: 1em 1em 0;
margin: 20px 0 0 50px; margin: 20px 0 0 50px;
} }
@ -856,7 +856,7 @@ p.demo_store {
font-family: 'star'; font-family: 'star';
&:before { &:before {
content: "\73\73\73\73\73"; content: "\73\73\73\73\73";
color: darken( @secondary, 10 ); color: darken( $secondary, 10% );
float: left; float: left;
top: 0; top: 0;
left: 0; left: 0;
@ -904,7 +904,7 @@ p.demo_store {
#review_form { #review_form {
#respond { #respond {
.clearfix(); @include clearfix();
position: static; position: static;
margin: 0; margin: 0;
width: auto; width: auto;
@ -1069,7 +1069,7 @@ p.demo_store {
text-align:left; text-align:left;
width: 100%; width: 100%;
border-collapse: separate; border-collapse: separate;
.border_radius(5px); @include border_radius(5px);
th { th {
font-weight:bold; font-weight:bold;
line-height: 18px; line-height: 18px;
@ -1109,7 +1109,7 @@ p.demo_store {
td.product-name { td.product-name {
dl.variation { dl.variation {
margin: .25em 0; margin: .25em 0;
.clearfix; @include clearfix();
dt, dd { dt, dd {
display: inline-block; display: inline-block;
@ -1158,7 +1158,7 @@ p.demo_store {
width:1em; width:1em;
text-align: center; text-align: center;
line-height: 1; line-height: 1;
.border_radius(100%); @include border_radius(100%);
color: red; color: red;
text-decoration: none; text-decoration: none;
font-weight: bold; font-weight: bold;
@ -1175,9 +1175,9 @@ p.demo_store {
-moz-box-sizing:border-box; -moz-box-sizing:border-box;
box-sizing:border-box; box-sizing:border-box;
.inset_box_shadow(0, 1px, 4px, 0, rgba(0,0,0,0.1)); @include inset_box_shadow(0, 1px, 4px, 0, rgba(0,0,0,0.1));
border: 1px solid darken( @secondary, 10 ); border: 1px solid darken( $secondary, 10% );
padding: 6px 6px 5px; padding: 6px 6px 5px;
margin: 0 4px 0 0; margin: 0 4px 0 0;
outline: 0; outline: 0;
@ -1203,7 +1203,7 @@ p.demo_store {
li { li {
padding: 4px 0; padding: 4px 0;
margin: 0; margin: 0;
.clearfix; @include clearfix();
list-style:none; list-style:none;
a { a {
display:block; display:block;
@ -1214,13 +1214,13 @@ p.demo_store {
margin-left: 4px; margin-left: 4px;
width: 32px; width: 32px;
height:auto; height:auto;
.box_shadow(0,1px,2px,0,rgba(0,0,0,0.3)); @include box_shadow(0,1px,2px,0,rgba(0,0,0,0.3));
} }
dl { dl {
margin: 0; margin: 0;
padding-left: 1em; padding-left: 1em;
border-left: 2px solid rgba(0,0,0,0.1); border-left: 2px solid rgba(0,0,0,0.1);
.clearfix; @include clearfix();
dt, dd { dt, dd {
display: inline-block; display: inline-block;
@ -1248,7 +1248,7 @@ p.demo_store {
&.widget_shopping_cart, .widget_shopping_cart { &.widget_shopping_cart, .widget_shopping_cart {
.total { .total {
border-top: 3px double @secondary; border-top: 3px double $secondary;
padding: 4px 0 0; padding: 4px 0 0;
strong { strong {
min-width: 40px; min-width: 40px;
@ -1256,7 +1256,7 @@ p.demo_store {
} }
} }
.buttons { .buttons {
.clearfix; @include clearfix();
} }
} }
@ -1273,7 +1273,7 @@ p.demo_store {
} }
.shipping-calculator-button { .shipping-calculator-button {
&:after { &:after {
.iconafter( "\e02e" ); @include iconafter( "\e02e" );
} }
} }
} }
@ -1281,13 +1281,13 @@ p.demo_store {
p { p {
margin: 0; margin: 0;
small { small {
color: @subtext; color: $subtext;
font-size: 0.83em; font-size: 0.83em;
} }
} }
table { table {
border-collapse: separate; border-collapse: separate;
.border_radius(5px); @include border_radius(5px);
margin: 0 0 6px; margin: 0 0 6px;
padding: 0; padding: 0;
tr:first-child { tr:first-child {
@ -1307,17 +1307,17 @@ p.demo_store {
} }
small { small {
display:block; display:block;
color: @subtext; color: $subtext;
} }
select { select {
width: 100%; width: 100%;
} }
} }
.discount td { .discount td {
color: @highlight; color: $highlight;
} }
tr td, tr th { tr td, tr th {
border-top: 1px solid @secondary; border-top: 1px solid $secondary;
} }
a.button.alt { a.button.alt {
display: inline-block; display: inline-block;
@ -1371,7 +1371,7 @@ p.demo_store {
vertical-align: middle; vertical-align: middle;
} }
input.input-text, textarea { input.input-text, textarea {
.borderbox; @include borderbox();
width: 100%; width: 100%;
margin: 0; margin: 0;
outline: 0; outline: 0;
@ -1403,11 +1403,11 @@ p.demo_store {
} }
form.login, form.checkout_coupon, form.register { form.login, form.checkout_coupon, form.register {
border: 1px solid darken( @secondary, 10 ); border: 1px solid darken( $secondary, 10% );
padding: 20px; padding: 20px;
margin: 2em 0 2em 0px; margin: 2em 0 2em 0px;
text-align:left; text-align:left;
.border_radius(5px); @include border_radius(5px);
} }
ul#shipping_method { ul#shipping_method {
@ -1448,7 +1448,7 @@ p.demo_store {
} }
.create-account small { .create-account small {
font-size: 11px; font-size: 11px;
color: @subtext; color: $subtext;
line-height: 13px; line-height: 13px;
font-weight:normal; font-weight:normal;
} }
@ -1464,14 +1464,14 @@ p.demo_store {
/* Payment box - appears on checkout and page page */ /* Payment box - appears on checkout and page page */
#payment { #payment {
background: @secondary; background: $secondary;
.border_radius(5px); @include border_radius(5px);
ul.payment_methods { ul.payment_methods {
.clearfix; @include clearfix();
text-align:left; text-align:left;
padding: 1em; padding: 1em;
border-bottom: 1px solid darken( @secondary, 10 ); border-bottom: 1px solid darken( $secondary, 10% );
margin: 0; margin: 0;
list-style:none outside; list-style:none outside;
li { li {
@ -1497,7 +1497,7 @@ p.demo_store {
div.form-row { div.form-row {
padding: 1em; padding: 1em;
border-top: 1px solid lighten( @secondary, 5 ); border-top: 1px solid lighten( $secondary, 5% );
} }
div.payment_box { div.payment_box {
position: relative; position: relative;
@ -1505,26 +1505,26 @@ p.demo_store {
padding: 1em 2%; padding: 1em 2%;
margin: 1em 0 1em 0; margin: 1em 0 1em 0;
font-size: 0.92em; font-size: 0.92em;
.border_radius(2px); @include border_radius(2px);
line-height: 1.5em; line-height: 1.5em;
.vertical_gradient( darken( @secondary, 5 ), darken( @secondary, 10 ) ); @include vertical_gradient( darken( $secondary, 5% ), darken( $secondary, 10% ) );
.box_shadow(0,1px,2px,0,rgba(0,0,0,0.25)); @include box_shadow(0,1px,2px,0,rgba(0,0,0,0.25));
color: @secondarytext; color: $secondarytext;
.darkorlighttextshadow( @secondarytext ); @include darkorlighttextshadow( $secondarytext );
input.input-text, textarea { input.input-text, textarea {
border-color: darken( @secondary, 15 ); border-color: darken( $secondary, 15% );
border-top-color: darken( @secondary, 20 ); border-top-color: darken( $secondary, 20% );
.box_shadow( 0, 1px, 0, 0, rgba( 255,255,255,0.4 ) ); @include box_shadow( 0, 1px, 0, 0, rgba( 255,255,255,0.4 ) );
} }
::-webkit-input-placeholder { ::-webkit-input-placeholder {
color: darken( @secondary, 20 ); color: darken( $secondary, 20% );
} }
:-moz-placeholder { :-moz-placeholder {
color: darken( @secondary, 20 ); color: darken( $secondary, 20% );
} }
:-ms-input-placeholder { :-ms-input-placeholder {
color: darken( @secondary, 20 ); color: darken( $secondary, 20% );
} }
.wc-credit-card-form-card-number, .wc-credit-card-form-card-number,
.wc-credit-card-form-card-expiry, .wc-credit-card-form-card-expiry,
@ -1561,7 +1561,7 @@ p.demo_store {
} }
span.help { span.help {
font-size: 11px; font-size: 11px;
color: @subtext; color: $subtext;
line-height: 13px; line-height: 13px;
font-weight:normal; font-weight:normal;
} }
@ -1574,7 +1574,7 @@ p.demo_store {
&:after { &:after {
content: ""; content: "";
display:block; display:block;
border: 8px solid darken( @secondary, 5 ); /* arrow size / color */ border: 8px solid darken( $secondary, 5% ); /* arrow size / color */
border-right-color: transparent; border-right-color: transparent;
border-left-color: transparent; border-left-color: transparent;
border-top-color: transparent; border-top-color: transparent;
@ -1584,13 +1584,24 @@ p.demo_store {
margin: -1em 0 0 2em; margin: -1em 0 0 2em;
} }
} }
.payment_method_paypal {
.about_paypal {
float: right;
line-height: 52px;
font-size: 0.83em;
}
img {
max-height: 52px;
vertical-align: middle;
}
}
} }
/* =Order Page /* =Order Page
-------------------------------------------------------------- */ -------------------------------------------------------------- */
.order_details { .order_details {
.clearfix(); @include clearfix();
margin: 0 0 1.5em; margin: 0 0 1.5em;
list-style:none; list-style:none;
@ -1600,7 +1611,7 @@ p.demo_store {
text-transform: uppercase; text-transform: uppercase;
font-size: 0.715em; font-size: 0.715em;
line-height: 1em; line-height: 1em;
border-right: 1px dashed darken( @secondary, 10 ); border-right: 1px dashed darken( $secondary, 10% );
padding-right: 2em; padding-right: 2em;
strong { strong {
@ -1621,7 +1632,7 @@ p.demo_store {
.addresses { .addresses {
.title { .title {
.clearfix(); @include clearfix();
h3 { h3 {
float:left; float:left;
@ -1654,7 +1665,7 @@ p.demo_store {
margin-left: 0; margin-left: 0;
padding-left: 0; padding-left: 0;
&:before { &:before {
.iconbefore( "\e00a" ); @include iconbefore( "\e00a" );
} }
.count { .count {
float: right; float: right;
@ -1672,7 +1683,7 @@ p.demo_store {
border: 0; border: 0;
list-style:none outside; list-style:none outside;
li { li {
.clearfix(); @include clearfix();
padding: 0 0 1px; padding: 0 0 1px;
list-style:none; list-style:none;
a, span { a, span {
@ -1684,13 +1695,13 @@ p.demo_store {
a { a {
padding:0 6px; padding:0 6px;
text-decoration: none; text-decoration: none;
border: 1px solid @tertiary; border: 1px solid $tertiary;
background: @tertiary; background: $tertiary;
.inset_box_shadow(0, 1px, 1px, rgba(255,255,255,0.5)); @include inset_box_shadow(0, 1px, 1px, rgba(255,255,255,0.5));
color: @tertiarytext; color: $tertiarytext;
.border_radius(3px); @include border_radius(3px);
&:before { &:before {
.iconbefore( "\e013" ); @include iconbefore( "\e013" );
} }
} }
} }
@ -1699,7 +1710,7 @@ p.demo_store {
margin-left: 6px; margin-left: 6px;
font-size: 1em; font-size: 1em;
padding: 1px 0; padding: 1px 0;
color: @subtext; color: $subtext;
} }
} }
} }
@ -1719,14 +1730,14 @@ p.demo_store {
a { a {
padding:0 6px; padding:0 6px;
text-decoration: none; text-decoration: none;
border: 1px solid @tertiary; border: 1px solid $tertiary;
background: @tertiary; background: $tertiary;
.inset_box_shadow(0, 1px, 1px, rgba(255,255,255,0.5)); @include inset_box_shadow(0, 1px, 1px, rgba(255,255,255,0.5));
color: @tertiarytext; color: $tertiarytext;
.border_radius(3px); @include border_radius(3px);
float: left; float: left;
&:before { &:before {
.iconbefore( "\e013" ); @include iconbefore( "\e013" );
} }
} }
} }
@ -1760,10 +1771,10 @@ p.demo_store {
z-index: 2; z-index: 2;
width: 0.9em; width: 0.9em;
height: 0.9em; height: 0.9em;
.border_radius(1em); @include border_radius(1em);
border: 1px solid darken( @tertiary, 50 ); border: 1px solid darken( $tertiary, 50% );
cursor: pointer; cursor: pointer;
.vertical_gradient( @tertiary, darken( @tertiary, 10 )); @include vertical_gradient( $tertiary, darken( $tertiary, 10% ));
outline:none; outline:none;
top: -.3em; top: -.3em;
-webkit-box-shadow: -webkit-box-shadow:
@ -1786,13 +1797,13 @@ p.demo_store {
font-size: .7em; font-size: .7em;
display:block; display:block;
border: 0; border: 0;
background: @tertiary url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAADCAYAAABS3WWCAAAAFUlEQVQIHWP4//9/PRMDA8NzEPEMADLLBU76a5idAAAAAElFTkSuQmCC) top repeat-x; /* transparent png */ background: $tertiary url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAADCAYAAABS3WWCAAAAFUlEQVQIHWP4//9/PRMDA8NzEPEMADLLBU76a5idAAAAAElFTkSuQmCC) top repeat-x; /* transparent png */
.inset_box_shadow(0,0,0,1px,rgba(0,0,0,0.5)); @include inset_box_shadow(0,0,0,1px,rgba(0,0,0,0.5));
.border_radius(1em); @include border_radius(1em);
} }
.price_slider_wrapper .ui-widget-content { .price_slider_wrapper .ui-widget-content {
.border_radius(1em); @include border_radius(1em);
.vertical_gradient( @quaternary, lighten( @quaternary, 30 ) ); @include vertical_gradient( $quaternary, lighten( $quaternary, 30% ) );
} }
.ui-slider-horizontal { .ui-slider-horizontal {
height: .5em; height: .5em;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 416 B

View File

@ -250,7 +250,13 @@ jQuery( function ( $ ) {
edit_field = 'variable_sale_price'; edit_field = 'variable_sale_price';
} }
value = window.prompt( woocommerce_admin_meta_boxes_variations.i18n_enter_a_value_fixed_or_percent ).toString(); value = window.prompt( woocommerce_admin_meta_boxes_variations.i18n_enter_a_value_fixed_or_percent );
if ( value == null ) {
return;
} else {
value = value.toString();
}
$( ':input[name^="' + edit_field + '"]' ).each( function() { $( ':input[name^="' + edit_field + '"]' ).each( function() {
var current_value = accounting.unformat( $( this ).val(), woocommerce_admin.mon_decimal_point ), var current_value = accounting.unformat( $( this ).val(), woocommerce_admin.mon_decimal_point ),
@ -288,7 +294,9 @@ jQuery( function ( $ ) {
case 'variable_download_expiry' : case 'variable_download_expiry' :
value = window.prompt( woocommerce_admin_meta_boxes_variations.i18n_enter_a_value ); value = window.prompt( woocommerce_admin_meta_boxes_variations.i18n_enter_a_value );
if ( value != null ) {
$( ':input[name^="' + bulk_edit + '"]').not('[name*="dates"]').val( value ).change(); $( ':input[name^="' + bulk_edit + '"]').not('[name*="dates"]').val( value ).change();
}
break; break;
default: default:
$( 'select#field_to_edit' ).trigger( bulk_edit ); $( 'select#field_to_edit' ).trigger( bulk_edit );

File diff suppressed because one or more lines are too long

View File

@ -243,7 +243,10 @@
current_attr_select.find( 'option:gt(0)' ).remove(); current_attr_select.find( 'option:gt(0)' ).remove();
current_attr_select.append( current_attr_select.data( 'attribute_options' ) ); current_attr_select.append( current_attr_select.data( 'attribute_options' ) );
current_attr_select.find( 'option:gt(0)' ).removeClass( 'active' ); current_attr_select.find( 'option:gt(0)' ).removeClass( 'attached' );
current_attr_select.find( 'option:gt(0)' ).removeClass( 'enabled' );
current_attr_select.find( 'option:gt(0)' ).removeAttr( 'disabled' );
// Get name // Get name
var current_attr_name = current_attr_select.attr( 'name' ); var current_attr_name = current_attr_select.attr( 'name' );
@ -261,6 +264,11 @@
if ( attr_name == current_attr_name ) { if ( attr_name == current_attr_name ) {
if ( variations[ num ].variation_is_active )
variation_active = 'enabled';
else
variation_active = '';
if ( attr_val ) { if ( attr_val ) {
// Decode entities // Decode entities
@ -271,11 +279,11 @@
attr_val = attr_val.replace( /"/g, "\\\"" ); attr_val = attr_val.replace( /"/g, "\\\"" );
// Compare the meerkat // Compare the meerkat
current_attr_select.find( 'option[value="' + attr_val + '"]' ).addClass( 'active' ); current_attr_select.find( 'option[value="' + attr_val + '"]' ).addClass( 'attached ' + variation_active );
} else { } else {
current_attr_select.find( 'option:gt(0)' ).addClass( 'active' ); current_attr_select.find( 'option:gt(0)' ).addClass( 'attached ' + variation_active );
} }
} }
@ -284,8 +292,11 @@
} }
} }
// Detach inactive // Detach unattached
current_attr_select.find( 'option:gt(0):not(.active)' ).remove(); current_attr_select.find( 'option:gt(0):not(.attached)' ).remove();
// Grey out disabled
current_attr_select.find( 'option:gt(0):not(.enabled)' ).attr( 'disabled', 'disabled' );
}); });

File diff suppressed because one or more lines are too long

View File

@ -10,7 +10,9 @@
* @version 2.2.0 * @version 2.2.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
return array( return array(
'AF' => __( 'Afghanistan', 'woocommerce' ), 'AF' => __( 'Afghanistan', 'woocommerce' ),

9
i18n/languages/README.md Normal file
View File

@ -0,0 +1,9 @@
# WARNING! DO NOT PUT CUSTOM TRANSLATIONS HERE!
WooCommerce will delete all custom translations placed in this directory.
## Translating WooCommerce
Put your custom WooCommerce translations in your WordPress language directory, located at: WP_LANG_DIR . "/woocommerce/{$textdomain}-{$locale}.mo";
## Contributing your translating to WooCommerce
If you want to help translate WooCommerce, please visit our [translation page](https://www.transifex.com/projects/p/woocommerce/).

View File

@ -2,9 +2,9 @@
# This file is distributed under the same license as the WooCommerce package. # This file is distributed under the same license as the WooCommerce package.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WooCommerce 2.2.3 Admin\n" "Project-Id-Version: WooCommerce 2.2.4 Admin\n"
"Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n" "Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n"
"POT-Creation-Date: 2014-09-16 12:34:12+00:00\n" "POT-Creation-Date: 2014-09-18 12:40:25+00:00\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
@ -1270,10 +1270,10 @@ msgstr ""
#: includes/admin/class-wc-admin-post-types.php:1982 #: includes/admin/class-wc-admin-post-types.php:1982
#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:177 #: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:177
#: includes/admin/meta-boxes/views/html-order-items.php:234 #: includes/admin/meta-boxes/views/html-order-items.php:236
#: includes/admin/meta-boxes/views/html-order-items.php:273 #: includes/admin/meta-boxes/views/html-order-items.php:275
#: includes/admin/meta-boxes/views/html-order-items.php:293 #: includes/admin/meta-boxes/views/html-order-items.php:295
#: includes/admin/meta-boxes/views/html-order-items.php:348 #: includes/admin/meta-boxes/views/html-order-items.php:350
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
@ -2079,7 +2079,7 @@ msgstr ""
#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:101 #: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:101
#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:608 #: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:608
#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:628 #: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:628
#: includes/admin/meta-boxes/views/html-order-items.php:288 #: includes/admin/meta-boxes/views/html-order-items.php:290
#: includes/admin/reports/class-wc-report-sales-by-product.php:181 #: includes/admin/reports/class-wc-report-sales-by-product.php:181
msgid "Search for a product&hellip;" msgid "Search for a product&hellip;"
msgstr "" msgstr ""
@ -2377,8 +2377,8 @@ msgstr ""
#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:74 #: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:74
#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:584 #: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:584
#: includes/admin/meta-boxes/views/html-order-items.php:294 #: includes/admin/meta-boxes/views/html-order-items.php:296
#: includes/admin/meta-boxes/views/html-order-items.php:349 #: includes/admin/meta-boxes/views/html-order-items.php:351
msgid "Add" msgid "Add"
msgstr "" msgstr ""
@ -3037,93 +3037,101 @@ msgstr ""
msgid "Add line item(s)" msgid "Add line item(s)"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:219 #: includes/admin/meta-boxes/views/html-order-items.php:218
msgid "To edit this order change the status back to \"Pending\""
msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:218
msgid "This order has been paid for and is no longer editable"
msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:221
msgid "Add Tax" msgid "Add Tax"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:222 #: includes/admin/meta-boxes/views/html-order-items.php:224
#: includes/admin/meta-boxes/views/html-order-refund.php:14 #: includes/admin/meta-boxes/views/html-order-refund.php:14
msgid "Refund" msgid "Refund"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:225 #: includes/admin/meta-boxes/views/html-order-items.php:227
msgid "Calculate Taxes" msgid "Calculate Taxes"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:226 #: includes/admin/meta-boxes/views/html-order-items.php:228
msgid "Calculate Total" msgid "Calculate Total"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:231 #: includes/admin/meta-boxes/views/html-order-items.php:233
msgid "Add product(s)" msgid "Add product(s)"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:232 #: includes/admin/meta-boxes/views/html-order-items.php:234
msgid "Add fee" msgid "Add fee"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:233 #: includes/admin/meta-boxes/views/html-order-items.php:235
msgid "Add shipping cost" msgid "Add shipping cost"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:235 #: includes/admin/meta-boxes/views/html-order-items.php:237
msgid "Save" msgid "Save"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:241 #: includes/admin/meta-boxes/views/html-order-items.php:243
msgid "Restock refunded items" msgid "Restock refunded items"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:245 #: includes/admin/meta-boxes/views/html-order-items.php:247
msgid "Amount already refunded" msgid "Amount already refunded"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:249 #: includes/admin/meta-boxes/views/html-order-items.php:251
msgid "Total available to refund" msgid "Total available to refund"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:253 #: includes/admin/meta-boxes/views/html-order-items.php:255
msgid "Refund amount" msgid "Refund amount"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:260 #: includes/admin/meta-boxes/views/html-order-items.php:262
msgid "Reason for refund (optional)" msgid "Reason for refund (optional)"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:272 #: includes/admin/meta-boxes/views/html-order-items.php:274
msgid "Refund manually" msgid "Refund manually"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:284 #: includes/admin/meta-boxes/views/html-order-items.php:286
msgid "Add products" msgid "Add products"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:308 #: includes/admin/meta-boxes/views/html-order-items.php:310
msgid "Add tax" msgid "Add tax"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:316 #: includes/admin/meta-boxes/views/html-order-items.php:318
msgid "Rate name" msgid "Rate name"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:317 #: includes/admin/meta-boxes/views/html-order-items.php:319
msgid "Tax class" msgid "Tax class"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:318 #: includes/admin/meta-boxes/views/html-order-items.php:320
msgid "Rate code" msgid "Rate code"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:319 #: includes/admin/meta-boxes/views/html-order-items.php:321
#: includes/admin/settings/class-wc-settings-tax.php:392 #: includes/admin/settings/class-wc-settings-tax.php:392
msgid "Rate %" msgid "Rate %"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:340 #: includes/admin/meta-boxes/views/html-order-items.php:342
msgid "Or, enter tax rate ID:" msgid "Or, enter tax rate ID:"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:341 #: includes/admin/meta-boxes/views/html-order-items.php:343
msgid "Optional" msgid "Optional"
msgstr "" msgstr ""
@ -3616,7 +3624,7 @@ msgid "This is the total tax for the rate (shipping tax + product tax)."
msgstr "" msgstr ""
#: includes/admin/reports/class-wc-report-taxes-by-code.php:182 #: includes/admin/reports/class-wc-report-taxes-by-code.php:182
#: includes/admin/reports/class-wc-report-taxes-by-date.php:163 #: includes/admin/reports/class-wc-report-taxes-by-date.php:164
msgid "No taxes found in this period" msgid "No taxes found in this period"
msgstr "" msgstr ""
@ -3652,7 +3660,7 @@ msgstr ""
msgid "Total sales minus shipping and tax." msgid "Total sales minus shipping and tax."
msgstr "" msgstr ""
#: includes/admin/reports/class-wc-report-taxes-by-date.php:152 #: includes/admin/reports/class-wc-report-taxes-by-date.php:153
msgid "Totals" msgid "Totals"
msgstr "" msgstr ""
@ -5560,7 +5568,7 @@ msgctxt "Tax status"
msgid "None" msgid "None"
msgstr "" msgstr ""
#: includes/admin/meta-boxes/views/html-order-items.php:270 #: includes/admin/meta-boxes/views/html-order-items.php:272
msgctxt "Refund $amount" msgctxt "Refund $amount"
msgid "Refund %s via %s" msgid "Refund %s via %s"
msgstr "" msgstr ""

View File

@ -2,9 +2,9 @@
# This file is distributed under the same license as the WooCommerce package. # This file is distributed under the same license as the WooCommerce package.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WooCommerce 2.2.3 Frontend\n" "Project-Id-Version: WooCommerce 2.2.4 Frontend\n"
"Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n" "Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n"
"POT-Creation-Date: 2014-09-16 12:34:12+00:00\n" "POT-Creation-Date: 2014-09-18 12:40:24+00:00\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
@ -1413,7 +1413,7 @@ msgstr ""
msgid "Cear&aacute;" msgid "Cear&aacute;"
msgstr "" msgstr ""
#: i18n/states/BR.php:19 #: i18n/states/BR.php:19 i18n/states/MX.php:13
msgid "Distrito Federal" msgid "Distrito Federal"
msgstr "" msgstr ""
@ -3005,6 +3005,130 @@ msgstr ""
msgid "Okinawa" msgid "Okinawa"
msgstr "" msgstr ""
#: i18n/states/MX.php:14
msgid "Jalisco"
msgstr ""
#: i18n/states/MX.php:15
msgid "Nuevo León"
msgstr ""
#: i18n/states/MX.php:16
msgid "Aguascalientes"
msgstr ""
#: i18n/states/MX.php:17
msgid "Baja California Norte"
msgstr ""
#: i18n/states/MX.php:18
msgid "Baja California Sur"
msgstr ""
#: i18n/states/MX.php:19
msgid "Campeche"
msgstr ""
#: i18n/states/MX.php:20
msgid "Chiapas"
msgstr ""
#: i18n/states/MX.php:21
msgid "Chihuahua"
msgstr ""
#: i18n/states/MX.php:22
msgid "Coahuila"
msgstr ""
#: i18n/states/MX.php:23
msgid "Colima"
msgstr ""
#: i18n/states/MX.php:24
msgid "Durango"
msgstr ""
#: i18n/states/MX.php:25
msgid "Guanajuato"
msgstr ""
#: i18n/states/MX.php:26
msgid "Guerrero"
msgstr ""
#: i18n/states/MX.php:27
msgid "Hidalgo"
msgstr ""
#: i18n/states/MX.php:28
msgid "Edo. de México"
msgstr ""
#: i18n/states/MX.php:29
msgid "Michoacán"
msgstr ""
#: i18n/states/MX.php:30
msgid "Morelos"
msgstr ""
#: i18n/states/MX.php:31
msgid "Nayarit"
msgstr ""
#: i18n/states/MX.php:32
msgid "Oaxaca"
msgstr ""
#: i18n/states/MX.php:33
msgid "Puebla"
msgstr ""
#: i18n/states/MX.php:34
msgid "Querétaro"
msgstr ""
#: i18n/states/MX.php:35
msgid "Quintana Roo"
msgstr ""
#: i18n/states/MX.php:36
msgid "San Luis Potosí"
msgstr ""
#: i18n/states/MX.php:37
msgid "Sinaloa"
msgstr ""
#: i18n/states/MX.php:38
msgid "Sonora"
msgstr ""
#: i18n/states/MX.php:39
msgid "Tabasco"
msgstr ""
#: i18n/states/MX.php:40
msgid "Tamaulipas"
msgstr ""
#: i18n/states/MX.php:41
msgid "Tlaxcala"
msgstr ""
#: i18n/states/MX.php:42
msgid "Veracruz"
msgstr ""
#: i18n/states/MX.php:43
msgid "Yucatán"
msgstr ""
#: i18n/states/MX.php:44
msgid "Zacatecas"
msgstr ""
#: i18n/states/MY.php:13 #: i18n/states/MY.php:13
msgid "Johor" msgid "Johor"
msgstr "" msgstr ""
@ -3069,6 +3193,306 @@ msgstr ""
msgid "W.P. Putrajaya" msgid "W.P. Putrajaya"
msgstr "" msgstr ""
#: i18n/states/NP.php:15
msgid "Illam"
msgstr ""
#: i18n/states/NP.php:16
msgid "Jhapa"
msgstr ""
#: i18n/states/NP.php:17
msgid "Panchthar"
msgstr ""
#: i18n/states/NP.php:18
msgid "Taplejung"
msgstr ""
#: i18n/states/NP.php:21
msgid "Bhojpur"
msgstr ""
#: i18n/states/NP.php:22
msgid "Dhankuta"
msgstr ""
#: i18n/states/NP.php:23
msgid "Morang"
msgstr ""
#: i18n/states/NP.php:24
msgid "Sunsari"
msgstr ""
#: i18n/states/NP.php:25
msgid "Sankhuwa"
msgstr ""
#: i18n/states/NP.php:26
msgid "Terhathum"
msgstr ""
#: i18n/states/NP.php:29
msgid "Khotang"
msgstr ""
#: i18n/states/NP.php:30
msgid "Okhaldhunga"
msgstr ""
#: i18n/states/NP.php:31
msgid "Saptari"
msgstr ""
#: i18n/states/NP.php:32
msgid "Siraha"
msgstr ""
#: i18n/states/NP.php:33
msgid "Solukhumbu"
msgstr ""
#: i18n/states/NP.php:34
msgid "Udayapur"
msgstr ""
#: i18n/states/NP.php:37
msgid "Dhanusa"
msgstr ""
#: i18n/states/NP.php:38
msgid "Dolakha"
msgstr ""
#: i18n/states/NP.php:39
msgid "Mohottari"
msgstr ""
#: i18n/states/NP.php:40
msgid "Ramechha"
msgstr ""
#: i18n/states/NP.php:41
msgid "Sarlahi"
msgstr ""
#: i18n/states/NP.php:42
msgid "Sindhuli"
msgstr ""
#: i18n/states/NP.php:45
msgid "Bhaktapur"
msgstr ""
#: i18n/states/NP.php:46
msgid "Dhading"
msgstr ""
#: i18n/states/NP.php:47
msgid "Kathmandu"
msgstr ""
#: i18n/states/NP.php:48
msgid "Kavrepalanchowk"
msgstr ""
#: i18n/states/NP.php:49
msgid "Lalitpur"
msgstr ""
#: i18n/states/NP.php:50
msgid "Nuwakot"
msgstr ""
#: i18n/states/NP.php:51
msgid "Rasuwa"
msgstr ""
#: i18n/states/NP.php:52
msgid "Sindhupalchowk"
msgstr ""
#: i18n/states/NP.php:55
msgid "Bara"
msgstr ""
#: i18n/states/NP.php:56
msgid "Chitwan"
msgstr ""
#: i18n/states/NP.php:57
msgid "Makwanpur"
msgstr ""
#: i18n/states/NP.php:58
msgid "Parsa"
msgstr ""
#: i18n/states/NP.php:59
msgid "Rautahat"
msgstr ""
#: i18n/states/NP.php:62
msgid "Gorkha"
msgstr ""
#: i18n/states/NP.php:63
msgid "Kaski"
msgstr ""
#: i18n/states/NP.php:64
msgid "Lamjung"
msgstr ""
#: i18n/states/NP.php:65
msgid "Manang"
msgstr ""
#: i18n/states/NP.php:66
msgid "Syangja"
msgstr ""
#: i18n/states/NP.php:67
msgid "Tanahun"
msgstr ""
#: i18n/states/NP.php:70
msgid "Baglung"
msgstr ""
#: i18n/states/NP.php:71
msgid "Parbat"
msgstr ""
#: i18n/states/NP.php:72
msgid "Mustang"
msgstr ""
#: i18n/states/NP.php:73
msgid "Myagdi"
msgstr ""
#: i18n/states/NP.php:76
msgid "Agrghakanchi"
msgstr ""
#: i18n/states/NP.php:77
msgid "Gulmi"
msgstr ""
#: i18n/states/NP.php:78
msgid "Kapilbastu"
msgstr ""
#: i18n/states/NP.php:79
msgid "Nawalparasi"
msgstr ""
#: i18n/states/NP.php:80
msgid "Palpa"
msgstr ""
#: i18n/states/NP.php:81
msgid "Rupandehi"
msgstr ""
#: i18n/states/NP.php:84
msgid "Dang"
msgstr ""
#: i18n/states/NP.php:85
msgid "Pyuthan"
msgstr ""
#: i18n/states/NP.php:86
msgid "Rolpa"
msgstr ""
#: i18n/states/NP.php:87
msgid "Rukum"
msgstr ""
#: i18n/states/NP.php:88
msgid "Salyan"
msgstr ""
#: i18n/states/NP.php:91
msgid "Banke"
msgstr ""
#: i18n/states/NP.php:92
msgid "Bardiya"
msgstr ""
#: i18n/states/NP.php:93
msgid "Dailekh"
msgstr ""
#: i18n/states/NP.php:94
msgid "Jajarkot"
msgstr ""
#: i18n/states/NP.php:95
msgid "Surkhet"
msgstr ""
#: i18n/states/NP.php:98
msgid "Dolpa"
msgstr ""
#: i18n/states/NP.php:99
msgid "Humla"
msgstr ""
#: i18n/states/NP.php:100
msgid "Jumla"
msgstr ""
#: i18n/states/NP.php:101
msgid "Kalikot"
msgstr ""
#: i18n/states/NP.php:102
msgid "Mugu"
msgstr ""
#: i18n/states/NP.php:105
msgid "Achham"
msgstr ""
#: i18n/states/NP.php:106
msgid "Bajhang"
msgstr ""
#: i18n/states/NP.php:107
msgid "Bajura"
msgstr ""
#: i18n/states/NP.php:108
msgid "Doti"
msgstr ""
#: i18n/states/NP.php:109
msgid "Kailali"
msgstr ""
#: i18n/states/NP.php:112
msgid "Baitadi"
msgstr ""
#: i18n/states/NP.php:113
msgid "Dadeldhura"
msgstr ""
#: i18n/states/NP.php:114
msgid "Darchula"
msgstr ""
#: i18n/states/NP.php:115
msgid "Kanchanpur"
msgstr ""
#: i18n/states/NZ.php:13 #: i18n/states/NZ.php:13
msgid "Northland" msgid "Northland"
msgstr "" msgstr ""
@ -4371,16 +4795,16 @@ msgstr ""
msgid "WooCommerce" msgid "WooCommerce"
msgstr "" msgstr ""
#: includes/abstracts/abstract-wc-order.php:2075 #: includes/abstracts/abstract-wc-order.php:2080
msgid "Order status changed from %s to %s." msgid "Order status changed from %s to %s."
msgstr "" msgstr ""
#: includes/abstracts/abstract-wc-order.php:2338 #: includes/abstracts/abstract-wc-order.php:2343
#: includes/class-wc-ajax.php:1167 includes/class-wc-ajax.php:1168 #: includes/class-wc-ajax.php:1167 includes/class-wc-ajax.php:1168
msgid "Item #%s stock reduced from %s to %s." msgid "Item #%s stock reduced from %s to %s."
msgstr "" msgstr ""
#: includes/abstracts/abstract-wc-order.php:2348 #: includes/abstracts/abstract-wc-order.php:2353
msgid "Order item stock reduced successfully." msgid "Order item stock reduced successfully."
msgstr "" msgstr ""
@ -4453,18 +4877,18 @@ msgstr ""
msgid "Out of stock" msgid "Out of stock"
msgstr "" msgstr ""
#: includes/abstracts/abstract-wc-product.php:1015 #: includes/abstracts/abstract-wc-product.php:1021
#: templates/single-product/rating.php:23 #: templates/single-product/rating.php:23
msgid "Rated %s out of 5" msgid "Rated %s out of 5"
msgstr "" msgstr ""
#: includes/abstracts/abstract-wc-product.php:1017 #: includes/abstracts/abstract-wc-product.php:1023
#: templates/single-product/rating.php:25 #: templates/single-product/rating.php:25
#: templates/single-product/review.php:27 #: templates/single-product/review.php:27
msgid "out of 5" msgid "out of 5"
msgstr "" msgstr ""
#: includes/abstracts/abstract-wc-product.php:1371 #: includes/abstracts/abstract-wc-product.php:1377
msgid "%s &ndash; %s" msgid "%s &ndash; %s"
msgstr "" msgstr ""
@ -4873,7 +5297,7 @@ msgstr ""
msgid "Zero size file downloaded" msgid "Zero size file downloaded"
msgstr "" msgstr ""
#: includes/api/class-wc-api-reports.php:469 #: includes/api/class-wc-api-reports.php:471
#: includes/api/v1/class-wc-api-reports.php:470 #: includes/api/v1/class-wc-api-reports.php:470
msgid "You do not have permission to read this report" msgid "You do not have permission to read this report"
msgstr "" msgstr ""
@ -9189,8 +9613,8 @@ msgstr ""
#: includes/class-wc-post-types.php:220 #: includes/class-wc-post-types.php:220
#: includes/updates/woocommerce-update-2.0.php:53 #: includes/updates/woocommerce-update-2.0.php:53
#: includes/wc-core-functions.php:506 includes/wc-core-functions.php:525 #: includes/wc-core-functions.php:507 includes/wc-core-functions.php:526
#: includes/wc-core-functions.php:559 #: includes/wc-core-functions.php:560
msgctxt "slug" msgctxt "slug"
msgid "product" msgid "product"
msgstr "" msgstr ""

View File

@ -2,7 +2,7 @@
/** /**
* Bangladeshi states (districts) * Bangladeshi states (districts)
* *
* @author Md Ariful Haque Khan * @author WooThemes
* @category i18n * @category i18n
* @package WooCommerce/i18n * @package WooCommerce/i18n
* @version 2.0.0 * @version 2.0.0

View File

@ -2,14 +2,14 @@
/** /**
* Spain states * Spain states
* *
* @author Samuel Aguilera * @author WooThemes
* @category i18n * @category i18n
* @package WooCommerce/i18n * @package WooCommerce/i18n
* @version 2.0.11 * @version 2.0.11
*/ */
global $states; global $states;
$states["ES"] = array( $states['ES'] = array(
'C' => __( 'A Coru&ntilde;a', 'woocommerce' ), 'C' => __( 'A Coru&ntilde;a', 'woocommerce' ),
'VI' => __( 'Araba/&Aacute;lava', 'woocommerce' ), 'VI' => __( 'Araba/&Aacute;lava', 'woocommerce' ),
'AB' => __( 'Albacete', 'woocommerce' ), 'AB' => __( 'Albacete', 'woocommerce' ),

View File

@ -2,7 +2,7 @@
/** /**
* Iran States * Iran States
* *
* @author Khalil Delavaran * @author WooThemes
* @category i18n * @category i18n
* @package WooCommerce/i18n * @package WooCommerce/i18n
* @version 2.2.3 * @version 2.2.3

View File

@ -2,7 +2,7 @@
/** /**
* Italy Provinces * Italy Provinces
* *
* @author Teo Maragakis * @author WooThemes
* @category i18n * @category i18n
* @package WooCommerce/i18n * @package WooCommerce/i18n
* @version 2.0.0 * @version 2.0.0

View File

@ -1,8 +1,8 @@
<?php <?php
/** /**
* Japan * Japan States
* *
* @author Kiyoshi Tsuji * @author WooThemes
* @category i18n * @category i18n
* @package WooCommerce/i18n * @package WooCommerce/i18n
* @version 2.0.0 * @version 2.0.0

45
i18n/states/MX.php Normal file
View File

@ -0,0 +1,45 @@
<?php
/**
* Mexico States
*
* @author WooThemes
* @category i18n
* @package WooCommerce/i18n
* @version 2.2.3
*/
global $states;
$states['MX'] = array(
'DIF' => __( 'Distrito Federal', 'woocommerce' ),
'JAL' => __( 'Jalisco', 'woocommerce' ),
'NLE' => __( 'Nuevo León', 'woocommerce' ),
'AGU' => __( 'Aguascalientes', 'woocommerce' ),
'BCN' => __( 'Baja California Norte', 'woocommerce' ),
'BCS' => __( 'Baja California Sur', 'woocommerce' ),
'CAM' => __( 'Campeche', 'woocommerce' ),
'CHP' => __( 'Chiapas', 'woocommerce' ),
'CHH' => __( 'Chihuahua', 'woocommerce' ),
'COA' => __( 'Coahuila', 'woocommerce' ),
'COL' => __( 'Colima', 'woocommerce' ),
'DUR' => __( 'Durango', 'woocommerce' ),
'GUA' => __( 'Guanajuato', 'woocommerce' ),
'GRO' => __( 'Guerrero', 'woocommerce' ),
'HID' => __( 'Hidalgo', 'woocommerce' ),
'MEX' => __( 'Edo. de México', 'woocommerce' ),
'MIC' => __( 'Michoacán', 'woocommerce' ),
'MOR' => __( 'Morelos', 'woocommerce' ),
'NAY' => __( 'Nayarit', 'woocommerce' ),
'OAX' => __( 'Oaxaca', 'woocommerce' ),
'PUE' => __( 'Puebla', 'woocommerce' ),
'QUE' => __( 'Querétaro', 'woocommerce' ),
'ROO' => __( 'Quintana Roo', 'woocommerce' ),
'SLP' => __( 'San Luis Potosí', 'woocommerce' ),
'SIN' => __( 'Sinaloa', 'woocommerce' ),
'SON' => __( 'Sonora', 'woocommerce' ),
'TAB' => __( 'Tabasco', 'woocommerce' ),
'TAM' => __( 'Tamaulipas', 'woocommerce' ),
'TLA' => __( 'Tlaxcala', 'woocommerce' ),
'VER' => __( 'Veracruz', 'woocommerce' ),
'YUC' => __( 'Yucatán', 'woocommerce' ),
'ZAC' => __( 'Zacatecas', 'woocommerce' )
);

116
i18n/states/NP.php Normal file
View File

@ -0,0 +1,116 @@
<?php
/**
* Nepal states (Districts)
*
* @author WooThemes
* @category i18n
* @package WooCommerce/i18n
* @version 2.2.3
*/
global $states;
$states['NP'] = array(
// Mechi
'ILL' => __( 'Illam', 'woocommerce' ),
'JHA' => __( 'Jhapa', 'woocommerce' ),
'PAN' => __( 'Panchthar', 'woocommerce' ),
'TAP' => __( 'Taplejung', 'woocommerce' ),
// Koshi
'BHO' => __( 'Bhojpur', 'woocommerce' ),
'DKA' => __( 'Dhankuta', 'woocommerce' ),
'MOR' => __( 'Morang', 'woocommerce' ),
'SUN' => __( 'Sunsari', 'woocommerce' ),
'SAN' => __( 'Sankhuwa', 'woocommerce' ),
'TER' => __( 'Terhathum', 'woocommerce' ),
// Sagarmatha
'KHO' => __( 'Khotang', 'woocommerce' ),
'OKH' => __( 'Okhaldhunga', 'woocommerce' ),
'SAP' => __( 'Saptari', 'woocommerce' ),
'SIR' => __( 'Siraha', 'woocommerce' ),
'SOL' => __( 'Solukhumbu', 'woocommerce' ),
'UDA' => __( 'Udayapur', 'woocommerce' ),
// Janakpur
'DHA' => __( 'Dhanusa', 'woocommerce' ),
'DLK' => __( 'Dolakha', 'woocommerce' ),
'MOH' => __( 'Mohottari', 'woocommerce' ),
'RAM' => __( 'Ramechha', 'woocommerce' ),
'SAR' => __( 'Sarlahi', 'woocommerce' ),
'SIN' => __( 'Sindhuli', 'woocommerce' ),
// Bagmati
'BHA' => __( 'Bhaktapur', 'woocommerce' ),
'DHD' => __( 'Dhading', 'woocommerce' ),
'KTM' => __( 'Kathmandu', 'woocommerce' ),
'KAV' => __( 'Kavrepalanchowk', 'woocommerce' ),
'LAL' => __( 'Lalitpur', 'woocommerce' ),
'NUW' => __( 'Nuwakot', 'woocommerce' ),
'RAS' => __( 'Rasuwa', 'woocommerce' ),
'SPC' => __( 'Sindhupalchowk', 'woocommerce' ),
// Narayani
'BAR' => __( 'Bara', 'woocommerce' ),
'CHI' => __( 'Chitwan', 'woocommerce' ),
'MAK' => __( 'Makwanpur', 'woocommerce' ),
'PAR' => __( 'Parsa', 'woocommerce' ),
'RAU' => __( 'Rautahat', 'woocommerce' ),
// Gandaki
'GOR' => __( 'Gorkha', 'woocommerce' ),
'KAS' => __( 'Kaski', 'woocommerce' ),
'LAM' => __( 'Lamjung', 'woocommerce' ),
'MAN' => __( 'Manang', 'woocommerce' ),
'SYN' => __( 'Syangja', 'woocommerce' ),
'TAN' => __( 'Tanahun', 'woocommerce' ),
// Dhawalagiri
'BAG' => __( 'Baglung', 'woocommerce' ),
'PBT' => __( 'Parbat', 'woocommerce' ),
'MUS' => __( 'Mustang', 'woocommerce' ),
'MYG' => __( 'Myagdi', 'woocommerce' ),
// Lumbini
'AGR' => __( 'Agrghakanchi', 'woocommerce' ),
'GUL' => __( 'Gulmi', 'woocommerce' ),
'KAP' => __( 'Kapilbastu', 'woocommerce' ),
'NAW' => __( 'Nawalparasi', 'woocommerce' ),
'PAL' => __( 'Palpa', 'woocommerce' ),
'RUP' => __( 'Rupandehi', 'woocommerce' ),
// Rapti
'DAN' => __( 'Dang', 'woocommerce' ),
'PYU' => __( 'Pyuthan', 'woocommerce' ),
'ROL' => __( 'Rolpa', 'woocommerce' ),
'RUK' => __( 'Rukum', 'woocommerce' ),
'SAL' => __( 'Salyan', 'woocommerce' ),
// Bheri
'BAN' => __( 'Banke', 'woocommerce' ),
'BDA' => __( 'Bardiya', 'woocommerce' ),
'DAI' => __( 'Dailekh', 'woocommerce' ),
'JAJ' => __( 'Jajarkot', 'woocommerce' ),
'SUR' => __( 'Surkhet', 'woocommerce' ),
// Karnali
'DOL' => __( 'Dolpa', 'woocommerce' ),
'HUM' => __( 'Humla', 'woocommerce' ),
'JUM' => __( 'Jumla', 'woocommerce' ),
'KAL' => __( 'Kalikot', 'woocommerce' ),
'MUG' => __( 'Mugu', 'woocommerce' ),
// Seti
'ACH' => __( 'Achham', 'woocommerce' ),
'BJH' => __( 'Bajhang', 'woocommerce' ),
'BJU' => __( 'Bajura', 'woocommerce' ),
'DOT' => __( 'Doti', 'woocommerce' ),
'KAI' => __( 'Kailali', 'woocommerce' ),
// Mahakali
'BAI' => __( 'Baitadi', 'woocommerce' ),
'DAD' => __( 'Dadeldhura', 'woocommerce' ),
'DAR' => __( 'Darchula', 'woocommerce' ),
'KAN' => __( 'Kanchanpur', 'woocommerce' )
);

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* NZ states * New Zealand States
* *
* @author WooThemes * @author WooThemes
* @category i18n * @category i18n

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Turkey * Turkey States
* *
* @author WooThemes * @author WooThemes
* @category i18n * @category i18n

View File

@ -1,6 +1,8 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* Abstract Email Class * Abstract Email Class

View File

@ -1,6 +1,8 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WooCommerce Integration class * WooCommerce Integration class

View File

@ -2062,11 +2062,16 @@ abstract class WC_Abstract_Order {
*/ */
public function update_status( $new_status, $note = '' ) { public function update_status( $new_status, $note = '' ) {
$old_status = $this->get_status(); if ( ! $this->id ) {
$new_status = 'wc-' === substr( $new_status, 0, 3 ) ? substr( $new_status, 3 ) : $new_status; return;
}
// Only update if they differ // Standardise status names.
if ( $this->id && $new_status !== $old_status ) { $new_status = 'wc-' === substr( $new_status, 0, 3 ) ? substr( $new_status, 3 ) : $new_status;
$old_status = $this->get_status();
// Only update if they differ - and ensure post_status is a 'wc' status.
if ( $new_status !== $old_status || ! in_array( $this->post_status, array_keys( wc_get_order_statuses() ) ) ) {
// Update the order // Update the order
wp_update_post( array( 'ID' => $this->id, 'post_status' => 'wc-' . $new_status ) ); wp_update_post( array( 'ID' => $this->id, 'post_status' => 'wc-' . $new_status ) );

View File

@ -1,6 +1,8 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WooCommerce Payment Gateway class * WooCommerce Payment Gateway class

View File

@ -975,24 +975,30 @@ class WC_Product {
/** /**
* get_rating_count function. * get_rating_count function.
* *
* @param int $value Optional. Rating value to get the count for. By default
* returns the count of all rating values.
* @return int * @return int
*/ */
public function get_rating_count() { public function get_rating_count( $value = null ) {
if ( false === ( $count = get_transient( 'wc_rating_count_' . $this->id ) ) ) { $value = intval( $value );
$value_suffix = $value ? '_' . $value : '';
if ( false === ( $count = get_transient( 'wc_rating_count_' . $this->id . $value_suffix ) ) ) {
global $wpdb; global $wpdb;
$where_meta_value = $value ? $wpdb->prepare( " AND meta_value = %d", $value ) : " AND meta_value > 0";
$count = $wpdb->get_var( $wpdb->prepare(" $count = $wpdb->get_var( $wpdb->prepare("
SELECT COUNT(meta_value) FROM $wpdb->commentmeta SELECT COUNT(meta_value) FROM $wpdb->commentmeta
LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID
WHERE meta_key = 'rating' WHERE meta_key = 'rating'
AND comment_post_ID = %d AND comment_post_ID = %d
AND comment_approved = '1' AND comment_approved = '1'
AND meta_value > 0 ", $this->id ) . $where_meta_value );
", $this->id ) );
set_transient( 'wc_rating_count_' . $this->id, $count, YEAR_IN_SECONDS ); set_transient( 'wc_rating_count_' . $this->id . $value_suffix, $count, YEAR_IN_SECONDS );
} }
return $count; return $count;

View File

@ -1,6 +1,8 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WooCommerce Shipping Method Class * WooCommerce Shipping Method Class

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WC_Admin_Addons Class * WC_Admin_Addons Class

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Admin_Assets' ) ) : if ( ! class_exists( 'WC_Admin_Assets' ) ) :

View File

@ -10,7 +10,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WC_Admin_Attributes Class * WC_Admin_Attributes Class

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Admin_Dashboard' ) ) : if ( ! class_exists( 'WC_Admin_Dashboard' ) ) :

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Admin_Duplicate_Product' ) ) : if ( ! class_exists( 'WC_Admin_Duplicate_Product' ) ) :

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Admin_Help' ) ) : if ( ! class_exists( 'WC_Admin_Help' ) ) :

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Admin_Importers' ) ) : if ( ! class_exists( 'WC_Admin_Importers' ) ) :

View File

@ -10,7 +10,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WC_Admin_Meta_Boxes * WC_Admin_Meta_Boxes

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Admin_Notices' ) ) : if ( ! class_exists( 'WC_Admin_Notices' ) ) :

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Admin_Permalink_Settings' ) ) : if ( ! class_exists( 'WC_Admin_Permalink_Settings' ) ) :

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Admin_Post_Types' ) ) : if ( ! class_exists( 'WC_Admin_Post_Types' ) ) :
@ -355,13 +357,17 @@ class WC_Admin_Post_Types {
$post_type_object = get_post_type_object( $post->post_type ); $post_type_object = get_post_type_object( $post->post_type );
$can_edit_post = current_user_can( $post_type_object->cap->edit_post, $post->ID ); $can_edit_post = current_user_can( $post_type_object->cap->edit_post, $post->ID );
echo '<div class="code tips" data-tip="' . __( 'Edit coupon', 'woocommerce' ) . '"><a href="' . esc_attr( $edit_link ) . '"><span>' . esc_html( $title ). '</span></a></div>'; echo '<a href="' . esc_attr( $edit_link ) . '">' . esc_html( $title ). '</a>';
_post_states( $post ); _post_states( $post );
// Get actions // Get actions
$actions = array(); $actions = array();
if ( current_user_can( $post_type_object->cap->edit_post, $post->ID ) ) {
$actions['edit'] = '<a href="' . admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=edit', $post->ID ) ) . '">' . __( 'Edit', 'woocommerce' ) . '</a>';
}
if ( current_user_can( $post_type_object->cap->delete_post, $post->ID ) ) { if ( current_user_can( $post_type_object->cap->delete_post, $post->ID ) ) {
if ( 'trash' == $post->post_status ) if ( 'trash' == $post->post_status )
$actions['untrash'] = "<a title='" . esc_attr( __( 'Restore this item from the Trash', 'woocommerce' ) ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore', 'woocommerce' ) . "</a>"; $actions['untrash'] = "<a title='" . esc_attr( __( 'Restore this item from the Trash', 'woocommerce' ) ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore', 'woocommerce' ) . "</a>";
@ -851,7 +857,11 @@ class WC_Admin_Post_Types {
} }
if ( isset( $_REQUEST['_featured'] ) ) { if ( isset( $_REQUEST['_featured'] ) ) {
if ( update_post_meta( $post_id, '_featured', isset( $_REQUEST['_featured'] ) ? 'yes' : 'no' ) ) { if ( update_post_meta( $post_id, '_featured', 'yes' ) ) {
delete_transient( 'wc_featured_products' );
}
} else {
if ( update_post_meta( $post_id, '_featured', 'no' ) ) {
delete_transient( 'wc_featured_products' ); delete_transient( 'wc_featured_products' );
} }
} }
@ -1012,9 +1022,9 @@ class WC_Admin_Post_Types {
case 3 : case 3 :
if ( strstr( $regular_price, '%' ) ) { if ( strstr( $regular_price, '%' ) ) {
$percent = str_replace( '%', '', $regular_price ) / 100; $percent = str_replace( '%', '', $regular_price ) / 100;
$new_price = $old_regular_price - ( round ( $old_regular_price * $percent, absint( get_option( 'woocommerce_price_num_decimals' ) ) ) ); $new_price = max( 0, $old_regular_price - ( round ( $old_regular_price * $percent, absint( get_option( 'woocommerce_price_num_decimals' ) ) ) ) );
} else { } else {
$new_price = $old_regular_price - $regular_price; $new_price = max( 0, $old_regular_price - $regular_price );
} }
break; break;
@ -1050,17 +1060,17 @@ class WC_Admin_Post_Types {
case 3 : case 3 :
if ( strstr( $sale_price, '%' ) ) { if ( strstr( $sale_price, '%' ) ) {
$percent = str_replace( '%', '', $sale_price ) / 100; $percent = str_replace( '%', '', $sale_price ) / 100;
$new_price = $old_sale_price - ( $old_sale_price * $percent ); $new_price = max( 0, $old_sale_price - ( $old_sale_price * $percent ) );
} else { } else {
$new_price = $old_sale_price - $sale_price; $new_price = max( 0, $old_sale_price - $sale_price );
} }
break; break;
case 4 : case 4 :
if ( strstr( $sale_price, '%' ) ) { if ( strstr( $sale_price, '%' ) ) {
$percent = str_replace( '%', '', $sale_price ) / 100; $percent = str_replace( '%', '', $sale_price ) / 100;
$new_price = $product->regular_price - ( $product->regular_price * $percent ); $new_price = max( 0, $product->regular_price - ( $product->regular_price * $percent ) );
} else { } else {
$new_price = $product->regular_price - $sale_price; $new_price = max( 0, $product->regular_price - $sale_price );
} }
break; break;
@ -1338,12 +1348,14 @@ class WC_Admin_Post_Types {
case 'product' : case 'product' :
$this->product_filters(); $this->product_filters();
break; break;
case 'product' : case 'shop_coupon' :
$this->shop_coupon_filters(); $this->shop_coupon_filters();
break; break;
case 'product' : case 'shop_order' :
$this->shop_order_filters(); $this->shop_order_filters();
break; break;
default :
break;
} }
} }

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Admin_Profile' ) ) : if ( ! class_exists( 'WC_Admin_Profile' ) ) :

View File

@ -10,7 +10,9 @@
* @version 2.0.0 * @version 2.0.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Admin_Reports' ) ) : if ( ! class_exists( 'WC_Admin_Reports' ) ) :

View File

@ -8,7 +8,9 @@
* @version 2.2.0 * @version 2.2.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WC_Admin_Status Class * WC_Admin_Status Class

View File

@ -1,8 +1,4 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* Handles taxonomies in admin * Handles taxonomies in admin
* *
@ -12,6 +8,14 @@ if ( ! defined( 'ABSPATH' ) ) {
* @category Class * @category Class
* @author WooThemes * @author WooThemes
*/ */
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* WC_Admin_Taxonomies class.
*/
class WC_Admin_Taxonomies { class WC_Admin_Taxonomies {
/** /**

View File

@ -12,7 +12,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WC_Admin_Welcome class. * WC_Admin_Welcome class.

View File

@ -1,8 +1,4 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WooCommerce Admin. * WooCommerce Admin.
* *
@ -12,6 +8,14 @@ if ( ! defined( 'ABSPATH' ) ) {
* @package WooCommerce/Admin * @package WooCommerce/Admin
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* WC_Admin class.
*/
class WC_Admin { class WC_Admin {
/** /**

View File

@ -8,7 +8,9 @@
* @version 2.0.0 * @version 2.0.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( class_exists( 'WP_Importer' ) ) { if ( class_exists( 'WP_Importer' ) ) {
class WC_Tax_Rate_Importer extends WP_Importer { class WC_Tax_Rate_Importer extends WP_Importer {

View File

@ -10,10 +10,12 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WC_Meta_Box_Coupon_Data * WC_Meta_Box_Coupon_Data Class
*/ */
class WC_Meta_Box_Coupon_Data { class WC_Meta_Box_Coupon_Data {

View File

@ -10,8 +10,13 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* WC_Meta_Box_Order_Actions Class
*/
class WC_Meta_Box_Order_Actions { class WC_Meta_Box_Order_Actions {
/** /**

View File

@ -15,7 +15,7 @@ if ( ! defined( 'ABSPATH' ) ) {
} }
/** /**
* WC_Meta_Box_Order_Data * WC_Meta_Box_Order_Data Class
*/ */
class WC_Meta_Box_Order_Data { class WC_Meta_Box_Order_Data {
@ -247,10 +247,12 @@ class WC_Meta_Box_Order_Data {
switch ( $field['type'] ) { switch ( $field['type'] ) {
case 'select' : case 'select' :
woocommerce_wp_select( array( 'id' => '_billing_' . $key, 'label' => $field['label'], 'options' => $field['options'] ) ); // allow for setting a default value programaticaly, and draw the selectbox
woocommerce_wp_select( array( 'id' => '_billing_' . $key, 'label' => $field['label'], 'options' => $field['options'], 'value' => isset( $field['value'] ) ? $field['value'] : '' ) );
break; break;
default : default :
woocommerce_wp_text_input( array( 'id' => '_billing_' . $key, 'label' => $field['label'] ) ); // allow for setting a default value programaticaly, and draw the textbox
woocommerce_wp_text_input( array( 'id' => '_billing_' . $key, 'label' => $field['label'], 'value' => isset( $field['value'] ) ? $field['value'] : '' ) );
break; break;
} }
} }

View File

@ -8,10 +8,12 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WC_Meta_Box_Order_Downloads * WC_Meta_Box_Order_Downloads Class
*/ */
class WC_Meta_Box_Order_Downloads { class WC_Meta_Box_Order_Downloads {

View File

@ -10,8 +10,13 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/**
* WC_Meta_Box_Order_Items Class
*/
class WC_Meta_Box_Order_Items { class WC_Meta_Box_Order_Items {
/** /**

View File

@ -8,10 +8,12 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WC_Meta_Box_Order_Notes * WC_Meta_Box_Order_Notes Class
*/ */
class WC_Meta_Box_Order_Notes { class WC_Meta_Box_Order_Notes {

View File

@ -10,10 +10,12 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WC_Meta_Box_Order_Reviews * WC_Meta_Box_Order_Reviews Class
*/ */
class WC_Meta_Box_Order_Reviews { class WC_Meta_Box_Order_Reviews {

View File

@ -15,7 +15,7 @@ if ( ! defined( 'ABSPATH' ) ) {
} }
/** /**
* WC_Meta_Box_Product_Data * WC_Meta_Box_Product_Data Class
*/ */
class WC_Meta_Box_Product_Data { class WC_Meta_Box_Product_Data {
@ -1267,7 +1267,6 @@ class WC_Meta_Box_Product_Data {
if ( $clear_parent_ids ) { if ( $clear_parent_ids ) {
foreach ( $clear_parent_ids as $clear_id ) { foreach ( $clear_parent_ids as $clear_id ) {
$children_by_price = get_posts( array( $children_by_price = get_posts( array(
'post_parent' => $clear_id, 'post_parent' => $clear_id,
'orderby' => 'meta_value_num', 'orderby' => 'meta_value_num',
@ -1279,12 +1278,13 @@ class WC_Meta_Box_Product_Data {
) ); ) );
if ( $children_by_price ) { if ( $children_by_price ) {
foreach ( $children_by_price as $child ) { foreach ( $children_by_price as $child ) {
$child_price = get_post_meta( $child, '_price', true ); $child_price = get_post_meta( $child, '_price', true );
update_post_meta( $clear_id, '_price', $child_price ); update_post_meta( $clear_id, '_price', $child_price );
} }
} }
wc_delete_product_transients( $clear_id );
} }
} }
} }

View File

@ -10,10 +10,12 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WC_Meta_Box_Product_Images * WC_Meta_Box_Product_Images Class
*/ */
class WC_Meta_Box_Product_Images { class WC_Meta_Box_Product_Images {

View File

@ -10,10 +10,12 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* WC_Meta_Box_Product_Short_Description * WC_Meta_Box_Product_Short_Description Class
*/ */
class WC_Meta_Box_Product_Short_Description { class WC_Meta_Box_Product_Short_Description {

View File

@ -1,5 +1,9 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
?> ?>
<div class="wc-metabox closed"> <div class="wc-metabox closed">
<h3 class="fixed"> <h3 class="fixed">

View File

@ -1,7 +1,9 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly exit; // Exit if accessed directly
} }
?> ?>
<tr class="fee <?php echo ( ! empty( $class ) ) ? $class : ''; ?>" data-order_item_id="<?php echo $item_id; ?>"> <tr class="fee <?php echo ( ! empty( $class ) ) ? $class : ''; ?>" data-order_item_id="<?php echo $item_id; ?>">
<td class="check-column"><input type="checkbox" /></td> <td class="check-column"><input type="checkbox" /></td>
@ -42,7 +44,7 @@ if ( ! defined( 'ABSPATH' ) ) {
</td> </td>
<?php <?php
if ( isset( $legacy_order ) && ! $legacy_order && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) : if ( empty( $legacy_order ) && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
$line_tax_data = isset( $item['line_tax_data'] ) ? $item['line_tax_data'] : ''; $line_tax_data = isset( $item['line_tax_data'] ) ? $item['line_tax_data'] : '';
$tax_data = maybe_unserialize( $line_tax_data ); $tax_data = maybe_unserialize( $line_tax_data );

View File

@ -1,7 +1,9 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly exit; // Exit if accessed directly
} }
?> ?>
<tr class="item <?php echo apply_filters( 'woocommerce_admin_html_order_item_class', ( ! empty( $class ) ? $class : '' ), $item ); ?>" data-order_item_id="<?php echo $item_id; ?>"> <tr class="item <?php echo apply_filters( 'woocommerce_admin_html_order_item_class', ( ! empty( $class ) ? $class : '' ), $item ); ?>" data-order_item_id="<?php echo $item_id; ?>">
<td class="check-column"><input type="checkbox" /></td> <td class="check-column"><input type="checkbox" /></td>
@ -45,6 +47,8 @@ if ( ! defined( 'ABSPATH' ) ) {
<input type="hidden" class="order_item_id" name="order_item_id[]" value="<?php echo esc_attr( $item_id ); ?>" /> <input type="hidden" class="order_item_id" name="order_item_id[]" value="<?php echo esc_attr( $item_id ); ?>" />
<input type="hidden" name="order_item_tax_class[<?php echo absint( $item_id ); ?>]" value="<?php echo isset( $item['tax_class'] ) ? esc_attr( $item['tax_class'] ) : ''; ?>" /> <input type="hidden" name="order_item_tax_class[<?php echo absint( $item_id ); ?>]" value="<?php echo isset( $item['tax_class'] ) ? esc_attr( $item['tax_class'] ) : ''; ?>" />
<?php do_action( 'woocommerce_before_order_itemmeta', $item_id, $item, $_product ) ?>
<div class="view"> <div class="view">
<?php <?php
global $wpdb; global $wpdb;
@ -144,6 +148,9 @@ if ( ! defined( 'ABSPATH' ) ) {
</tfoot> </tfoot>
</table> </table>
</div> </div>
<?php do_action( 'woocommerce_after_order_itemmeta', $item_id, $item, $_product ) ?>
</td> </td>
<?php do_action( 'woocommerce_admin_order_item_values', $_product, $item, absint( $item_id ) ); ?> <?php do_action( 'woocommerce_admin_order_item_values', $_product, $item, absint( $item_id ) ); ?>
@ -198,7 +205,7 @@ if ( ! defined( 'ABSPATH' ) ) {
</td> </td>
<?php <?php
if ( isset( $legacy_order ) && ! $legacy_order && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) : if ( empty( $legacy_order ) && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
$line_tax_data = isset( $item['line_tax_data'] ) ? $item['line_tax_data'] : ''; $line_tax_data = isset( $item['line_tax_data'] ) ? $item['line_tax_data'] : '';
$tax_data = maybe_unserialize( $line_tax_data ); $tax_data = maybe_unserialize( $line_tax_data );

View File

@ -1,4 +1,5 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly exit; // Exit if accessed directly
} }
@ -56,7 +57,7 @@ if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) {
<th class="line_cost"><?php _e( 'Total', 'woocommerce' ); ?></th> <th class="line_cost"><?php _e( 'Total', 'woocommerce' ); ?></th>
<?php <?php
if ( isset( $legacy_order ) && ! $legacy_order && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) : if ( empty( $legacy_order ) && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
foreach ( $order_taxes as $tax_id => $tax_item ) : foreach ( $order_taxes as $tax_id => $tax_item ) :
$tax_class = wc_get_tax_class_by_tax_id( $tax_item['rate_id'] ); $tax_class = wc_get_tax_class_by_tax_id( $tax_item['rate_id'] );
$tax_class_name = isset( $classes_options[ $tax_class ] ) ? $classes_options[ $tax_class ] : __( 'Tax', 'woocommerce' ); $tax_class_name = isset( $classes_options[ $tax_class ] ) ? $classes_options[ $tax_class ] : __( 'Tax', 'woocommerce' );
@ -214,6 +215,8 @@ if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) {
<p class="add-items"> <p class="add-items">
<?php if ( $order->is_editable() ) : ?> <?php if ( $order->is_editable() ) : ?>
<button type="button" class="button add-line-item"><?php _e( 'Add line item(s)', 'woocommerce' ); ?></button> <button type="button" class="button add-line-item"><?php _e( 'Add line item(s)', 'woocommerce' ); ?></button>
<?php else : ?>
<span class="description tips" data-tip="<?php esc_attr_e( 'To edit this order change the status back to "Pending"', 'woocommerce' ); ?>"><?php _e( 'This order has been paid for and is no longer editable', 'woocommerce' ); ?></span>
<?php endif; ?> <?php endif; ?>
<?php if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) && $order->is_editable() ) : ?> <?php if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) && $order->is_editable() ) : ?>
<button type="button" class="button add-order-tax"><?php _e( 'Add Tax', 'woocommerce' ); ?></button> <button type="button" class="button add-order-tax"><?php _e( 'Add Tax', 'woocommerce' ); ?></button>
@ -233,6 +236,10 @@ if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) {
<button type="button" class="button add-order-shipping"><?php _e( 'Add shipping cost', 'woocommerce' ); ?></button> <button type="button" class="button add-order-shipping"><?php _e( 'Add shipping cost', 'woocommerce' ); ?></button>
<button type="button" class="button cancel-action"><?php _e( 'Cancel', 'woocommerce' ); ?></button> <button type="button" class="button cancel-action"><?php _e( 'Cancel', 'woocommerce' ); ?></button>
<button type="button" class="button button-primary save-action"><?php _e( 'Save', 'woocommerce' ); ?></button> <button type="button" class="button button-primary save-action"><?php _e( 'Save', 'woocommerce' ); ?></button>
<?php
// allow adding custom buttons
do_action( 'woocommerce_order_item_add_line_buttons', $order );
?>
</div> </div>
<?php if ( ( $order->get_total() - $order->get_total_refunded() ) > 0 ) : ?> <?php if ( ( $order->get_total() - $order->get_total_refunded() ) > 0 ) : ?>
<div class="wc-order-data-row wc-order-refund-items" style="display: none;"> <div class="wc-order-data-row wc-order-refund-items" style="display: none;">

View File

@ -1,7 +1,9 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly exit; // Exit if accessed directly
} }
$who_refunded = new WP_User( $refund->post->post_author ); $who_refunded = new WP_User( $refund->post->post_author );
?> ?>
<tr class="refund <?php echo ( ! empty( $class ) ) ? $class : ''; ?>" data-order_refund_id="<?php echo $refund->id; ?>"> <tr class="refund <?php echo ( ! empty( $class ) ) ? $class : ''; ?>" data-order_refund_id="<?php echo $refund->id; ?>">

View File

@ -1,4 +1,5 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly exit; // Exit if accessed directly
} }
@ -67,7 +68,7 @@ if ( ! defined( 'ABSPATH' ) ) {
</td> </td>
<?php <?php
if ( isset( $legacy_order ) && ! $legacy_order && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) : if ( empty( $legacy_order ) && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
$shipping_taxes = isset( $item['taxes'] ) ? $item['taxes'] : ''; $shipping_taxes = isset( $item['taxes'] ) ? $item['taxes'] : '';
$tax_data = maybe_unserialize( $shipping_taxes ); $tax_data = maybe_unserialize( $shipping_taxes );

View File

@ -1,5 +1,9 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
?> ?>
<div class="woocommerce_variation wc-metabox closed"> <div class="woocommerce_variation wc-metabox closed">
<h3> <h3>

View File

@ -1,5 +1,8 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
/** /**
* Admin Report * Admin Report

View File

@ -1,4 +1,5 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly exit; // Exit if accessed directly
} }

View File

@ -1,9 +1,12 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) )
exit; // Exit if accessed directly
if ( ! class_exists( 'WC_Report_Stock' ) ) if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Report_Stock' ) ) {
require_once( 'class-wc-report-stock.php' ); require_once( 'class-wc-report-stock.php' );
}
/** /**
* WC_Report_Low_In_Stock * WC_Report_Low_In_Stock

View File

@ -1,9 +1,12 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) )
exit; // Exit if accessed directly
if ( ! class_exists( 'WC_Report_Stock' ) ) if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Report_Stock' ) ) {
require_once( 'class-wc-report-stock.php' ); require_once( 'class-wc-report-stock.php' );
}
/** /**
* WC_Report_Most_Stocked * WC_Report_Most_Stocked

View File

@ -1,9 +1,12 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) )
exit; // Exit if accessed directly
if ( ! class_exists( 'WC_Report_Stock' ) ) if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Report_Stock' ) ) {
require_once( 'class-wc-report-stock.php' ); require_once( 'class-wc-report-stock.php' );
}
/** /**
* WC_Report_Out_Of_Stock * WC_Report_Out_Of_Stock

View File

@ -1,9 +1,12 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) )
exit; // Exit if accessed directly
if ( ! class_exists( 'WP_List_Table' ) ) if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WP_List_Table' ) ) {
require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' ); require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
}
/** /**
* WC_Report_Stock * WC_Report_Stock

View File

@ -120,10 +120,7 @@ class WC_Report_Taxes_By_Date extends WC_Admin_Report {
<th class="total_row"><?php _e( 'Net profit', 'woocommerce' ); ?> <a class="tips" data-tip="<?php _e("Total sales minus shipping and tax.", 'woocommerce'); ?>" href="#">[?]</a></th> <th class="total_row"><?php _e( 'Net profit', 'woocommerce' ); ?> <a class="tips" data-tip="<?php _e("Total sales minus shipping and tax.", 'woocommerce'); ?>" href="#">[?]</a></th>
</tr> </tr>
</thead> </thead>
<?php if ( $tax_rows ) : <?php if ( $tax_rows ) : ?>
$gross = array_sum( wp_list_pluck( (array) $tax_rows, 'total_sales' ) ) - array_sum( wp_list_pluck( (array) $tax_rows, 'total_shipping' ) );
$total_tax = array_sum( wp_list_pluck( (array) $tax_rows, 'tax_amount' ) ) + array_sum( wp_list_pluck( (array) $tax_rows, 'shipping_tax_amount' ) );
?>
<tbody> <tbody>
<?php <?php
foreach ( $tax_rows as $tax_row ) { foreach ( $tax_rows as $tax_row ) {
@ -148,6 +145,10 @@ class WC_Report_Taxes_By_Date extends WC_Admin_Report {
?> ?>
</tbody> </tbody>
<tfoot> <tfoot>
<?php
$gross = array_sum( wp_list_pluck( (array) $tax_rows, 'total_sales' ) ) - array_sum( wp_list_pluck( (array) $tax_rows, 'total_shipping' ) );
$total_tax = array_sum( wp_list_pluck( (array) $tax_rows, 'tax_amount' ) ) + array_sum( wp_list_pluck( (array) $tax_rows, 'shipping_tax_amount' ) );
?>
<tr> <tr>
<th scope="row"><?php _e( 'Totals', 'woocommerce' ); ?></th> <th scope="row"><?php _e( 'Totals', 'woocommerce' ); ?></th>
<th class="total_row"><?php echo array_sum( wp_list_pluck( (array) $tax_rows, 'total_orders' ) ); ?></th> <th class="total_row"><?php echo array_sum( wp_list_pluck( (array) $tax_rows, 'total_orders' ) ); ?></th>

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Settings_Accounts' ) ) : if ( ! class_exists( 'WC_Settings_Accounts' ) ) :

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Settings_Payment_Gateways' ) ) : if ( ! class_exists( 'WC_Settings_Payment_Gateways' ) ) :

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Settings_Emails' ) ) : if ( ! class_exists( 'WC_Settings_Emails' ) ) :

View File

@ -224,7 +224,7 @@ class WC_Settings_General extends WC_Settings_Page {
</th> </th>
<td class="forminp"><?php <td class="forminp"><?php
$base_file = WC()->plugin_path() . '/assets/css/woocommerce-base.less'; $base_file = WC()->plugin_path() . '/assets/css/_woocommerce-base.scss';
$css_file = WC()->plugin_path() . '/assets/css/woocommerce.css'; $css_file = WC()->plugin_path() . '/assets/css/woocommerce.css';
if ( is_writable( $base_file ) && is_writable( $css_file ) ) { if ( is_writable( $base_file ) && is_writable( $css_file ) ) {
@ -257,7 +257,7 @@ class WC_Settings_General extends WC_Settings_Page {
$this->color_picker( __( 'Subtext', 'woocommerce' ), 'woocommerce_frontend_css_subtext', $colors['subtext'], __( 'Used for certain text and asides - breadcrumbs, small text etc.', 'woocommerce' ) ); $this->color_picker( __( 'Subtext', 'woocommerce' ), 'woocommerce_frontend_css_subtext', $colors['subtext'], __( 'Used for certain text and asides - breadcrumbs, small text etc.', 'woocommerce' ) );
} else { } else {
echo '<span class="description">' . __( 'To edit colours <code>woocommerce/assets/css/woocommerce-base.less</code> and <code>woocommerce.css</code> need to be writable. See <a href="http://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.', 'woocommerce' ) . '</span>'; echo '<span class="description">' . __( 'To edit colours <code>woocommerce/assets/css/_woocommerce-base.scss</code> and <code>woocommerce.css</code> need to be writable. See <a href="http://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.', 'woocommerce' ) . '</span>';
} }
?></td> ?></td>
@ -319,7 +319,7 @@ class WC_Settings_General extends WC_Settings_Page {
update_option( 'woocommerce_frontend_css_colors', $colors ); update_option( 'woocommerce_frontend_css_colors', $colors );
if ( $old_colors != $colors ) { if ( $old_colors != $colors ) {
woocommerce_compile_less_styles(); woocommerce_compile_scss_styles();
} }
} }
} }

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Settings_Integrations' ) ) : if ( ! class_exists( 'WC_Settings_Integrations' ) ) :

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Settings_Page' ) ) : if ( ! class_exists( 'WC_Settings_Page' ) ) :

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Settings_Products' ) ) : if ( ! class_exists( 'WC_Settings_Products' ) ) :
@ -371,8 +373,8 @@ class WC_Settings_Products extends WC_Settings_Page {
'css' => '', 'css' => '',
'type' => 'image_width', 'type' => 'image_width',
'default' => array( 'default' => array(
'width' => '150', 'width' => '300',
'height' => '150', 'height' => '300',
'crop' => 1 'crop' => 1
), ),
'desc_tip' => true, 'desc_tip' => true,
@ -385,8 +387,8 @@ class WC_Settings_Products extends WC_Settings_Page {
'css' => '', 'css' => '',
'type' => 'image_width', 'type' => 'image_width',
'default' => array( 'default' => array(
'width' => '300', 'width' => '600',
'height' => '300', 'height' => '600',
'crop' => 1 'crop' => 1
), ),
'desc_tip' => true, 'desc_tip' => true,
@ -399,8 +401,8 @@ class WC_Settings_Products extends WC_Settings_Page {
'css' => '', 'css' => '',
'type' => 'image_width', 'type' => 'image_width',
'default' => array( 'default' => array(
'width' => '90', 'width' => '180',
'height' => '90', 'height' => '180',
'crop' => 1 'crop' => 1
), ),
'desc_tip' => true, 'desc_tip' => true,

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Settings_Shipping' ) ) : if ( ! class_exists( 'WC_Settings_Shipping' ) ) :

View File

@ -8,7 +8,9 @@
* @version 2.1.0 * @version 2.1.0
*/ */
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
if ( ! class_exists( 'WC_Settings_Tax' ) ) : if ( ! class_exists( 'WC_Settings_Tax' ) ) :

View File

@ -10,6 +10,6 @@ if ( ! defined( 'ABSPATH' ) ) {
?> ?>
<div id="message" class="updated woocommerce-message wc-connect"> <div id="message" class="updated woocommerce-message wc-connect">
<p><?php _e( '<strong>Your theme has bundled outdated copies of WooCommerce template files</strong> &#8211; if you encounter functionality issues on the frontend this could the reason. Ensure you update or remove them (in general we recommend only bundling the template files you actually need to customize). See the system report for full details.', 'woocommerce' ); ?></p> <p><?php _e( '<strong>Your theme has bundled outdated copies of WooCommerce template files</strong> &#8211; if you encounter functionality issues on the frontend this could be the reason. Ensure you update or remove them (in general we recommend only bundling the template files you actually need to customize). See the system report for full details.', 'woocommerce' ); ?></p>
<p class="submit"><a class="button-primary" href="<?php echo esc_url( admin_url( 'admin.php?page=wc-status' ) ); ?>"><?php _e( 'System Status', 'woocommerce' ); ?></a> <a class="skip button-primary" href="<?php echo esc_url( add_query_arg( 'hide_template_files_notice', 'true' ) ); ?>"><?php _e( 'Hide this notice', 'woocommerce' ); ?></a></p> <p class="submit"><a class="button-primary" href="<?php echo esc_url( admin_url( 'admin.php?page=wc-status' ) ); ?>"><?php _e( 'System Status', 'woocommerce' ); ?></a> <a class="skip button-primary" href="<?php echo esc_url( add_query_arg( 'hide_template_files_notice', 'true' ) ); ?>"><?php _e( 'Hide this notice', 'woocommerce' ); ?></a></p>
</div> </div>

View File

@ -20,7 +20,7 @@ if ( isset( $_GET['action'] ) && 'hide_translation_upgrade' == $_GET['action'] )
<?php if ( is_multisite() ) : ?> <?php if ( is_multisite() ) : ?>
<a href="<?php echo wp_nonce_url( admin_url( 'admin.php?page=wc-status&tab=tools&action=translation_upgrade' ), 'debug_action' ); ?>" class="button-primary"><?php _e( 'Update Translation', 'woocommerce' ); ?></a> <a href="<?php echo wp_nonce_url( admin_url( 'admin.php?page=wc-status&tab=tools&action=translation_upgrade' ), 'debug_action' ); ?>" class="button-primary"><?php _e( 'Update Translation', 'woocommerce' ); ?></a>
<?php else : ?> <?php else : ?>
<a href="<?php echo wp_nonce_url( add_query_arg( array( 'action' => 'do-translation-upgrade' ), admin_url( 'update-core.php' ) ), 'upgrade-translations' ); ?>" class="button-primary"><?php _e( 'Update translation', 'woocommerce' ); ?></a> <a href="<?php echo wp_nonce_url( add_query_arg( array( 'action' => 'do-translation-upgrade' ), admin_url( 'update-core.php' ) ), 'upgrade-translations' ); ?>" class="button-primary"><?php _e( 'Update Translation', 'woocommerce' ); ?></a>
<a href="<?php echo wp_nonce_url( admin_url( 'admin.php?page=wc-status&tab=tools&action=translation_upgrade' ), 'debug_action' ); ?>" class="button-primary"><?php _e( 'Force Update Translation', 'woocommerce' ); ?></a> <a href="<?php echo wp_nonce_url( admin_url( 'admin.php?page=wc-status&tab=tools&action=translation_upgrade' ), 'debug_action' ); ?>" class="button-primary"><?php _e( 'Force Update Translation', 'woocommerce' ); ?></a>
<?php endif; ?> <?php endif; ?>
<a href="<?php echo wp_nonce_url( admin_url( 'admin.php?page=wc-status&tab=tools&action=hide_translation_upgrade' ), 'debug_action' ); ?>" class="button"><?php _e( 'Hide This Message', 'woocommerce' ); ?></a> <a href="<?php echo wp_nonce_url( admin_url( 'admin.php?page=wc-status&tab=tools&action=hide_translation_upgrade' ), 'debug_action' ); ?>" class="button"><?php _e( 'Hide This Message', 'woocommerce' ); ?></a>

Some files were not shown because too many files have changed in this diff Show More