Skip to content

Commit

Permalink
colour -> color
Browse files Browse the repository at this point in the history 
woocommerce#12627
  • Loading branch information
@mikejolley
mikejolley committed Dec 19, 2016
1 parent 81f4cad commit 2e77e38
Show file tree
Hide file tree
Showing 13 changed files with 87 additions and 87 deletions.
8 changes: 4 additions & 4 deletions assets/css/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions dummy-data/dummy-data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3672,7 +3672,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
<wp:comment_author_IP>86.19.152.140</wp:comment_author_IP>
<wp:comment_date>2013-06-07 11:54:51</wp:comment_date>
<wp:comment_date_gmt>2013-06-07 11:54:51</wp:comment_date_gmt>
<wp:comment_content><![CDATA[I bought this thinking it was a nice green colour, apparently it GREY! I'm colour blind so I don't care but my girlfriend says grey makes me look fat]]></wp:comment_content>
<wp:comment_content><![CDATA[I bought this thinking it was a nice green color, apparently it GREY! I'm color blind so I don't care but my girlfriend says grey makes me look fat]]></wp:comment_content>
<wp:comment_approved>1</wp:comment_approved>
<wp:comment_type></wp:comment_type>
<wp:comment_parent>0</wp:comment_parent>
Expand All @@ -3687,7 +3687,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
</wp:commentmeta>
<wp:commentmeta>
<wp:meta_key>akismet_as_submitted</wp:meta_key>
<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:53;s:14:"comment_author";s:6:"Andrew";s:20:"comment_author_email";s:25:"[email protected]";s:18:"comment_author_url";N;s:15:"comment_content";s:149:"I bought this thinking it was a nice green colour, apparently it GREY! I'm colour blind so I don't care but my girlfriend says grey makes me look fat";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.19.152.140";s:10:"user_agent";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Andrew";s:10:"POST_email";s:25:"[email protected]";s:11:"POST_rating";s:1:"1";s:12:"POST_comment";s:149:"I bought this thinking it was a nice green colour, apparently it GREY! I'm colour blind so I don't care but my girlfriend says grey makes me look fat";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/happy-ninja-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"53";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"d96b507062";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"387";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.19.152.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"55431";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606091";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:38";}]]></wp:meta_value>
<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:53;s:14:"comment_author";s:6:"Andrew";s:20:"comment_author_email";s:25:"[email protected]";s:18:"comment_author_url";N;s:15:"comment_content";s:149:"I bought this thinking it was a nice green color, apparently it GREY! I'm color blind so I don't care but my girlfriend says grey makes me look fat";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.19.152.140";s:10:"user_agent";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Andrew";s:10:"POST_email";s:25:"[email protected]";s:11:"POST_rating";s:1:"1";s:12:"POST_comment";s:149:"I bought this thinking it was a nice green color, apparently it GREY! I'm color blind so I don't care but my girlfriend says grey makes me look fat";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/happy-ninja-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"53";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"d96b507062";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"387";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.19.152.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"55431";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606091";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:38";}]]></wp:meta_value>
</wp:commentmeta>
<wp:commentmeta>
<wp:meta_key>rating</wp:meta_key>
Expand Down
18 changes: 9 additions & 9 deletions i18n/languages/woocommerce.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/class-wc-admin-attributes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ public static function add_attribute() {
<div class="col-wrap">
<div class="form-wrap">
<h2><?php _e( 'Add new attribute', 'woocommerce' ); ?></h2>
<p><?php _e( 'Attributes let you define extra product data, such as size or colour. You can use these attributes in the shop sidebar using the "layered nav" widgets. Please note: you cannot rename an attribute later on.', 'woocommerce' ); ?></p>
<p><?php _e( '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.', 'woocommerce' ); ?></p>
<form action="edit.php?post_type=product&amp;page=product_attributes" method="post">
<?php do_action( 'woocommerce_before_add_attribute_fields' ) ?>

Expand Down
16 changes: 8 additions & 8 deletions includes/admin/reports/class-wc-report-coupon-usage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -107,14 +107,14 @@ public function get_chart_legend() {
$legend[] = array(
/* translators: %s: discount ammount */
'title' => sprintf( __( '%s discounts in total', 'woocommerce' ), '<strong>' . wc_price( $total_discount ) . '</strong>' ),
'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' ), '<strong>' . $total_coupons . '</strong>' ),
'color' => $this->chart_colours['coupon_count'],
'color' => $this->chart_colors['coupon_count'],
'highlight_series' => 0,
);

Expand All @@ -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',
);
Expand Down Expand Up @@ -460,16 +460,16 @@ public function get_main_chart() {
{
label: "<?php echo esc_js( __( 'Number of coupons used', 'woocommerce' ) ) ?>",
data: order_data.order_coupon_counts,
color: '<?php echo $this->chart_colours['coupon_count']; ?>',
bars: { fillColor: '<?php echo $this->chart_colours['coupon_count']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
color: '<?php echo $this->chart_colors['coupon_count']; ?>',
bars: { fillColor: '<?php echo $this->chart_colors['coupon_count']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
shadowSize: 0,
hoverable: false
},
{
label: "<?php echo esc_js( __( 'Discount amount', 'woocommerce' ) ) ?>",
data: order_data.order_discount_amounts,
yaxis: 2,
color: '<?php echo $this->chart_colours['discount_amount']; ?>',
color: '<?php echo $this->chart_colors['discount_amount']; ?>',
points: { show: true, radius: 5, lineWidth: 3, fillColor: '#fff', fill: true },
lines: { show: true, lineWidth: 4, fill: false },
shadowSize: 0,
Expand Down
26 changes: 13 additions & 13 deletions includes/admin/reports/class-wc-report-customers.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -39,7 +39,7 @@ public function get_chart_legend() {
$legend[] = array(
/* translators: %s: signups ammount */
'title' => sprintf( __( '%s signups in this period', 'woocommerce' ), '<strong>' . sizeof( $this->customers ) . '</strong>' ),
'color' => $this->chart_colours['signups'],
'color' => $this->chart_colors['signups'],
'highlight_series' => 2,
);

Expand Down Expand Up @@ -106,8 +106,8 @@ public function customers_vs_guests() {
<div class="chart-container">
<div class="chart-placeholder customers_vs_guests pie-chart" style="height:200px"></div>
<ul class="pie-chart-legend">
<li style="border-color: <?php echo $this->chart_colours['customers']; ?>"><?php _e( 'Customer sales', 'woocommerce' ); ?></li>
<li style="border-color: <?php echo $this->chart_colours['guests']; ?>"><?php _e( 'Guest sales', 'woocommerce' ); ?></li>
<li style="border-color: <?php echo $this->chart_colors['customers']; ?>"><?php _e( 'Customer sales', 'woocommerce' ); ?></li>
<li style="border-color: <?php echo $this->chart_colors['guests']; ?>"><?php _e( 'Guest sales', 'woocommerce' ); ?></li>
</ul>
</div>
<script type="text/javascript">
Expand All @@ -118,12 +118,12 @@ public function customers_vs_guests() {
{
label: '<?php _e( 'Customer orders', 'woocommerce' ); ?>',
data: "<?php echo $customer_order_totals->total_orders ?>",
color: '<?php echo $this->chart_colours['customers']; ?>'
color: '<?php echo $this->chart_colors['customers']; ?>'
},
{
label: '<?php _e( 'Guest orders', 'woocommerce' ); ?>',
data: "<?php echo $guest_order_totals->total_orders ?>",
color: '<?php echo $this->chart_colours['guests']; ?>'
color: '<?php echo $this->chart_colors['guests']; ?>'
}
],
{
Expand Down Expand Up @@ -166,7 +166,7 @@ public function output_report() {
'7day' => __( 'Last 7 days', 'woocommerce' ),
);

$this->chart_colours = array(
$this->chart_colors = array(
'signups' => '#3498db',
'customers' => '#1abc9c',
'guests' => '#8fdece',
Expand Down Expand Up @@ -315,8 +315,8 @@ public function get_main_chart() {
{
label: "<?php echo esc_js( __( 'Customer orders', 'woocommerce' ) ) ?>",
data: chart_data.customer_orders,
color: '<?php echo $this->chart_colours['customers']; ?>',
bars: { fillColor: '<?php echo $this->chart_colours['customers']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
color: '<?php echo $this->chart_colors['customers']; ?>',
bars: { fillColor: '<?php echo $this->chart_colors['customers']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
shadowSize: 0,
enable_tooltip: true,
append_tooltip: "<?php echo ' ' . __( 'customer orders', 'woocommerce' ); ?>",
Expand All @@ -325,8 +325,8 @@ public function get_main_chart() {
{
label: "<?php echo esc_js( __( 'Guest orders', 'woocommerce' ) ) ?>",
data: chart_data.guest_orders,
color: '<?php echo $this->chart_colours['guests']; ?>',
bars: { fillColor: '<?php echo $this->chart_colours['guests']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
color: '<?php echo $this->chart_colors['guests']; ?>',
bars: { fillColor: '<?php echo $this->chart_colors['guests']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
shadowSize: 0,
enable_tooltip: true,
append_tooltip: "<?php echo ' ' . __( 'guest orders', 'woocommerce' ); ?>",
Expand All @@ -335,7 +335,7 @@ public function get_main_chart() {
{
label: "<?php echo esc_js( __( 'Signups', 'woocommerce' ) ) ?>",
data: chart_data.signups,
color: '<?php echo $this->chart_colours['signups']; ?>',
color: '<?php echo $this->chart_colors['signups']; ?>',
points: { show: true, radius: 5, lineWidth: 3, fillColor: '#fff', fill: true },
lines: { show: true, lineWidth: 4, fill: false },
shadowSize: 0,
Expand Down
Loading

0 comments on commit 2e77e38

Please sign in to comment.