forked from twbs/bootstrap
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'v4-dev' into yiq-function-update
- Loading branch information
Showing
38 changed files
with
1,129 additions
and
848 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,26 @@ | ||
| - name: blue | ||
| hex: "#007aff" | ||
| hex: "#007bff" | ||
| - name: indigo | ||
| hex: "#2b29bb" | ||
| hex: "#6610f2" | ||
| - name: purple | ||
| hex: "#882ae0" | ||
| hex: "#6f42c1" | ||
| - name: pink | ||
| hex: "#f14095" | ||
| hex: "#e83e8c" | ||
| - name: red | ||
| hex: "#ea0242" | ||
| hex: "#dc3545" | ||
| - name: orange | ||
| hex: "#ff8d00" | ||
| hex: "#fd7e14" | ||
| - name: yellow | ||
| hex: "#ffec00" | ||
| hex: "#ffc107" | ||
| - name: green | ||
| hex: "#34da36" | ||
| hex: "#28a745" | ||
| - name: teal | ||
| hex: "#1dde8e" | ||
| hex: "#20c997" | ||
| - name: cyan | ||
| hex: "#08eff3" | ||
| hex: "#17a2b8" | ||
| - name: white | ||
| hex: "#fff" | ||
| - name: gray | ||
| hex: "#464a4c" | ||
| hex: "#868e96" | ||
| - name: gray-dark | ||
| hex: "#292b2c" | ||
| hex: "#343a40" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| - name: 100 | ||
| hex: "#f8f9fa" | ||
| - name: 200 | ||
| hex: "#ebedef" | ||
| hex: "#e9ecef" | ||
| - name: 300 | ||
| hex: "#ced3d8" | ||
| hex: "#dee2e6" | ||
| - name: 400 | ||
| hex: "#abb3bd" | ||
| hex: "#ced4da" | ||
| - name: 500 | ||
| hex: "#7c8a99" | ||
| hex: "#adb5bd" | ||
| - name: 600 | ||
| hex: "#55626f" | ||
| hex: "#868e96" | ||
| - name: 700 | ||
| hex: "#4a5560" | ||
| hex: "#495057" | ||
| - name: 800 | ||
| hex: "#384048" | ||
| hex: "#343a40" | ||
| - name: 900 | ||
| hex: "#131619" | ||
| hex: "#212529" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| - name: primary | ||
| hex: "#007aff" | ||
| hex: "#007bff" | ||
| - name: secondary | ||
| hex: "#868e96" | ||
| - name: success | ||
|
|
||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| // stylelint-disable no-duplicate-selectors | ||
|
|
||
| // | ||
| // Brand guidelines | ||
| // | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| #!/usr/bin/env node | ||
|
|
||
| /*! | ||
| * Script to run vnu-jar if Java is available. | ||
| * Copyright 2017 The Bootstrap Authors | ||
| * Copyright 2017 Twitter, Inc. | ||
| * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) | ||
| */ | ||
|
|
||
| 'use strict' | ||
|
|
||
| const childProcess = require('child_process') | ||
| const vnu = require('vnu-jar') | ||
|
|
||
| childProcess.exec('java -version', function (error) { | ||
| if (error) { | ||
| console.error('Skipping HTML lint test; Java is missing.') | ||
| return | ||
| } | ||
|
|
||
| const ignores = [ | ||
| 'Attribute “autocomplete” is only allowed when the input type is “color”, “date”, “datetime-local”, “email”, “hidden”, “month”, “number”, “password”, “range”, “search”, “tel”, “text”, “time”, “url”, or “week”.', | ||
| 'Attribute “autocomplete” not allowed on element “button” at this point.', | ||
| 'Attribute “title” not allowed on element “circle” at this point.', | ||
| 'Bad value “tablist” for attribute “role” on element “nav”.', | ||
| 'Element “img” is missing required attribute “src”.', | ||
| 'Element “legend” not allowed as child of element “div” in this context.*' | ||
| ].join('|') | ||
|
|
||
| const args = [ | ||
| '-jar', | ||
| vnu, | ||
| '--asciiquotes', | ||
| '--errors-only', | ||
| '--skip-non-html', | ||
| `--filterpattern "${ignores}"`, | ||
| '_gh_pages/', | ||
| 'js/tests/' | ||
| ] | ||
|
|
||
| return childProcess.spawn('java', args, { | ||
| shell: true, | ||
| stdio: 'inherit' | ||
| }) | ||
| .on('exit', process.exit) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.