Skip to content

Conversation

@wesww
Copy link
Contributor

@wesww wesww commented Jan 21, 2016

tool2_popups

manage

wesww added 13 commits January 19, 2016 16:00
* 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
Copy link
Contributor Author

Choose a reason for hiding this comment

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

if notifications

* 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
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