diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss index eb8f606e87575..d62b3204baf88 100644 --- a/assets/css/_variables.scss +++ b/assets/css/_variables.scss @@ -8,14 +8,14 @@ $red: #a00; $orange: #ffba00; $blue: #2ea2cc; -$primary: #a46497; // Primary colour for buttons (alt) -$primarytext: desaturate(lighten($primary, 50%), 18%); // Text on primary colour bg +$primary: #a46497; // Primary color for buttons (alt) +$primarytext: desaturate(lighten($primary, 50%), 18%); // Text on primary color bg $secondary: desaturate(lighten($primary, 40%), 21%); // Secondary buttons -$secondarytext: desaturate(darken($secondary, 60%), 21%); // Text on secondary colour bg +$secondarytext: desaturate(darken($secondary, 60%), 21%); // Text on secondary color bg $highlight: adjust-hue($primary, 150deg); // Prices, In stock labels, sales flash -$highlightext: desaturate(lighten($highlight, 50%), 18%); // Text on highlight colour bg +$highlightext: desaturate(lighten($highlight, 50%), 18%); // Text on highlight color bg $contentbg: #fff; // Content BG - Tabs (active state) $subtext: #777; // small, breadcrumbs etc \ No newline at end of file diff --git a/dummy-data/dummy-data.xml b/dummy-data/dummy-data.xml index 84209805dde06..a8867b6d5fc43 100644 --- a/dummy-data/dummy-data.xml +++ b/dummy-data/dummy-data.xml @@ -3672,7 +3672,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_ 86.19.152.140 2013-06-07 11:54:51 2013-06-07 11:54:51 - + 1 0 @@ -3687,7 +3687,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_ akismet_as_submitted - + rating diff --git a/i18n/languages/woocommerce.pot b/i18n/languages/woocommerce.pot index 9149a137ffed2..70d22870e61c8 100644 --- a/i18n/languages/woocommerce.pot +++ b/i18n/languages/woocommerce.pot @@ -6145,7 +6145,7 @@ msgstr "" #: includes/admin/class-wc-admin-attributes.php:449 msgid "" -"Attributes let you define extra product data, such as size or colour. You " +"Attributes let you define extra product data, such as size or color. You " "can use these attributes in the shop sidebar using the \"layered nav\" " "widgets. Please note: you cannot rename an attribute later on." msgstr "" @@ -10561,39 +10561,39 @@ msgid "%s - Powered by WooCommerce" msgstr "" #: includes/admin/settings/class-wc-settings-emails.php:121 -msgid "Base colour" +msgid "Base color" msgstr "" #: includes/admin/settings/class-wc-settings-emails.php:123 #. translators: %s: default color -msgid "The base colour for WooCommerce email templates. Default %s." +msgid "The base color for WooCommerce email templates. Default %s." msgstr "" #: includes/admin/settings/class-wc-settings-emails.php:133 -msgid "Background colour" +msgid "Background color" msgstr "" #: includes/admin/settings/class-wc-settings-emails.php:135 #. translators: %s: default color -msgid "The background colour for WooCommerce email templates. Default %s." +msgid "The background color for WooCommerce email templates. Default %s." msgstr "" #: includes/admin/settings/class-wc-settings-emails.php:145 -msgid "Body background colour" +msgid "Body background color" msgstr "" #: includes/admin/settings/class-wc-settings-emails.php:147 #. translators: %s: default color -msgid "The main body background colour. Default %s." +msgid "The main body background color. Default %s." msgstr "" #: includes/admin/settings/class-wc-settings-emails.php:157 -msgid "Body text colour" +msgid "Body text color" msgstr "" #: includes/admin/settings/class-wc-settings-emails.php:159 #. translators: %s: default color -msgid "The main body text colour. Default %s." +msgid "The main body text color. Default %s." msgstr "" #: includes/admin/settings/class-wc-settings-emails.php:239 diff --git a/includes/admin/class-wc-admin-attributes.php b/includes/admin/class-wc-admin-attributes.php index 87bdbcac465e4..0007d8e3fa22e 100644 --- a/includes/admin/class-wc-admin-attributes.php +++ b/includes/admin/class-wc-admin-attributes.php @@ -446,7 +446,7 @@ public static function add_attribute() {

-

+

diff --git a/includes/admin/reports/class-wc-report-coupon-usage.php b/includes/admin/reports/class-wc-report-coupon-usage.php index 6aaad41ae24af..402859378646d 100644 --- a/includes/admin/reports/class-wc-report-coupon-usage.php +++ b/includes/admin/reports/class-wc-report-coupon-usage.php @@ -15,11 +15,11 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report { /** - * Chart colours. + * Chart colors. * * @var array */ - public $chart_colours = array(); + public $chart_colors = array(); /** * Coupon codes. @@ -107,14 +107,14 @@ public function get_chart_legend() { $legend[] = array( /* translators: %s: discount ammount */ 'title' => sprintf( __( '%s discounts in total', 'woocommerce' ), '' . wc_price( $total_discount ) . '' ), - 'color' => $this->chart_colours['discount_amount'], + 'color' => $this->chart_colors['discount_amount'], 'highlight_series' => 1, ); $legend[] = array( /* translators: %s: coupons ammount */ 'title' => sprintf( __( '%s coupons used in total', 'woocommerce' ), '' . $total_coupons . '' ), - 'color' => $this->chart_colours['coupon_count'], + 'color' => $this->chart_colors['coupon_count'], 'highlight_series' => 0, ); @@ -133,7 +133,7 @@ public function output_report() { '7day' => __( 'Last 7 days', 'woocommerce' ), ); - $this->chart_colours = array( + $this->chart_colors = array( 'discount_amount' => '#3498db', 'coupon_count' => '#d4d9dc', ); @@ -460,8 +460,8 @@ public function get_main_chart() { { label: "", data: order_data.order_coupon_counts, - color: 'chart_colours['coupon_count']; ?>', - bars: { fillColor: 'chart_colours['coupon_count']; ?>', fill: true, show: true, lineWidth: 0, barWidth: barwidth; ?> * 0.5, align: 'center' }, + color: 'chart_colors['coupon_count']; ?>', + bars: { fillColor: 'chart_colors['coupon_count']; ?>', fill: true, show: true, lineWidth: 0, barWidth: barwidth; ?> * 0.5, align: 'center' }, shadowSize: 0, hoverable: false }, @@ -469,7 +469,7 @@ public function get_main_chart() { label: "", data: order_data.order_discount_amounts, yaxis: 2, - color: 'chart_colours['discount_amount']; ?>', + color: 'chart_colors['discount_amount']; ?>', points: { show: true, radius: 5, lineWidth: 3, fillColor: '#fff', fill: true }, lines: { show: true, lineWidth: 4, fill: false }, shadowSize: 0, diff --git a/includes/admin/reports/class-wc-report-customers.php b/includes/admin/reports/class-wc-report-customers.php index 477369c23b985..a2b300cad4273 100644 --- a/includes/admin/reports/class-wc-report-customers.php +++ b/includes/admin/reports/class-wc-report-customers.php @@ -15,11 +15,11 @@ class WC_Report_Customers extends WC_Admin_Report { /** - * Chart colours. + * Chart colors. * * @var array */ - public $chart_colours = array(); + public $chart_colors = array(); /** * Customers. @@ -39,7 +39,7 @@ public function get_chart_legend() { $legend[] = array( /* translators: %s: signups ammount */ 'title' => sprintf( __( '%s signups in this period', 'woocommerce' ), '' . sizeof( $this->customers ) . '' ), - 'color' => $this->chart_colours['signups'], + 'color' => $this->chart_colors['signups'], 'highlight_series' => 2, ); @@ -106,8 +106,8 @@ public function customers_vs_guests() {
    -
    • -
    • +
    • +