-
-
Notifications
You must be signed in to change notification settings - Fork 3.3k
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
Unencapsulate css global reset #1952
Unencapsulate css global reset #1952
Conversation
Travis is apparently having issues testing out pull requests? In any case, this passes all tests run locally. |
Our Travis builds on master are now green (as of 166bc46). Please rebase your PR on the current master: # Expectations: "upstream" is gregbell's GitHub repo and "origin" is your fork
# Rebase your fork's master branch with the latest upstream changes
git checkout master
git pull --rebase upstream master
git push origin master
# Rebase your feature branch with the latest upstream changes
git checkout your_feature_branch
git pull --rebase upstream master
git push origin your_feature_branch # note that you may need to use -f |
Rebase done... Thanks for the tip. |
You should have followed the instructions. You want to rebase, not merge the changes. |
What you want to do now is: git stash
git reset --hard 55ef578 # reset to your latest commit before the merge
git stash pop And then run git pull --rebase upstream master |
Like so? |
Yep. Still waiting for some input from other maintainers: @macfanatic, @pcreux, @gregbell |
Yeah I know Greg's away. Still wanted to ping him in any case. I was there when @ronen first proposed #1343, and at the time it made sense. But rereading that thread, it seems to me that the fundamental reason for the PR itself was a non-issue. In the PR @ronen says that namespacing the CSS was intended to prevent AA rules from overriding rules from your application. But that shouldn't be an issue, because Meanwhile, the changes resulted in plugins like CKEditor breaking because in CSS, higher specificity means higher priority. Since every AA CSS rule has the See what I'm getting at? Theoretically you should just be able to do this: body.active_admin {
@import "stuff";
} but that makes the assumption that the 3rd party styles use SASS, and also prevents the 3rd party styles from configuring the |
👍 |
Any updates for this? It continues to cause problems, see for example kreativgebiet/rich#62 |
@tinynumbers I'm convinced that this should be merged, but I'm still waiting on input from the rest of the team. |
Any updates on this? |
Same here. Please merge it! |
I would love to see it updated. |
+1 |
Comments @gregbell, @macfanatic, @pcreux? I think this should be part of the 0.6.1 release. |
+1 please do it! |
@daxter will you include it into rails4 branch? :) |
I've been using active_admin on Rails 4 for about a month now and just today updated the gem. I had a file |
Or rather, what's the recommended way to not include active_admin.css.scss in application.css? |
That would be by removing the |
@daxter Thanks for the quick response. Is that considered best practice? It's not a huge deal, but it's nice not to have to explicitly require each of my app's stylesheet. |
It looks like it's possible to explicitly blacklist certain files from the asset manifest: //= stub active_admin |
Brilliant, thanks @daxter |
No problem. Glad you asked that question, since it lead me to discover It might be a good idea to auto-add a stub to projects that install AA. It would save people a lot of trouble at the outset. |
Based on some funny behavior Just did some more research on that issue @daxter. The PR for sprockets that added When I tried using There's no feature in sprockets to actually do what we need: What might be better is to place |
Then again, |
@smidwap this obviously requires further discussion. Could you create a new Issue for it? |
Several people have started using this fork in order to get around the issues reported in #1852.
This pull request effectively rolls back #1343 and closes #1852.