Skip to content

Commit

Permalink
Merge branch 'master' into 435-icon-card
Browse files Browse the repository at this point in the history
* 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
yvonnetangsu committed Oct 29, 2019
2 parents 0bdcc50 + 058a44d commit ea1c6ed
Show file tree
Hide file tree
Showing 207 changed files with 6,502 additions and 4,450 deletions.
9 changes: 8 additions & 1 deletion .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
version: "2"
engines:
checks:
method-complexity:
config:
threshold: 10
method-lines:
config:
threshold: 40
plugins:
# https://docs.codeclimate.com/docs/eslint
# ES Linting requires an .eslintrc file to tweak checks.
eslint:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.15.1
11.14.0
4 changes: 3 additions & 1 deletion .sass-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ files:
- node_modules/**/*.scss
- kss/builder/decanter/**/*.scss
include: "**/*.s+(a|c)ss"
options:
formatter: stylish
rules:
brace-style:
- 1
Expand All @@ -30,7 +32,7 @@ rules:
leading-zero:
- 1
- include: true
max-line-length: 120
max-line-length: 0
mixins-before-declarations: 0
name-format: 0
nesting-depth:
Expand Down
59 changes: 59 additions & 0 deletions .tugboat/config.yml
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
3 changes: 1 addition & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ module.exports = function(grunt) {
]
},
options: {
watchTask: true,
server: './styleguide'
}
}
Expand Down Expand Up @@ -83,7 +82,7 @@ module.exports = function(grunt) {
// Register some new ones.
grunt.registerTask('deploy', ['styleguide', 'deploy_site:styleguide', 'clean:postdeploy']);
grunt.registerTask('webpack', ['run:webpack']);
grunt.registerTask('dev', ['styleguide', 'browserSync', 'run:watch']);
grunt.registerTask('dev', ['styleguide', 'browserSync']);
grunt.registerTask('default', ['dev']);

// Deprecated tasks.
Expand Down
Loading

0 comments on commit ea1c6ed

Please sign in to comment.