Skip to content

docs(@angular/cli): add scss intructions for include-font-awesome story #10911

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

Closed
wants to merge 285 commits into from

Conversation

chris-milliano
Copy link

No description provided.

}
}
```

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's really two options for SASS. The most common and probably recommended is the above. If there is a need to modify any of the font-awesome sass variables (are there any besides the path?) then the second form below (or a variation) would be used.

Could you section off the two and add a note about the second only being useful in special/advanced cases or similar language?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To clarify, it seems you saying the way I have separated out CSS from SASS (SCSS) is acceptable, but there is a second option on SASS use case I need to elaborate on?

Or are you saying that I should not have separated them, but rather made notes on their differences?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The _variables.scss and import in the section below is not necessary if using the section you added. They should really be separated out. The first that you added is generally the preferred and cleaner unless more fine-grained control is needed with the font-awesome variables.

Copy link
Author

@chris-milliano chris-milliano Jun 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@clydin I think I am following, I made the minor text separation update.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Sorry for the delay in response. The changes look good. Can you rebase and we can get this in.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome!

@clydin I have never rebased before so I followed contributing.md and ran:

git rebase master -i

Which returned Successfully rebased and updated refs/heads/docs-10861.

Then I ran:

git push -f

Which returned Everything up-to-date

But I am not seeing any sort of changes to my code base or PR. Is there another step?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Ensure you have an upstream remote configured: https://help.github.com/articles/configuring-a-remote-for-a-fork/
  2. Sync your master with upstream: https://help.github.com/articles/syncing-a-fork/
  3. Then rebase your branch with your master

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@clydin I am not sure if I was successful or did something wrong. Should I be seeing every commit since my fork like below?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, you should be seeing them. I'm not really sure what happened. Sorry about this but I think it might be best to start over, if possible.

alexeagle and others added 27 commits June 8, 2018 14:33
…code

Instead of process.exit() which is a bit premature
Its being deprecated in Node 10.4. The replacements are available in Node 8 so
its all good.
Update documentation for the hmr story to show proper configurations
in angular.json and src/tsconfig.app.json.

Closes angular#11028, angular#10668, angular#10663
We moved the repo from angular-buch to angular-schule
This change helps to keep the behaviour of build/serve/test consistent by using the same import semantics in all of them.
The changelog function makes a promise but doesn't return it, causing a race condition between the process exiting and the promise finishing.

On a repository with bigger git history the promise took longer to execute and the process exited first.
When not specified the `commonjs` will be used which will cause erros when consuming the library `Module not found: Error: Can't resolve ' commonjs-proxy:../file`

ng-packagr/ng-packagr#944

Closes angular#11255
clydin and others added 20 commits August 15, 2018 15:59
The `options` arguments is not used in the function. This causes the
TypeScript compilation to fail.

fixes angular#11916
`fs` is unable to read the normalized paths from `@angular-devkit/core`  on `windows` as the disk drive is replaced from `c:/` to `/c/`

Closes angular#11928
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

@hansl
Copy link
Contributor

hansl commented Sep 25, 2018

Closing this PR as it's unmaintained, has too many unrelated commits (bad rebase?) and cannot merge cleanly. The documentation will go into angular.io soon anyway and the wiki files should be frozen right now.

@hansl hansl closed this Sep 25, 2018
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.