fix(ng-add): do not incorrectly insert custom-theme into CSS files #12711
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
devversion
added
pr: merge safe
target: major
googlebot
added
the
cla: yes
* Currently the schematics add the custom-theme SCSS code to any project style file (`styles.EXT`). This is incorrect because the SCSS needs to be placed inside of a SCSS file. Instead of throwing an error we just create a new SCSS file with the theme and add it to the workspace config. * Aligns the global font-family statement with the current Angular Material typography font-family. * Adds missing tests for the global app styles. * Removes an accidentally committed `console.log()`.
devversion
force-pushed
the
fix/ng-add-theme-custom-css
branch
from
5770507 to
43f5b19
Compare
jelbourn
approved these changes
Aug 20, 2018
| @@ -16,6 +17,14 @@ describe('material-install-schematic', () => { | |||
| runner = new SchematicTestRunner('schematics', collectionPath); | |||
| }); | |||
|
|
|||
| /** Expects the given file to be in the styles of the specified workspace project. */ | |||
| function expectProjectStyleFile(project: WorkspaceProject, filePath: string) { | |||
| expect(project.architect!['build']).toBeTruthy(); | |||
There was a problem hiding this comment.
Could reduce repetition:
const architect = project.architect!;
expect(architect['build']).toBeTruthy();
...
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
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.
styles.EXT). This is incorrect because the SCSS needs to be placed inside of a SCSS file. Instead of throwing an error we just create a new SCSS file with the theme and add it to the workspace config.console.log().