-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into 435-icon-card
* master: (28 commits) Updated packages and configuration files. (#527) Use rem instead of em for big button font size so it doesn't blow up in sections if we set a large base font size; finetune big button padding for smaller breakpoints (#522) Change sizes of link icons to use px instead of em to prevent occasional clipping (#523) D8CORE-628: Add caption option to hero banner. (#517) Use percentage for html root font size instead of px so people can scale up using browser font size preferences (#526) Mixins documention update — @centered-column (#448) Adds Tugboat and fixes npm dependencies. (#518) Update _hero.scss (#513) Create Aspect Ratio Mixin (#445) Adding global footer variants and link tweaks for legibility, change layout at MD breakpoint to match Figma (#500) Updated package and lock files. Add parameter to @link-icon to adjust vertical position of icon and different options for $animate parameter (#504) Delete card-2019-08-28.twig (#506) Update _input.scss (#507) Scale down type-a and type-b font size at xs and sm breakpoints, repurpose splash font and minor typography tweaks (#498) Add 4 new @modular-spacing steps (#6 to #9) and modify 2 existing steps (#3 and #4) (#503) add su- prefix to Decanter core and component variables, deprecate old names (#452) Includevar (#496) Put appearance back for select dropdowns (#479) Split input.scss into several files and add new input-base placeholder (#476) ... # Conflicts (resolved manually) # core/dist/css/decanter.css # core/src/scss/components/card/_card.scss # core/src/scss/components/card/index.scss # core/src/scss/utilities/placeholders/components/_card.scss # core/src/templates/components/card/card.twig
- Loading branch information
Showing
207 changed files
with
6,502 additions
and
4,450 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.15.1 | ||
11.14.0 |
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,59 @@ | ||
services: | ||
apache: | ||
image: tugboatqa/httpd | ||
commands: | ||
# Used in the base image as setup. | ||
init: | ||
- | | ||
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash | ||
NVM_DIR="$HOME/.nvm" | ||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" | ||
nvm install 11.14.0 | ||
nvm use | ||
npm install | ||
npm run build | ||
npm run styleguide | ||
- rm -R node_modules | ||
- ln -snf "${TUGBOAT_ROOT}/styleguide" "${DOCROOT}" | ||
# Used in each of the preview builds. | ||
build: | ||
- | | ||
NVM_DIR="$HOME/.nvm" | ||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" | ||
nvm use | ||
npm install | ||
npm run build | ||
npm run styleguide | ||
- rm -R node_modules | ||
# Collection of urls to compare visual results. | ||
visualdiffs: | ||
- / | ||
# Core | ||
- /item-core-colors.html | ||
- /item-core-flexgrid.html | ||
- /item-core-fonts.html | ||
- /item-core-helpers-aspect-ratio.html | ||
# Elements | ||
- /item-elements-embedcontainer.html | ||
- /item-elements-image.html | ||
- /item-elements-list.html | ||
- /item-elements-typography.html | ||
# Components | ||
- /item-components-alert.html | ||
- /item-components-brand-bar.html | ||
- /item-components-button.html | ||
- /item-components-card.html | ||
- /item-components-cta.html | ||
- /item-components-date-stacked.html | ||
- /item-components-global-footer.html | ||
- /item-components-hero.html | ||
- /item-components-link.html | ||
- /item-components-local-footer.html | ||
- /item-components-lockup.html | ||
- /item-components-logo.html | ||
- /item-components-main-navigation.html | ||
- /item-components-masthead.html | ||
- /item-components-quote.html | ||
- /item-components-signup-form.html | ||
- /item-components-site-search.html | ||
- /item-components-skiplinks.html |
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.