Skip to content

Commit

Permalink
docs(colors): harmonize wording by using color instead of colour
Browse files Browse the repository at this point in the history
  • Loading branch information
ffoodd committed Dec 20, 2019
1 parent 9c2ef64 commit ab28eeb
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
20 changes: 10 additions & 10 deletions site/_data/brand-colors.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- category: Core colours
name: "Core colours"
colours:
- category: Core colors
name: "Core colors"
colors:
- name: White
class: white
hex: "#fff"
Expand All @@ -13,9 +13,9 @@
- name: Digital Orange 2
class: primary
hex: "#f16e00"
- category: Functionnal colours
name: "Functionnal colours"
colours:
- category: Functionnal colors
name: "Functionnal colors"
colors:
- name: Green
class: success
hex: "#32c832"
Expand All @@ -28,9 +28,9 @@
- name: Red
class: danger
hex: "#cd3c14"
- category: Supporting colours
name: "Supporting colours"
colours:
- category: Supporting colors
name: "Supporting colors"
colors:
- name: Blue
class: cyan
hex: "#4bb4e6"
Expand All @@ -48,7 +48,7 @@
hex: "#ffb4e6"
- category: Greys
name: "Greys"
colours:
colors:
- name: 100
class: 100
hex: "#fafafa"
Expand Down
10 changes: 5 additions & 5 deletions site/docs/4.4/about/brand.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,25 +116,25 @@ It’s possible to animate the Small logo; however this process is strictly mana
Apply the Small logo correctly by avoiding the following:


1. Never change the colour of the line, even in animation.
1. Never change the color of the line, even in animation.
2. The line always has a solid, white fill. It is never transparent.
3. Never use the trademark symbol.
4. Never change the size of the line - it allows optimal readbility in small sizes and represents the name “Orange” from the Master logo.
5. Never change the colourways of the Small logo.



## Colour palette
## Color palette

This is Orange Web UI colour palette, as specified in Orange Web UI Kits.
This is Orange Web UI color palette, as specified in Orange Web UI Kits.
Please refer to the [accessibility's color contrast section]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/accessibility/#color-contrast) before trying using this, in order to ensure sufficient contrasts,
and prefer using [`.text-*` and `.bg-*` utilities]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/colors/) to set colours, since they lock `color` and `background-color` altogether to ensure sufficient contrasts.
and prefer using [`.text-*` and `.bg-*` utilities]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/colors/) to set colors, since they lock `color` and `background-color` altogether to ensure sufficient contrasts.
<div class="my-5">
{% for category in site.data.brand-colors %}
<div class="row my-3">
<h3 class="h4 col col-md-4 col-lg-2 mb-0">{{ category.name }}</h3>
<div class="col col-md-8 col-lg-10 row row-cols-2 row-cols-md-4 row-cols-lg-6">
{% for color in category.colours %}
{% for color in category.colors %}
<figure class="col" role="figure" aria-label="{{ color.name | capitalize }}">
<svg width="100%" height="6rem" role="img" aria-label="{{ color.name | capitalize }}">
<rect fill="{{ color.hex }}" width="100%" height="100%"/>
Expand Down
2 changes: 1 addition & 1 deletion site/docs/4.4/getting-started/accessibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Because Boosted's components are purposely designed to be fairly generic, author
### Color contrast

[comment]: # Boosted mod
Some colors that currently make up [Boosted's default palette]({{ site.baseurl }}/docs/{{ site.docs_version }}/about/brand/#colour-palette) —used throughout the framework for things such as button variations, alert variations, form validation indicators— may lead to *insufficient* color contrast.
Some colors that currently make up [Boosted's default palette]({{ site.baseurl }}/docs/{{ site.docs_version }}/about/brand/#color-palette) —used throughout the framework for things such as button variations, alert variations, form validation indicators— may lead to *insufficient* color contrast.

#### Ensuring contrasts

Expand Down
2 changes: 1 addition & 1 deletion site/docs/4.4/utilities/colors.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ toc: true
## Accessibility

When using `.text-*` and `.bg-*` utilities, **contrasts are locked to ensure they're sufficient** by defining `color` and `background-color` altogether.
Please refer to [accessibility's color contrast section]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/accessibility/#color-contrast) to have a full preview of Boosted colour palette's contrast ratios.
Please refer to [accessibility's color contrast section]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/accessibility/#color-contrast) to have a full preview of Boosted color palette's contrast ratios.

[comment]: # end mod

Expand Down

0 comments on commit ab28eeb

Please sign in to comment.