This repository has been archived by the owner. It is now read-only.
Pull Request for New Variable Changes #49
Merged
Conversation
This file contains 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
added 8 commits
February 3, 2015 14:33
Syncing with Master using github terminal commands
Conflicts: css/sherman-black.css css/sherman-blue.css css/sherman-grey.css css/sherman-red.css sass/sherman-common.scss
Conflict kill my soul.
Starting changes to cal #1
Mega footer changes Calendar Changes Search Bar: Header, Content, and footer
Syncing up with sherman master, conflicts only found in sherman-common.scss
Checking to see if it complied correctly.
Compiling Sherman with most recent cornerstone.
amb00010
added a commit
that referenced
this pull request
Feb 11, 2015
Pull Request for New Variable Changes
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Merged with Master (Cornerstone as well)
Color changes
button mixin
search form mixin
other changes