Skip to content
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

Drop Normalize, port relevant parts to Reboot #21741

Merged
merged 47 commits into from
Jan 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
30a6841
Get this party started by removing mention of Normalize.css
mdo Jan 16, 2017
60926d1
Nuke the old comment, consolidate to a single line and number as appr…
mdo Jan 16, 2017
d7ca3dc
Bring over styles for HTML element from Normalize to Reboot
mdo Jan 16, 2017
ff507ab
Move margin override for body element from Normalize to Reboot
mdo Jan 16, 2017
35975ce
Drop the block reset for HTML5 elements in IE9- from Normalize given …
mdo Jan 16, 2017
5e53fb0
Building on previous commit, do the same thing for figure, figcaption…
mdo Jan 16, 2017
d4770e9
Remove IE9- display from Normalize given our browser support
mdo Jan 16, 2017
e3bb70e
Drop IE8 figure margin because we're IE10+
mdo Jan 16, 2017
d25beca
No need for the h1 overrides because we reset these font and margin s…
mdo Jan 16, 2017
99c7ea0
Drop Safari 6 b and strong normalization because we're Safari 8+
mdo Jan 16, 2017
249d099
Remove mark styles for IE9- from Normalize
mdo Jan 16, 2017
b05c109
Remove old iOS audio fixes from Normalize
mdo Jan 16, 2017
c66fa69
Remove IE9- display for progress from Normalize
mdo Jan 16, 2017
84aca38
Remove more IE9- rules from Normalize
mdo Jan 16, 2017
edb7586
One more IE9- display removal for canvas element
mdo Jan 16, 2017
a05b594
Move pre overrides from Normalize to Reboot
mdo Jan 16, 2017
6dfad0f
Move over some link resets to Reboot, drop others
mdo Jan 16, 2017
68b13f3
Move over more code element resets, consolidate with pre overrides, too
mdo Jan 16, 2017
269836e
Move over sub and sup wholesale
mdo Jan 16, 2017
27acac7
Move over img normalization to Reboot
mdo Jan 16, 2017
ea2299a
Move over SVG override too
mdo Jan 16, 2017
4df359b
- Drop dupe hidden, but add comment for it
mdo Jan 16, 2017
fb9706d
Remove bulk of @viewport comment
mdo Jan 16, 2017
2d78f6a
edit down that code comment
mdo Jan 16, 2017
867d5d2
consolidate html-based normalizations
mdo Jan 16, 2017
7cb3db5
update comments
mdo Jan 16, 2017
512e194
Consolidate abbr styles
mdo Jan 16, 2017
2661919
move over more type elements
mdo Jan 16, 2017
7d2baad
move over hr changes
mdo Jan 16, 2017
9d99dbf
move over form controls and more
mdo Jan 16, 2017
f3b83e0
move over button resets
mdo Jan 16, 2017
f9d575b
move over firefox button changes
mdo Jan 16, 2017
e18264e
move over search changes and more
mdo Jan 16, 2017
2b046d6
we nuke all these styles for fieldsets anyway, so outright remove them
mdo Jan 16, 2017
180df3c
no need for those, we override them
mdo Jan 16, 2017
92c7d96
move over legend, fieldset, progress
mdo Jan 16, 2017
d165c99
line break
mdo Jan 16, 2017
3d4115c
delete normalize file
mdo Jan 16, 2017
e5fcccb
linting
mdo Jan 16, 2017
651aa3d
update comment
mdo Jan 16, 2017
0306b94
clarify docs mentions of normalize and reboot
mdo Jan 16, 2017
ed6030c
remove normalize excludes from linter
mdo Jan 16, 2017
400bf59
remove normalize excludes from cli task
bardiharborow Jan 17, 2017
63148b6
linting
bardiharborow Jan 17, 2017
45d04a0
callout license since we forked part of normalize
mdo Jan 21, 2017
47b8df6
Improve comments, move table background reset to .table class instead…
mdo Jan 21, 2017
69d0b5c
trailing space
mdo Jan 21, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/content/reboot.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: docs
title: Reboot
description: Documentation and examples for Reboot, Bootstrap's collection of element-specific CSS that builds on Normalize.css.
description: Documentation and examples for Reboot, Bootstrap's collection of element-specific CSS that heavily builds on Normalize.css.
group: content
redirect_from: "/content/"
---
Expand Down
2 changes: 1 addition & 1 deletion docs/content/typography.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ Change text alignment, transform, style, weight, and color with our [text utilit

## Abbreviations

Stylized implementation of HTML's `<abbr>` element for abbreviations and acronyms to show the expanded version on hover. Abbreviations have a default underline from Normalize.css and gain a help cursor to provide additional context on hover and to users of assistive technologies.
Stylized implementation of HTML's `<abbr>` element for abbreviations and acronyms to show the expanded version on hover. Abbreviations have a default underline and gain a help cursor to provide additional context on hover and to users of assistive technologies.

Add `.initialism` to an abbreviation for a slightly smaller font-size.

Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ With the above snippet, nested elements—including generated content via `:befo

Learn more about [box model and sizing at CSS Tricks](https://css-tricks.com/box-sizing/).

### Normalize.css
### Reboot

For improved cross-browser rendering, we use [Normalize.css](https://necolas.github.io/normalize.css/) to correct small inconsistencies across browsers and devices. We further build on this with our own, slightly more opinionated styles with [Reboot]({{ site.baseurl }}/content/reboot/).
For improved cross-browser rendering, we use [Reboot]({{ site.baseurl }}/content/reboot/) to correct inconsistencies across browsers and devices while providing slightly more opinionated resets to common HTML elements.

## Community

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"postcss-docs": "postcss --config grunt/postcss.js --no-map --replace docs/assets/css/docs.min.css && postcss --config grunt/postcss.js --no-map --replace docs/examples/**/*.css",
"sass": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
"sass-docs": "node-sass --output-style expanded --source-map true --precision 6 docs/assets/scss/docs.scss docs/assets/css/docs.min.css",
"scss-lint": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude scss/_normalize.scss scss/*.scss",
"scss-lint": "bundle exec scss-lint --config scss/.scss-lint.yml scss/*.scss",
"scss-lint-docs": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss",
"uglify": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output dist/js/bootstrap.min.js dist/js/bootstrap.js",
"uglify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/anchor.min.js docs/assets/js/vendor/clipboard.min.js docs/assets/js/vendor/holder.min.js docs/assets/js/src/application.js",
Expand Down
12 changes: 0 additions & 12 deletions scss/.scss-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ scss_files:
- "**/*.scss"
- "docs/assets/scss/**/*.scss"

exclude:
- "scss/_normalize.scss"

plugin_directories: ['.scss-linters']

# List of gem names to load custom linters from (make sure they are already
Expand All @@ -28,8 +25,6 @@ linters:
BorderZero:
enabled: true
convention: zero # or `none`
exclude:
- _normalize.scss

ChainedClasses:
enabled: false
Expand All @@ -43,7 +38,6 @@ linters:
Comment:
enabled: true
exclude:
- _normalize.scss
- bootstrap.scss
style: silent

Expand Down Expand Up @@ -108,8 +102,6 @@ linters:
LeadingZero:
enabled: true
style: exclude_zero # or 'include_zero'
exclude:
- _normalize.scss

MergeableSelector:
enabled: false
Expand Down Expand Up @@ -138,8 +130,6 @@ linters:
ignore_unspecified: false
min_properties: 2
separate_groups: false
exclude:
- _normalize.scss
order:
- position
- top
Expand Down Expand Up @@ -538,8 +528,6 @@ linters:
identifier_list: base
additional_identifiers: []
excluded_identifiers: []
exclude:
- _normalize.scss

ZeroUnit:
enabled: true
Expand Down