Open
Conversation
Contributor
wesww
commented
Jan 21, 2016
wesww
commented
* master: cachebuster version bump; theme description update adding buy tickets button class Removing Makercon from footer MF-47 (Change Report - needed to allow continual edits) - Conflicts: wp-content/themes/makerfaire/css/style.css
* master: Taking out the bootstrap button class and adding in our own bg color and text color. Taking out the past faire edit, doing this later. Adjusting the buy button as per Kate. Incrementing CSS version. Adjusting the title fields on the featured faire page. Conflicts: wp-content/themes/makerfaire/css/style.css
* master: Update readme.md versioning css adding to gitignore consolidating one redundant layout element Editing the grunt reload function so it works. Just showing the Past Faires title if there are past faire to show. Conflicts: wp-content/themes/makerfaire/css/style.css
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.