Skip to content
This repository was archived by the owner on Mar 26, 2018. It is now read-only.

fix(app): fix duplicate styles and remove sourcePath for scripts in index.html #664

Closed
wants to merge 2 commits into from

Conversation

cebor
Copy link
Contributor

@cebor cebor commented Apr 25, 2014

  1. commit: closes index.html usemin {.tmp,app} css hint causes duplicate styles in dist/styles/main.css #662
  2. commit: removes unnecessary sourcePath in index.html
    Changes <!-- build:js({.tmp,app}) scripts/scripts.js --> to <!-- build:js scripts/scripts.js -->, usemin and concat use paths from Gruntfile.js.

Tested with and without Sass!

@eddiemonge
Copy link
Member

this should be two different merge requests.

@eddiemonge eddiemonge closed this May 6, 2014
eddiemonge added a commit that referenced this pull request May 7, 2014
Fix handling of Bootstrap fonts. This correctly loads the fonts in
`grunt serve` as well as `grunt serve:dist`. This should hopefully close
all the PR's and issues related to Bootstrap fonts.

Also removes styles being duplicated in a the output CSS file.

This includes a potentially breaking change in that `root` of **cssmin**
has been reverted (removed).

Closes #552
Fixes #638
Fixes #645
Closes #661
Fixes #662
Partially closes #664
Fixes #665
Fixes #667
@eddiemonge
Copy link
Member

Please help to verify the fixes resolve the issues you have been having. You will need to test using the latest git code. Here are the instructions on how to do that:

  • cd to a testing directory, preferable an empty one

    git clone [email protected]:yeoman/generator-angular.git
    cd generator-angular
    npm link
    cd ..
    mkdir testfonts && cd $_
    yo angular
  • Test the generator with different prompts.

Let me know if you have any issues by replying here or opening a new issue.

@cebor cebor deleted the patch-2 branch May 7, 2014 07:41
@cebor
Copy link
Contributor Author

cebor commented May 7, 2014

Thanks, fix works for Bootstrap and Bootstrap-Sass

jcamelis pushed a commit to jcamelis/generator-angular that referenced this pull request Jul 15, 2014
Fix handling of Bootstrap fonts. This correctly loads the fonts in
`grunt serve` as well as `grunt serve:dist`. This should hopefully close
all the PR's and issues related to Bootstrap fonts.

Also removes styles being duplicated in a the output CSS file.

This includes a potentially breaking change in that `root` of **cssmin**
has been reverted (removed).

Closes yeoman#552
Fixes yeoman#638
Fixes yeoman#645
Closes yeoman#661
Fixes yeoman#662
Partially closes yeoman#664
Fixes yeoman#665
Fixes yeoman#667
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

index.html usemin {.tmp,app} css hint causes duplicate styles in dist/styles/main.css
2 participants