Skip to content

Commit

Permalink
Merge branch 'master' into 217-levers
Browse files Browse the repository at this point in the history
* master:
  122 hero (#259)
  195 added all Stanford approved fonts (#248)
  change class for logo to match new naming conventions. (#257)

# Conflicts:
#	core/css/decanter.css - regenerated using mine
#	core/scss/utilities/mixins/typography/_font-lead.scss - resolved using mine
#	core/scss/utilities/mixins/typography/_h6.scss - deleted
  • Loading branch information
JBCSU committed Nov 2, 2018
2 parents 5c486f9 + b8c31a9 commit 693651b
Show file tree
Hide file tree
Showing 81 changed files with 537 additions and 626 deletions.
2 changes: 2 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ engines:
enabled: false
VendorPrefix:
enabled: false
UrlFormat:
enabled: false
phpcodesniffer:
enabled: false
phpmd:
Expand Down
Loading

0 comments on commit 693651b

Please # to comment.