This repository has been archived by the owner on Dec 23, 2017. It is now read-only.
Feature/new-styles #474
Merged
Feature/new-styles #474
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 10 commits
August 14, 2015 17:02
Revering an earlier renaming change
|
I almost feel like we should get fec-style incorporated and merge this in sooner rather then later. This PR will conflict with almost any other PR, and I don't want you to have to redo a bunch of work |
|
What's the binary file |
|
The code for this is looking good |
|
Oh weird. I'm not sure what the binary css file is. |
This patch fixes failing Selenium tests, with the exception of tests of the glossary widget, which still needs to be updated to work with the new styles.
|
I think we might want to go with |
…nto feature/new-styles
* Use styles from local fec-style URL if specified * Add a place for vendor styles
Feature/new styles
* Document style environment configuration in README * Delete unused imports * Delete unused styles
Use local styles conditionally.
Fixing merge conflict in elections.html
Closed
|
Is there anything else this needs or can we merge in? We should hold tight until this is merged as it has all the styles: 18F/fec-style#6 |
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.
Apologies for the enormous PR, but it's not as gnarly as it looks. This gets the web-app in shape to use the new styles being developed in fec-style, so we'll want to wait until we start pulling those in before we merge. Once that happens, this branch basically has every page styled with the new styles.
There's four main things this does:
There's a few components that still need to be built out / styled (the glossary and navigation dropdown menus) and it will probably take some work to get the tests up to date. But maybe those happen in later PRs.
Also worth noting that it's still quite rough around the edges in certain places, but that's fine while we finish up the design work.
Dependent on https://github.com/18F/fec-style/pull/6/files