Style updates - redux #711
Closed
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
|
@mattvague Could you rebase againt master? Can you add more explanations about... what this changes? :) |
- Add ActiveAdmin to gemspec and lock it to a version in the Gemfile - Minor button state updates and fix for the box shadow of the titlebar
|
@pcreux done and done. Can we get this merged? |
|
@gregbell Made those changes |
| @@ -18,6 +18,7 @@ Gem::Specification.new do |s| | |||
| s.require_paths = ["lib"] | |||
|
|
|||
| s.add_dependency("rails", ">= 3.0.0") | |||
| s.add_dependency("bourbon", "~> 1.0.0") | |||
There was a problem hiding this comment.
~> will allow patch levels greater than 1.0.0 (eg: 1.0.1 but not 1.2.0). Considering Bourbon is already at 1.2.0, I think we should change this to ">= 1.0.0"
|
Merged! Nice work. Matt. Styles are looking great. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Same style updates as last time, but this time Bourbon is in the gemspec. Also I've generated the bourbon stylesheets and included them in AA so we don't need to worry about asset pipeline generating them. Party.
Style updates include: