Merge pull request #332 from danielbayerlein/update-variables

[Documentation] Update initial variables
This commit is contained in:
Jeremy Thomas 2016-10-04 20:58:20 +01:00 committed by GitHub
commit c52a3da371

View File

@ -64,47 +64,46 @@ doc-subtab: variables
<tr><th colspan="2">1. Initial variables</th></tr> <tr><th colspan="2">1. Initial variables</th></tr>
<tr><th colspan="2">Colors</th></tr> <tr><th colspan="2">Colors</th></tr>
<tr> <tr>
<td><code>$black</code></td> <td><code>$black</code></td>
<td> <td>
<span class="color" style="background-color: #111;"></span> <span class="color" style="background-color: #0a0a0a;"></span>
#111 #0a0a0a
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>$grey-darker</code></td> <td><code>$grey-darker</code></td>
<td> <td>
<span class="color" style="background-color: #222324;"></span> <span class="color" style="background-color: #363636;"></span>
#222324 #363636
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>$grey-dark</code></td> <td><code>$grey-dark</code></td>
<td> <td>
<span class="color" style="background-color: #69707a;"></span> <span class="color" style="background-color: #4a4a4a;"></span>
#69707a #4a4a4a
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>$grey</code></td> <td><code>$grey</code></td>
<td> <td>
<span class="color" style="background-color: #aeb1b5;"></span> <span class="color" style="background-color: #7a7a7a;"></span>
#aeb1b5 #7a7a7a
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>$grey-light</code></td> <td><code>$grey-light</code></td>
<td> <td>
<span class="color" style="background-color: #d3d6db;"></span> <span class="color" style="background-color: #b5b5b5;"></span>
#d3d6db #b5b5b5
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>$grey-lighter</code></td> <td><code>$grey-lighter</code></td>
<td> <td>
<span class="color" style="background-color: #f5f7fa;"></span> <span class="color" style="background-color: #dbdbdb;"></span>
#f5f7fa #dbdbdb
</td> </td>
</tr> </tr>
<tr> <tr>
@ -117,192 +116,381 @@ doc-subtab: variables
<tr> <tr>
<td><code>$blue</code></td> <td><code>$blue</code></td>
<td> <td>
<span class="color" style="background-color: #42afe3;"></span> <span class="color" style="background-color: #3273dc;"></span>
#42afe3 #3273dc
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>$green</code></td> <td><code>$green</code></td>
<td> <td>
<span class="color" style="background-color: #97cd76;"></span> <span class="color" style="background-color: #23d160;"></span>
#97cd76 #23d160
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>$orange</code></td> <td><code>$orange</code></td>
<td> <td>
<span class="color" style="background-color: #f68b39;"></span> <span class="color" style="background-color: #ff470f;"></span>
#f68b39 #ff470f
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>$purple</code></td> <td><code>$purple</code></td>
<td> <td>
<span class="color" style="background-color: #847bb9;"></span> <span class="color" style="background-color: #b86bff;"></span>
#847bb9 #b86bff
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>$red</code></td> <td><code>$red</code></td>
<td> <td>
<span class="color" style="background-color: #ed6c63;"></span> <span class="color" style="background-color: #ff3860;"></span>
#ed6c63 #ff3860
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>$turquoise</code></td> <td><code>$turquoise</code></td>
<td> <td>
<span class="color" style="background-color: #1fc8db;"></span> <span class="color" style="background-color: #00d1b2;"></span>
#1fc8db #00d1b2
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>$yellow</code></td> <td><code>$yellow</code></td>
<td> <td>
<span class="color" style="background-color: #fce473;"></span> <span class="color" style="background-color: #ffdd57;"></span>
#fce473 #ffdd57
</td> </td>
</tr> </tr>
<tr><th colspan="2">Typography</th></tr> <tr><th colspan="2">Typography</th></tr>
<tr>
<tr><td><code>$family-sans-serif</code></td><td>"Helvetica Neue", "Helvetica", "Arial", sans-serif</td></tr> <td><code>$family-sans-serif</code></td>
<tr><td><code>$family-monospace</code></td><td>"Source Code Pro", "Monaco", "Inconsolata", monospace</td></tr> <td>-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif</td>
</tr>
<tr><td><code>$size-1</code></td><td>48px</td></tr> <tr>
<tr><td><code>$size-2</code></td><td>40px</td></tr> <td><code>$family-monospace</code></td>
<tr><td><code>$size-3</code></td><td>28px</td></tr> <td>"Inconsolata", "Consolas", "Monaco", monospace</td>
<tr><td><code>$size-4</code></td><td>24px</td></tr> </tr>
<tr><td><code>$size-5</code></td><td>18px</td></tr> <tr>
<tr><td><code>$size-6</code></td><td>14px</td></tr> <td><code>$size-1</code></td>
<td>48px</td>
<tr><td><code>$size-7</code></td><td>11px</td></tr> </tr>
<tr>
<tr><td><code>$weight-normal</code></td><td>400</td></tr> <td><code>$size-2</code></td>
<tr><td><code>$weight-bold</code></td><td>700</td></tr> <td>40px</td>
<tr><td><code>$weight-title-normal</code></td><td>300</td></tr> </tr>
<tr><td><code>$weight-title-bold</code></td><td>500</td></tr> <tr>
<td><code>$size-3</code></td>
<td>28px</td>
</tr>
<tr>
<td><code>$size-4</code></td>
<td>24px</td>
</tr>
<tr>
<td><code>$size-5</code></td>
<td>18px</td>
</tr>
<tr>
<td><code>$size-6</code></td>
<td>14px</td>
</tr>
<tr>
<td><code>$size-7</code></td>
<td>11px</td>
</tr>
<tr>
<td><code>$weight-normal</code></td>
<td>400</td>
</tr>
<tr>
<td><code>$weight-bold</code></td>
<td>700</td>
</tr>
<tr>
<td><code>$weight-title-normal</code></td>
<td>300</td>
</tr>
<tr>
<td><code>$weight-title-bold</code></td>
<td>500</td>
</tr>
<tr><th colspan="2">Breakpoints</th></tr> <tr><th colspan="2">Breakpoints</th></tr>
<tr>
<tr><td><code>$tablet</code></td><td>769px</td></tr> <td><code>$tablet</code></td>
<tr><td><code>$desktop</code></td><td>980px</td></tr> <td>769px</td>
<tr><td><code>$widescreen</code></td><td>1180px</td></tr> </tr>
<tr>
<td><code>$desktop</code></td>
<td>980px</td>
</tr>
<tr>
<td><code>$widescreen</code></td>
<td>1180px</td>
</tr>
<tr><th colspan="2">Miscellaneous</th></tr> <tr><th colspan="2">Miscellaneous</th></tr>
<tr>
<tr><td><code>$easing</code></td><td>ease-out</td></tr> <td><code>$easing</code></td>
<tr><td><code>$radius</code></td><td>3px</td></tr> <td>ease-out</td>
<tr><td><code>$speed</code></td><td>86ms</td></tr> </tr>
<tr>
<td><code>$radius</code></td>
<td>3px</td>
</tr>
<tr>
<td><code>$speed</code></td>
<td>86ms</td>
</tr>
<tr><th colspan="2">2. Primary colors</th></tr> <tr><th colspan="2">2. Primary colors</th></tr>
<tr>
<tr><td><code>$primary</code></td><td>$turquoise</td></tr> <td><code>$primary</code></td>
<td>$turquoise</td>
<tr><td><code>$info</code></td><td>$blue</td></tr> </tr>
<tr><td><code>$success</code></td><td>$green</td></tr> <tr>
<tr><td><code>$warning</code></td><td>$yellow</td></tr> <td><code>$info</code></td>
<tr><td><code>$danger</code></td><td>$red</td></tr> <td>$blue</td>
</tr>
<tr><td><code>$light</code></td><td>$grey-lighter</td></tr> <tr>
<tr><td><code>$dark</code></td><td>$grey-dark</td></tr> <td><code>$success</code></td>
<td>$green</td>
<tr><td><code>$text</code></td><td>$grey-dark</td></tr> </tr>
<tr>
<td><code>$warning</code></td>
<td>$yellow</td>
</tr>
<tr>
<td><code>$danger</code></td>
<td>$red</td>
</tr>
<tr>
<td><code>$light</code></td>
<td>$grey-lighter</td>
</tr>
<tr>
<td><code>$dark</code></td>
<td>$grey-dark</td>
</tr>
<tr>
<td><code>$text</code></td>
<td>$grey-dark</td>
</tr>
<tr><th colspan="2">3. Generated variables</th></tr> <tr><th colspan="2">3. Generated variables</th></tr>
<tr><th colspan="2">Invert colors</th></tr> <tr><th colspan="2">Invert colors</th></tr>
<tr>
<tr><td><code>$primary-invert</code></td><td>findColorInvert($primary)</td></tr> <td><code>$primary-invert</code></td>
<td>findColorInvert($primary)</td>
<tr><td><code>$info-invert</code></td><td>findColorInvert($info)</td></tr> </tr>
<tr><td><code>$success-invert</code></td><td>findColorInvert($success)</td></tr> <tr>
<tr><td><code>$warning-invert</code></td><td>findColorInvert($warning)</td></tr> <td><code>$info-invert</code></td>
<tr><td><code>$danger-invert</code></td><td>findColorInvert($danger)</td></tr> <td>findColorInvert($info)</td>
</tr>
<tr><td><code>$light-invert</code></td><td>$dark</td></tr> <tr>
<tr><td><code>$dark-invert</code></td><td>$light</td></tr> <td><code>$success-invert</code></td>
<td>findColorInvert($success)</td>
</tr>
<tr>
<td><code>$warning-invert</code></td>
<td>findColorInvert($warning)</td>
</tr>
<tr>
<td><code>$danger-invert</code></td>
<td>findColorInvert($danger)</td>
</tr>
<tr>
<td><code>$light-invert</code></td>
<td>$dark</td>
</tr>
<tr>
<td><code>$dark-invert</code></td>
<td>$light</td>
</tr>
<tr><th colspan="2">General colors</th></tr> <tr><th colspan="2">General colors</th></tr>
<tr>
<tr><td><code>$body-background</code></td><td>$grey-lighter</td></tr> <td><code>$body-background</code></td>
<td>$grey-lighter</td>
<tr><td><code>$background</code></td><td>$grey-lighter</td></tr> </tr>
<tr>
<tr><td><code>$border</code></td><td>$grey-light</td></tr> <td><code>$background</code></td>
<tr><td><code>$border-hover</code></td><td>$grey</td></tr> <td>$grey-lighter</td>
</tr>
<tr>
<td><code>$border</code></td>
<td>$grey-light</td>
</tr>
<tr>
<td><code>$border-hover</code></td>
<td>$grey</td>
</tr>
<tr><th colspan="2">Text colors</th></tr> <tr><th colspan="2">Text colors</th></tr>
<tr>
<tr><td><code>$text-invert</code></td><td>findColorInvert($text)</td></tr> <td><code>$text-invert</code></td>
<tr><td><code>$text-light</code></td><td>$grey</td></tr> <td>findColorInvert($text)</td>
<tr><td><code>$text-strong</code></td><td>$grey-darker</td></tr> </tr>
<tr>
<td><code>$text-light</code></td>
<td>$grey</td>
</tr>
<tr>
<td><code>$text-strong</code></td>
<td>$grey-darker</td>
</tr>
<tr><th colspan="2">Code colors</th></tr> <tr><th colspan="2">Code colors</th></tr>
<tr>
<tr><td><code>$code</code></td><td>$red</td></tr> <td><code>$code</code></td>
<tr><td><code>$code-background</code></td><td>$background</td></tr> <td>$red</td>
</tr>
<tr><td><code>$pre</code></td><td>$text</td></tr> <tr>
<tr><td><code>$pre-background</code></td><td>$background</td></tr> <td><code>$code-background</code></td>
<td>$background</td>
</tr>
<tr>
<td><code>$pre</code></td>
<td>$text</td>
</tr>
<tr>
<td><code>$pre-background</code></td>
<td>$background</td>
</tr>
<tr><th colspan="2">Link colors</th></tr> <tr><th colspan="2">Link colors</th></tr>
<tr>
<tr><td><code>$link</code></td><td>$primary</td></tr> <td><code>$link</code></td>
<tr><td><code>$link-invert</code></td><td>$primary-invert</td></tr> <td>$primary</td>
<tr><td><code>$link-visited</code></td><td>$purple</td></tr> </tr>
<tr>
<tr><td><code>$link-hover</code></td><td>$grey-darker</td></tr> <td><code>$link-invert</code></td>
<tr><td><code>$link-hover-background</code></td><td>$grey-lighter</td></tr> <td>$primary-invert</td>
<tr><td><code>$link-hover-border</code></td><td>$grey-darker</td></tr> </tr>
<tr>
<tr><td><code>$link-active</code></td><td>$grey-darker</td></tr> <td><code>$link-visited</code></td>
<tr><td><code>$link-active-border</code></td><td>$grey-darker</td></tr> <td>$purple</td>
</tr>
<tr>
<td><code>$link-hover</code></td>
<td>$grey-darker</td>
</tr>
<tr>
<td><code>$link-hover-background</code></td>
<td>$grey-lighter</td>
</tr>
<tr>
<td><code>$link-hover-border</code></td>
<td>$grey-darker</td>
</tr>
<tr>
<td><code>$link-active</code></td>
<td>$grey-darker</td>
</tr>
<tr>
<td><code>$link-active-border</code></td>
<td>$grey-darker</td>
</tr>
<tr><th colspan="2">Control colors</th></tr> <tr><th colspan="2">Control colors</th></tr>
<tr>
<tr><td><code>$control</code></td><td>$text-strong</td></tr> <td><code>$control</code></td>
<tr><td><code>$control-background</code></td><td>$text-invert</td></tr> <td>$text-strong</td>
<tr><td><code>$control-border</code></td><td>$border</td></tr> </tr>
<tr>
<tr><td><code>$control-hover</code></td><td>$link-hover</td></tr> <td><code>$control-background</code></td>
<tr><td><code>$control-hover-border</code></td><td>$border-hover</td></tr> <td>$text-invert</td>
</tr>
<tr><td><code>$control-active</code></td><td>$link</td></tr> <tr>
<tr><td><code>$control-active-background</code></td><td>$link</td></tr> <td><code>$control-border</code></td>
<tr><td><code>$control-active-background-invert</code></td><td>$link-invert</td></tr> <td>$border</td>
<tr><td><code>$control-active-border</code></td><td>$link</td></tr> </tr>
<tr>
<td><code>$control-hover</code></td>
<td>$link-hover</td>
</tr>
<tr>
<td><code>$control-hover-border</code></td>
<td>$border-hover</td>
</tr>
<tr>
<td><code>$control-active</code></td>
<td>$link</td>
</tr>
<tr>
<td><code>$control-active-background</code></td>
<td>$link</td>
</tr>
<tr>
<td><code>$control-active-background-invert</code></td>
<td>$link-invert</td>
</tr>
<tr>
<td><code>$control-active-border</code></td>
<td>$link</td>
</tr>
<tr><th colspan="2">Typography</th></tr> <tr><th colspan="2">Typography</th></tr>
<tr>
<tr><td><code>$family-primary</code></td><td>$family-sans-serif</td></tr> <td><code>$family-primary</code></td>
<tr><td><code>$family-code</code></td><td>$family-monospace</td></tr> <td>$family-sans-serif</td>
</tr>
<tr><td><code>$size-small</code></td><td>$size-7</td></tr> <tr>
<tr><td><code>$size-normal</code></td><td>$size-6</td></tr> <td><code>$family-code</code></td>
<tr><td><code>$size-medium</code></td><td>$size-5</td></tr> <td>$family-monospace</td>
<tr><td><code>$size-large</code></td><td>$size-3</td></tr> </tr>
<tr><td><code>$size-huge</code></td><td>$size-1</td></tr> <tr>
<td><code>$size-small</code></td>
<td>$size-7</td>
</tr>
<tr>
<td><code>$size-normal</code></td>
<td>$size-6</td>
</tr>
<tr>
<td><code>$size-medium</code></td>
<td>$size-5</td>
</tr>
<tr>
<td><code>$size-large</code></td>
<td>$size-3</td>
</tr>
<tr>
<td><code>$size-huge</code></td>
<td>$size-1</td>
</tr>
<tr><th colspan="2">4. Lists and maps</th></tr> <tr><th colspan="2">4. Lists and maps</th></tr>
<tr> <tr>
<td><code>$colors</code> <td><code>$colors</code>
<td> <td>
(white: ($white, $black),<br> (white: ($white, $black),
black: ($black, $white),<br> <br>
light: ($light, $light-invert),<br> black: ($black, $white),
dark: ($dark, $dark-invert),<br> <br>
primary: ($primary, $primary-invert),<br> light: ($light, $light-invert),
info: ($info, $info-invert),<br> <br>
success: ($success, $success-invert),<br> dark: ($dark, $dark-invert),
warning: ($warning, $warning-invert),<br> <br>
primary: ($primary, $primary-invert),
<br>
info: ($info, $info-invert),
<br>
success: ($success, $success-invert),
<br>
warning: ($warning, $warning-invert),
<br>
danger: ($danger, $danger-invert)) danger: ($danger, $danger-invert))
</td> </td>
</tr> </tr>
<tr><td><code>$sizes</code></td><td>$size-1 $size-2 $size-3 $size-4 $size-5 $size-6</td></tr> <tr>
<td><code>$sizes</code></td>
<td>$size-1 $size-2 $size-3 $size-4 $size-5 $size-6</td>
</tr>
</table> </table>
</div> </div>
</section> </section>