Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

246 homepage #258

Merged
merged 12 commits into from
Nov 2, 2018
Merged

246 homepage #258

merged 12 commits into from
Nov 2, 2018

Conversation

sherakama
Copy link
Member

Not Ready

Copy link

@josephgknox josephgknox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made several tweaks to get this to a strong MVP IMO.

@josephgknox
Copy link

@sherakama whatcha think?

@sherakama sherakama merged commit 0c959e3 into master Nov 2, 2018
@sherakama sherakama deleted the 246-homepage branch November 2, 2018 22:37
yvonnetangsu added a commit that referenced this pull request Nov 7, 2018
* master:
  216 Create site search component (#262)
  266: Update scss file to reference logo.twig and update twig file to … (#267)
  246 homepage (#258)
  reversed order of modular scale type mixin (#260)
  122 hero (#259)
  195 added all Stanford approved fonts (#248)
  change class for logo to match new naming conventions. (#257)
  px to rem (#256)
  219 Modular typography (#250)
  fixup! wip. (#255)
  79 card (#241)
  make color change on hover & focus less abrupt (#253)
  249: Change CTA icon to a variable (#251)
  223 brand bar (#243)

# Conflicts:
#	core/css/decanter.css
#	core/scss/components/index.scss
#	core/templates/components/logo/logo.twig
yvonnetangsu added a commit that referenced this pull request Nov 9, 2018
* master:
  189 Alert Component (#263)
  216 Create site search component (#262)
  266: Update scss file to reference logo.twig and update twig file to … (#267)
  246 homepage (#258)
JBCSU added a commit that referenced this pull request Nov 9, 2018
* master:
  89 browsersync (#272)
  189 Alert Component (#263)
  216 Create site search component (#262)
  266: Update scss file to reference logo.twig and update twig file to … (#267)
  246 homepage (#258)
  reversed order of modular scale type mixin (#260)
  122 hero (#259)

# Conflicts: - all resolved using master
#	core/scss/homepage.md
#	kss/builder/decanter/index.twig
#	kss/builder/decanter/kss-assets/css/kss.css
#	kss/builder/decanter/scss/_home.scss
#	kss/builder/decanter/scss/kss.scss
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants