Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/npm_and_yarn/docs/semver-5.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanton committed Jul 16, 2024
2 parents f090d5f + a63ea18 commit f6f2ea1
Show file tree
Hide file tree
Showing 97 changed files with 33,207 additions and 14,270 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// const Fiber = require('fibers');
const sass = require('dart-sass');
const sass = require('sass');

module.exports = function(grunt) {

Expand Down
3 changes: 0 additions & 3 deletions docs/docs/guides/browsers.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ Browsers not listed may still work well, and it should be noted that this is not
<tr>
<td rowSpan="5">Windows</td>
</tr>
<tr>
<td>Internet Explorer 11</td>
</tr>
<tr>
<td>Edge (latest versions)</td>
</tr>
Expand Down
157 changes: 69 additions & 88 deletions docs/docs/guides/colour-and-state.mdx

Large diffs are not rendered by default.

20 changes: 11 additions & 9 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 30 additions & 10 deletions docs/src/css/custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ $fa-css-prefix: 'icon';
@import '/static/fonts/fontawesome-pro/scss/brands';
@import '/static/fonts/fontawesome-pro/scss/v4-shims';

@import '../../../stylesheets/palette.base';
@import '../../../stylesheets/config.theme';
@import '../../../stylesheets/vars.palette-base';

// $font-path: '/static/fonts/';
@font-face {
font-family: 'proxima_novalight';
Expand Down Expand Up @@ -60,7 +64,6 @@ $fa-css-prefix: 'icon';
font-style: normal;
}


.d-example,
.d-example-inline,
.d-guidelines {
Expand Down Expand Up @@ -91,8 +94,6 @@ $fa-css-prefix: 'icon';
@import '../../../stylesheets/function.color';

// Base colour palette
@import '../../../stylesheets/palette.base';
@import '../../../stylesheets/config.theme';
@import '../../../stylesheets/deprecated.styles';

// Structure
Expand Down Expand Up @@ -176,25 +177,44 @@ $fa-css-prefix: 'icon';
@import '../../../stylesheets/utility.utilities';
@import '../../../stylesheets/utility.grid';

.swatch__chip {
border: 1px solid #ccc;
border-radius: 5px;
display: inline-block;
height: 20px;
margin-right: 5px;
vertical-align: middle;
width: 20px;
}

.swatch {
@each $name, $palette in $colors {
@each $variant, $value in $palette {
@if $variant != 'alt' {
&--#{'' + $name}-#{$variant} .swatch__chip {
background-color: color($name, $variant);
border: 1px solid #ccc;
border-radius: 5px;
display: inline-block;
height: 20px;
margin-right: 5px;
color: pick_best_color(color($name, $variant), (#fff, #000));
vertical-align: middle;
width: 20px;
}
}
}
}
}

.swatch--bg-surface-0 .swatch__chip {
background-color: var(--color-bg-surface-0);
}

.swatch--bg-surface-1 .swatch__chip {
background-color: var(--color-bg-surface-1);
}

.swatch--bg-surface-2 .swatch__chip {
background-color: var(--color-bg-surface-2);
}

.swatch--bg-surface-3 .swatch__chip {
background-color: var(--color-bg-surface-3);
}
}

:root{
Expand Down
Loading

0 comments on commit f6f2ea1

Please sign in to comment.