Skip to content

Commit

Permalink
Merge pull request #497 from 3YOURMIND/remove-more-british-english
Browse files Browse the repository at this point in the history
chore(documentation): Remove More British English
  • Loading branch information
FlorianWendelborn committed Sep 14, 2021
2 parents 2731714 + b57f657 commit bfd2f87
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions packages/documentation/components/ColorPalette.vue
Expand Up @@ -48,8 +48,8 @@ export default {
},
textColor(colorName) {
if (
colorName === 'Lightgrey-300' ||
colorName === 'Lightgrey-400' ||
colorName === 'Lightgray-300' ||
colorName === 'Lightgray-400' ||
colorName === 'White-000' ||
colorName === 'Yellow-300' ||
colorName === 'Yellow-400'
Expand Down
30 changes: 15 additions & 15 deletions packages/documentation/components/ColorUsage.vue
Expand Up @@ -9,51 +9,51 @@
</li>
<li><b>Green:</b> Success or progress, which gives positive feedback.</li>
<li><b>Red:</b> signals attention or danger.</li>
<li><b>Darkgrey:</b> neutral color.</li>
<li><b>Lightgrey:</b> neutral color.</li>
<li><b>Darkgray:</b> neutral color.</li>
<li><b>Lightgray:</b> neutral color.</li>
</ul>
<h3>Dark text on light background</h3>
<div class="example-wrapper">
<div class="example-content light">
<div style="color: #3d3d3d">Default text <code>Darkgrey-500</code></div>
<div style="color: #3d3d3d">Default text <code>Darkgray-500</code></div>
<div style="color: #575757">
Secondary text <code>Darkgrey-400</code>
Secondary text <code>Darkgray-400</code>
</div>
<div style="color: #8a8a8a">
Disabled / hint text <code>Darkgrey-300</code>
Disabled / hint text <code>Darkgray-300</code>
</div>
</div>
</div>
<p>
Depends on text meaning and hierarchy, there are three different types:
</p>
<ul>
<li><b>Default text</b> should be <code>Darkgrey-500</code>.</li>
<li><b>Default text</b> should be <code>Darkgray-500</code>.</li>
<li>
<b>Secondary text, which is lower in the visual hierarchy,</b> uses
<code>Darkgrey-400</code>.
<code>Darkgray-400</code>.
</li>
<li><b>Disabled / hint text</b> should be <code>Darkgrey-300</code>.</li>
<li><b>Disabled / hint text</b> should be <code>Darkgray-300</code>.</li>
</ul>
<h3>Light text on dark background</h3>
<div class="example-wrapper">
<div class="example-content dark">
<div style="color: #f8f8f8">
Default text <code>LightGrey-300</code>
Default text <code>Lightgray-300</code>
</div>
<div style="color: #dbdbdb">
Secondary text <code>Lightgrey-400</code>
Secondary text <code>Lightgray-400</code>
</div>
<div style="color: #a8a8a8">
Disabled / hint text <code>Lightgrey-500</code>
Disabled / hint text <code>Lightgray-500</code>
</div>
</div>
</div>
<p>Similar to light text, there are three different types:</p>
<ul>
<li><b>Default text</b> should be <code>Lightgrey-300</code>.</li>
<li><b>Secondary text</b> uses <code>Lightgrey-400</code>.</li>
<li><b>Disabled / hint text</b> should be <code>Lightgrey-500</code>.</li>
<li><b>Default text</b> should be <code>Lightgray-300</code>.</li>
<li><b>Secondary text</b> uses <code>Lightgray-400</code>.</li>
<li><b>Disabled / hint text</b> should be <code>Lightgray-500</code>.</li>
</ul>
<h3>Light text on color background</h3>
<div class="example-wrapper">
Expand Down Expand Up @@ -105,7 +105,7 @@
<ul>
<li>
<b>If icon is supplementary to default text:</b> Icon color should be
<code>Darkgrey-300</code>.
<code>Darkgray-300</code>.
</li>
<li>
<b>If icon has color background:</b> Icon color is <code>White</code>.
Expand Down

0 comments on commit bfd2f87

Please sign in to comment.