-
Notifications
You must be signed in to change notification settings - Fork 0
Materialize #1
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
Open
2947721120
wants to merge
27
commits into
master
Choose a base branch
from
materialize
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Materialize #1
Conversation
This file contains hidden or 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
I incorporated the prototype detailed in gkalpak/angular.js#3. Things that are different from the prototype (besides using actual data): * The left sidenav (toc) is not styled properly (or even readably). * The subheaders in the left sidenav are not "stickying" properly (only `ng` becomes sticky). * Icons are missing (since we are not using FontAwesome). E.g. search-fab, toc-toggle, results * In the right sidenav (search) there are some unwanted horizontal scrollbars. (This section probably needs rethinking anyway.) * I have implemented a `responsiveMenu` directive to show the options in the header-menus (Learn/Develop/Discuss). The purpose is to show the options in a "dropdown-ish" menu on larger screens and using a BottomSheet on smaller. At the moment a BottomSheet is used on every screen-size. Notes: - Still no version-picker and breadcrumbs (I have left the original implementation of those two commented out). - I have replaced the previous docs.css with a new one containing the style of the prototype. I have renamed the old one to `docs_old.css` and left it there temporarily for quick reference. We need to clean up this and the rest of the old CSS files. - The main content area is totally unstyled and needs some love (a lot actually). I have also "sprinkled" the code with a few more TODOs/FIXMEs. (For more details on known issues and missing features take a look at gkalpak/angular.js#3)
Since the structure was a little different than the prototype, classes/styles where not applied correctly to the links in the left sidenav. This commit fixes the issue. I also added FontAwesome, in order to be able to display icons until the Material Design icon-font is released. Since this is a temporary meassure, I didn't added as a bower dependency; just added a `font-awesome` folder in assets and added `font-awesome/css/font-awesome.css` to the stylesheets of each deployment (under `docs/config/services/deployments/`.
Due to the recent changes ragarding the Docs app "Materialization", some tests where failing for the following reasons: 1. JQuery wasn't being copied to 'build/docs/components/'. 2. E2E examples 89 and 90 were relying on the Bootstrap's glyphicons. Temporarily replaced with FontAwesome icons; to be replaced with Material Design iconfont, when ready. 3. `ngMaterial` (and its various dependencies) weren't loaded by Karma during unit testing (causing modules depending on it to fail). Added a fake `ngMaterial` module (as a temporary solution).
Signed-off-by: Josh Kurz <jkurz25@gmail.com>
We won't use the material icons manually. We will use font awesome until material icons are fully supported.
Removes material icon reference until material icons are ready to be used.
Updates branch with master
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.
No description provided.