Skip to content

Commit

Permalink
Run grunt tasks
Browse files Browse the repository at this point in the history
Fixes warnings from grunt so files are minified correctly. Copied fixes that went into release branch but not master earlier this week.
  • Loading branch information
mikejolley committed Mar 20, 2019
1 parent b283a89 commit 308d08f
Show file tree
Hide file tree
Showing 14 changed files with 237 additions and 230 deletions.
2 changes: 1 addition & 1 deletion assets/css/admin-rtl.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/admin.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/css/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6784,15 +6784,15 @@ table.bar_chart {
border-radius: 3px;
box-shadow: inset 0 1px 1px 0 rgba(255, 255, 255, 0.4);
background: #a46497;
background: linear-gradient(top, #a46497, #66405f), #a46497;
background: linear-gradient(to bottom, #a46497, #66405f), #a46497;
transition: width 1s ease;
}

progress::-moz-progress-bar {
border-radius: 3px;
box-shadow: inset 0 1px 1px 0 rgba(255, 255, 255, 0.4);
background: #a46497;
background: linear-gradient(top, #a46497, #66405f), #a46497;
background: linear-gradient(to bottom, #a46497, #66405f), #a46497;
transition: width 1s ease;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/css/woocommerce-rtl.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/woocommerce.css

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions assets/css/woocommerce.scss
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ p.demo_store,
}

&:hover {
background-color: $secondary - #111;
background-color: darken( $secondary, 5% );
text-decoration: none;
background-image: none;
color: $secondarytext;
Expand All @@ -745,7 +745,7 @@ p.demo_store,
-webkit-font-smoothing: antialiased;

&:hover {
background-color: $primary - #111;
background-color: darken( $primary, 5% );
color: $primarytext;
}

Expand Down Expand Up @@ -1420,7 +1420,7 @@ p.demo_store,
.select2-container,
input.input-text,
select {
border-color: $green - #111;
border-color: darken($green, 5%);
}
}

Expand Down Expand Up @@ -1674,7 +1674,7 @@ p.demo_store,

.price_slider_wrapper .ui-widget-content {
border-radius: 1em;
background-color: $primary - #444;
background-color: darken( $primary, 30% );
border: 0;
}

Expand Down
8 changes: 5 additions & 3 deletions assets/js/admin/meta-boxes-order.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ jQuery( function ( $ ) {
input_name = $state.attr( 'name' ),
input_id = $state.attr( 'id' ),
value = $this.data( 'woocommerce.stickState-' + country ) ? $this.data( 'woocommerce.stickState-' + country ) : $state.val(),
placeholder = $state.attr( 'placeholder' );
placeholder = $state.attr( 'placeholder' ),
$newstate;

if ( stickValue ){
$this.data( 'woocommerce.stickState-' + country, value );
Expand All @@ -55,7 +56,8 @@ jQuery( function ( $ ) {
if ( ! $.isEmptyObject( wc_meta_boxes_order.states[ country ] ) ) {
var state = wc_meta_boxes_order.states[ country ],
$defaultOption = $( '<option value=""></option>' )
.text( woocommerce_admin_meta_boxes_order.i18n_select_state_text ),
.text( woocommerce_admin_meta_boxes_order.i18n_select_state_text );

$newstate = $( '<select></select>' )
.prop( 'id', input_id )
.prop( 'name', input_name )
Expand All @@ -76,7 +78,7 @@ jQuery( function ( $ ) {

$newstate.show().selectWoo().hide().change();
} else {
var $newstate = $( '<input type="text" />' )
$newstate = $( '<input type="text" />' )
.prop( 'id', input_id )
.prop( 'name', input_name )
.prop( 'placeholder', placeholder )
Expand Down
2 changes: 1 addition & 1 deletion assets/js/admin/meta-boxes-order.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/frontend/checkout.min.js

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions assets/js/frontend/country-select.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,12 @@ jQuery( function( $ ) {
input_name = $statebox.attr( 'name' ),
input_id = $statebox.attr( 'id' ),
value = $statebox.val(),
placeholder = $statebox.attr( 'placeholder' ) || $statebox.attr( 'data-placeholder' ) || '';
placeholder = $statebox.attr( 'placeholder' ) || $statebox.attr( 'data-placeholder' ) || '',
$newstate;

if ( states[ country ] ) {
if ( $.isEmptyObject( states[ country ] ) ) {
var $newstate = $( '<input type="hidden" />' )
$newstate = $( '<input type="hidden" />' )
.prop( 'id', input_id )
.prop( 'name', input_name )
.prop( 'placeholder', placeholder )
Expand Down Expand Up @@ -144,7 +145,7 @@ jQuery( function( $ ) {
}
} else {
if ( $statebox.is( 'select, input[type="hidden"]' ) ) {
var $newstate = $( '<input type="text" />' )
$newstate = $( '<input type="text" />' )
.prop( 'id', input_id )
.prop( 'name', input_name )
.prop( 'placeholder', placeholder )
Expand Down
2 changes: 1 addition & 1 deletion assets/js/frontend/country-select.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/js/frontend/woocommerce.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion i18n/languages/woocommerce.pot
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WooCommerce 3.6.0-beta.1\n"
"Report-Msgid-Bugs-To: https://github.com/woocommerce/woocommerce/issues\n"
"POT-Creation-Date: 2019-03-15 12:21:00+00:00\n"
"POT-Creation-Date: 2019-03-20 20:07:47+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -9464,6 +9464,10 @@ msgstr ""
msgid "If you like %1$s please leave us a %2$s rating. A huge thanks in advance!"
msgstr ""

#: includes/admin/class-wc-admin.php:261
msgid "five star"
msgstr ""

#: includes/admin/class-wc-admin.php:261
msgid "Thanks :)"
msgstr ""
Expand Down
Loading

0 comments on commit 308d08f

Please sign in to comment.