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

Deploy using grunt #211

Merged
merged 6 commits into from
Oct 2, 2018
Merged

Deploy using grunt #211

merged 6 commits into from
Oct 2, 2018

Conversation

sherakama
Copy link
Member

READY FOR REVIEW

Summary

  • Removes tracking of styleguide from git repo
  • Adds grunt function grunt deploy
  • grunt deploy compiles, packages, and pushes the style guide to the github.io repository.

Needed By (Date)

  • Whenever

Urgency

  • Real low

Steps to Test

  1. Check out this branch
  2. Run npm install
  3. Run grunt deploy
  4. Visit https://github.com/SU-SWS/decanter.github.io and review the last commit for a recent timestamp.
  5. Wait a few minutes for the cache to clear and review http://decanter.stanford.edu

Affected Projects or Products

  • Decanter website.

Associated Issues and/or People

  • ? Probably but I haven't looked. ?

See Also

@josephgknox
Copy link

I merged in master to address conflicts after merging the footer work in.

@josephgknox
Copy link

Woot! No more tracking of a million style guide related file changes.

It seems that grunt deploy updates decanter.stanford.edu, even if you're on a feature branch. Is that right? Is there a danger in running that before code has been reviewed?

@sherakama
Copy link
Member Author

Yeah, we will have to talk about practice on this and how we want to tag+release these builds but this is a start.

@@ -1 +1,5 @@
<<<<<<< HEAD
Copy link
Member Author

Choose a reason for hiding this comment

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

@josephgknox Whoops, merge conflict here.

Copy link
Member Author

Choose a reason for hiding this comment

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

Should be

<img class="decanter-media-block__img {{ modifier_class }}" src="{{ src|default("/img/circle.png") }}" alt="{{ alt|default("Please provide alt text") }}">

Choose a reason for hiding this comment

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

Right on.

@josephgknox
Copy link

Yeah, for sure, more than a start. This is awesome. This project (and your related work) is teaching all that Git can do. Super cool.

@sherakama sherakama merged commit 25f594e into master Oct 2, 2018
@sherakama sherakama deleted the deploy branch October 2, 2018 19:00
yvonnetangsu added a commit that referenced this pull request Oct 4, 2018
* master:
  Deploy using grunt (#211)
  151 footer (#208)

# Conflicts: (resolved all using theirs)
#	styleguide/item-mixins-display-display-icon.html
#	styleguide/item-mixins-display-embed-container.html
#	styleguide/item-mixins-display-media-block-img.html
#	styleguide/item-mixins-display-overflow.html
#	styleguide/item-mixins-display.html
#	styleguide/item-mixins-grid-grid--1-of-12.html
#	styleguide/item-mixins-grid-grid--10-of-12.html
#	styleguide/item-mixins-grid-grid--12-of-12.html
#	styleguide/item-mixins-grid-grid--2-of-12.html
#	styleguide/item-mixins-grid-grid--3-of-12.html
#	styleguide/item-mixins-grid-grid--4-of-12.html
#	styleguide/item-mixins-grid-grid--5-of-12.html
#	styleguide/item-mixins-grid-grid--6-of-12.html
#	styleguide/item-mixins-grid-grid--7-of-12.html
#	styleguide/item-mixins-grid-grid--8-of-12.html
#	styleguide/item-mixins-grid-grid--9-of-12.html
#	styleguide/item-mixins-grid-grid--container.html
#	styleguide/item-mixins-grid-grid--item.html
#	styleguide/item-mixins-grid.html
#	styleguide/item-mixins-iconblock-icon-block.html
#	styleguide/item-mixins-iconblock.html
#	styleguide/item-mixins-icongrid-icon-grid.html
#	styleguide/item-mixins-icongrid.html
#	styleguide/item-mixins-images-image-defaults.html
#	styleguide/item-mixins-images.html
#	styleguide/item-mixins-layout-display-grid.html
#	styleguide/item-mixins-layout-grid-column-gap.html
#	styleguide/item-mixins-layout-grid-columns.html
#	styleguide/item-mixins-layout-grid-item-spans.html
#	styleguide/item-mixins-layout-grid-rows.html
#	styleguide/item-mixins-layout-page-layout--left-sidebar--content.html
#	styleguide/item-mixins-layout-page-layout--left-sidebar--sidebar.html
#	styleguide/item-mixins-layout-page-layout--left-sidebar.html
#	styleguide/item-mixins-layout-page-layout--right-sidebar--content.html
#	styleguide/item-mixins-layout-page-layout--right-sidebar--sidebar.html
#	styleguide/item-mixins-layout-page-layout--right-sidebar.html
#	styleguide/item-mixins-layout-page-layout--single-column--content.html
#	styleguide/item-mixins-layout-page-layout--single-column.html
#	styleguide/item-mixins-layout-page-layout--three-column--content.html
#	styleguide/item-mixins-layout-page-layout--three-column--sidebar-first.html
#	styleguide/item-mixins-layout-page-layout--three-column--sidebar-second.html
#	styleguide/item-mixins-layout-page-layout--three-column.html
#	styleguide/item-mixins-layout-page-layout.html
#	styleguide/item-mixins-layout.html
#	styleguide/item-mixins-links-external-link.html
#	styleguide/item-mixins-links-link.html
#	styleguide/item-mixins-links-more-link.html
#	styleguide/item-mixins-links.html
#	styleguide/item-mixins-lists-list-unstyled.html
#	styleguide/item-mixins-lists.html
#	styleguide/item-mixins-menus-sidenav-sublist.html
#	styleguide/item-mixins-menus-subnav-list.html
#	styleguide/item-mixins-menus.html
#	styleguide/item-mixins-navigation-nav-border.html
#	styleguide/item-mixins-navigation-nav-close.html
#	styleguide/item-mixins-navigation-nav-overlay.html
#	styleguide/item-mixins-navigation.html
#	styleguide/item-mixins-quote-quote.html
#	styleguide/item-mixins-quote.html
#	styleguide/item-mixins-tables-table-borderless.html
#	styleguide/item-mixins-tables-tables.html
#	styleguide/item-mixins-tables.html
#	styleguide/item-mixins-typography-caption.html
#	styleguide/item-mixins-typography-credits.html
#	styleguide/item-mixins-typography-font-lead.html
#	styleguide/item-mixins-typography-font-smoothing.html
#	styleguide/item-mixins-typography-font-splash.html
#	styleguide/item-mixins-typography-h1.html
#	styleguide/item-mixins-typography-h2.html
#	styleguide/item-mixins-typography-h3.html
#	styleguide/item-mixins-typography-h4.html
#	styleguide/item-mixins-typography-h5.html
#	styleguide/item-mixins-typography-h6.html
#	styleguide/item-mixins-typography-headings.html
#	styleguide/item-mixins-typography-sans.html
#	styleguide/item-mixins-typography-serif.html
#	styleguide/item-mixins-typography-short-line-length.html
#	styleguide/item-mixins-typography-slab.html
#	styleguide/item-mixins-typography.html
#	styleguide/item-mixins.html
#	styleguide/item-molecules-iconblock.html
#	styleguide/item-molecules-icongrid.html
#	styleguide/item-molecules-sidenav.html
#	styleguide/item-molecules.html
#	styleguide/kss-assets/css/kss.css
#	styleguide/section-mixins.html
#	styleguide/section-molecules.html
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