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.

Sign up for GitHub

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

Jump to bottom

Update main-nav.twig #331

Merged
merged 1 commit into from
Mar 16, 2019
Merged

Update main-nav.twig #331

merged 1 commit into from
Mar 16, 2019

Conversation

sherakama
Copy link
Member

@sherakama sherakama commented Mar 8, 2019 •
edited
Loading

Ready for Review.

Adds default text to the toggle link.

@sherakama sherakama requested review from JBCSU and josephgknox March 8, 2019 06:37
josephgknox
josephgknox approved these changes Mar 8, 2019
View reviewed changes
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.

Looks good.

JBCSU
JBCSU approved these changes Mar 16, 2019
View reviewed changes
Copy link
Collaborator

@JBCSU JBCSU left a comment

Choose a reason for hiding this comment

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

Good catch. Thanks@

@josephgknox josephgknox merged commit d47acf4 into master Mar 16, 2019
@josephgknox josephgknox deleted the patch1 branch March 16, 2019 03:06
yvonnetangsu added a commit that referenced this pull request Mar 18, 2019
@yvonnetangsu
Merge branch 'master' into reorganize-cta-scss
7585049 
* master:
  Update main-nav.twig (#331)
yvonnetangsu added a commit that referenced this pull request Mar 18, 2019
@yvonnetangsu
Merge branch 'master' into 333-main-nav-on-dark
2950f9a 
* master:
  Update main-nav.twig (#331)
JBCSU added a commit that referenced this pull request Mar 19, 2019
@JBCSU
Merge branch 'master' into 90-basic-webpack
13be2bb 
* master:
  Reorganize files for CTA so it's consistent with other components (#345)
  Update main-nav.twig (#331)
  get rid of ID (#342)
  5 Lines Lockup + Variants (#289)
  Update _alert--info.scss (#330)

# Conflicts: all resolved using "mine"
#	core/dist/css/decanter.css
#	package-lock.json
#	package.json
yvonnetangsu added a commit that referenced this pull request Mar 20, 2019
@yvonnetangsu
Merge branch 'master' into 329-card-tweak
fcfee66 
* master:
  Use %placeholder and @extend on button mixins to see if it makes code less repetitive (#347)
  Cut down on media queries generated by @modular-spacing (#343)
  Main Nav Light on Dark Background Color Variant (#344)
  Reorganize files for CTA so it's consistent with other components (#345)
  Update main-nav.twig (#331)
  get rid of ID (#342)
  5 Lines Lockup + Variants (#289)
  Update _alert--info.scss (#330)

# Conflicts:
#	core/css/decanter.css
#	core/scss/utilities/mixins/button/_button-big.scss
#	core/scss/utilities/mixins/button/_button-primary.scss
#	core/scss/utilities/mixins/button/_button-secondary.scss
#	core/scss/utilities/mixins/index.scss
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@josephgknox josephgknox josephgknox approved these changes

@JBCSU JBCSU JBCSU approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sherakama @JBCSU @josephgknox