Skip to content
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

Don’t load admin CSS twice #1604

Merged
merged 2 commits into from Jul 21, 2014
Merged

Don’t load admin CSS twice #1604

merged 2 commits into from Jul 21, 2014

Conversation

@fofr
Copy link
Contributor

@fofr fofr commented Jul 18, 2014

  • Picking up where 5c44cb0 and ecff5a0 left off
  • Update IE specific stylesheets to set IE version then include admin.css with all of the libraries etc, rather than base.css which was missing them
    • Checked on browserstack that IE6 through IE8 match what's on preview
    • Tested that IE versions were coming through correctly to admin.css when set
fofr added 2 commits Jul 18, 2014
* Remove extra admin stylesheet include
* Update conditional stylesheets to start with admin.css rather than
base.css, so that all styles for bootstrap, jquery-ui etc are included
@fofr
Copy link
Contributor Author

@fofr fofr commented Jul 18, 2014

As an aside:

  • Analytics shows that since June we've had only 10 IE6 sessions (~0.04% of sessions)
  • Tabs aren't displaying correctly in IE7 on preview (~3.7% of sessions)
@edds
Copy link
Contributor

@edds edds commented Jul 18, 2014

👍

@fofr
Copy link
Contributor Author

@fofr fofr commented Jul 21, 2014

@edds: Happy to merge this?

bradwright added a commit that referenced this pull request Jul 21, 2014
Don’t load admin CSS twice
@bradwright bradwright merged commit 1b31ee2 into master Jul 21, 2014
1 check passed
1 check passed
default Build #3488 succeeded on Jenkins
Details
@bradwright bradwright deleted the remove-dupe-css branch Jul 21, 2014
@bradwright
Copy link
Contributor

@bradwright bradwright commented Jul 21, 2014

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.