From ef38ca1c11c63d8e962af4706e4d182e24468cee Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 8 Oct 2017 14:20:41 +0300 Subject: Make `Dropped the Affix jQuery plugin` bold. (#24294) --- docs/4.0/migration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/4.0/migration.md b/docs/4.0/migration.md index 7c70c7221..8a0d3d3fa 100644 --- a/docs/4.0/migration.md +++ b/docs/4.0/migration.md @@ -69,7 +69,7 @@ Here are the big ticket items you'll want to be aware of when moving from v3 to - [Octicons](https://octicons.github.com/) - [Font Awesome](http://fontawesome.io/) - See the [Extend page]({{ site.baseurl }}/docs/{{ site.docs_version }}/extend/icons/) for a list of alternatives. Have additional suggestions? Please open an issue or PR. -- Dropped the Affix jQuery plugin. +- **Dropped the Affix jQuery plugin.** - We recommend using `position: sticky` instead. [See the HTML5 Please entry](http://html5please.com/#sticky) for details and specific polyfill recommendations. One suggestion is to use an `@supports` rule for implementing it (e.g., `@supports (position: sticky) { ... }`)/ - If you were using Affix to apply additional, non-`position` styles, the polyfills might not support your use case. One option for such uses is the third-party [ScrollPos-Styler](https://github.com/acch/scrollpos-styler) library. - **Dropped the pager component** as it was essentially slightly customized buttons. -- cgit v1.2.3 From 0c1597ebde2a41964d77547d5b1d7f00cd9402b6 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 7 Oct 2017 18:48:57 +0300 Subject: examples/dashboard/dashboard.css: merge duplicate selector. --- docs/4.0/examples/dashboard/dashboard.css | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'docs') diff --git a/docs/4.0/examples/dashboard/dashboard.css b/docs/4.0/examples/dashboard/dashboard.css index a59005148..ca7135b08 100644 --- a/docs/4.0/examples/dashboard/dashboard.css +++ b/docs/4.0/examples/dashboard/dashboard.css @@ -27,18 +27,12 @@ h1 { bottom: 0; left: 0; z-index: 1000; - padding: 20px; + padding: 20px 0; overflow-x: hidden; overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ border-right: 1px solid #eee; } -/* Sidebar navigation */ -.sidebar { - padding-right: 0; - padding-left: 0; -} - .sidebar .nav { margin-bottom: 20px; } -- cgit v1.2.3 From a8fb64f3e3b7c9a8763ea89aea85082b1a073ef6 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 7 Oct 2017 19:16:49 +0300 Subject: Lint examples' CSS too. --- docs/4.0/examples/.stylelintrc | 12 ++++++++++++ docs/4.0/examples/blog/blog.css | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 docs/4.0/examples/.stylelintrc (limited to 'docs') diff --git a/docs/4.0/examples/.stylelintrc b/docs/4.0/examples/.stylelintrc new file mode 100644 index 000000000..44cf7c0e0 --- /dev/null +++ b/docs/4.0/examples/.stylelintrc @@ -0,0 +1,12 @@ +{ + "extends": "../../../build/.stylelintrc", + "rules": { + "at-rule-no-vendor-prefix": null, + "comment-empty-line-before": null, + "media-feature-name-no-vendor-prefix": null, + "property-no-vendor-prefix": null, + "selector-no-qualifying-type": null, + "selector-no-vendor-prefix": null, + "value-no-vendor-prefix": null + } +} diff --git a/docs/4.0/examples/blog/blog.css b/docs/4.0/examples/blog/blog.css index 6eda0a7b1..0f319ec92 100644 --- a/docs/4.0/examples/blog/blog.css +++ b/docs/4.0/examples/blog/blog.css @@ -13,12 +13,18 @@ body { color: #555; } -h1, .h1, -h2, .h2, -h3, .h3, -h4, .h4, -h5, .h5, -h6, .h6 { +h1, +.h1, +h2, +.h2, +h3, +.h3, +h4, +.h4, +h5, +.h5, +h6, +.h6 { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 400; color: #333; -- cgit v1.2.3 From c8ee8509cb72edd2f758398664bed8a0eeeb2dc4 Mon Sep 17 00:00:00 2001 From: Michael Letcher Date: Thu, 12 Oct 2017 19:22:18 +0100 Subject: Updated Safari Bug (#24350) --- docs/4.0/layout/grid.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/4.0/layout/grid.md b/docs/4.0/layout/grid.md index ca608477b..9e81dd913 100644 --- a/docs/4.0/layout/grid.md +++ b/docs/4.0/layout/grid.md @@ -149,9 +149,9 @@ For example, here are two grid layouts that apply to every device and viewport, {% endexample %} -Equal-width columns can be broken into multiple lines, but there is a [Safari flexbox bug](https://github.com/philipwalton/flexbugs#11-min-and-max-size-declarations-are-ignored-when-wrapping-flex-items) that prevents this from working without an explicit `flex-basis` or `border`. Our example works thanks to the `border` being set; you can do the same with `.col { border: 1px solid transparent; }`. Alternatively, you can set the flex-basis to the width of the column (e.g., `.col { flex: 1 0 50%; }`). +Equal-width columns can be broken into multiple lines, but there was a [Safari flexbox bug](https://github.com/philipwalton/flexbugs#11-min-and-max-size-declarations-are-ignored-when-wrapping-flex-items) that prevented this from working without an explicit `flex-basis` or `border`. -Both these fixes have been documented in a [reduced test case outside Bootstrap](https://output.jsbin.com/micohor). +Two workarounds have been documented in a [reduced test case outside Bootstrap](https://output.jsbin.com/micohor), though if the browser is up to date this shouldn't be necessary.
{% example html %} -- cgit v1.2.3 From 991cbe74d0004f443fc14c748dd1d8da424d7dde Mon Sep 17 00:00:00 2001 From: Jesse Mandel Date: Fri, 13 Oct 2017 03:34:27 -0700 Subject: Update colors in _data and theming.md to match _variables.scss (#24355) --- docs/4.0/getting-started/theming.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/4.0/getting-started/theming.md b/docs/4.0/getting-started/theming.md index c4c50dc4b..15c5caa0b 100644 --- a/docs/4.0/getting-started/theming.md +++ b/docs/4.0/getting-started/theming.md @@ -228,17 +228,19 @@ Within `_variables.scss`, you'll find our color variables and Sass map. Here's a {% highlight scss %} $colors: ( + "blue": $blue, + "indigo": $indigo, + "purple": $purple, + "pink": $pink, "red": $red, "orange": $orange, "yellow": $yellow, "green": $green, "teal": $teal, - "blue": $blue, - "pink": $pink, - "purple": $purple, + "cyan": $cyan, "white": $white, "gray": $gray-600, - "gray-dark": $gray-900 + "gray-dark": $gray-800 ) !default; {% endhighlight %} -- cgit v1.2.3 From 71e60e1f85e3e822bb62a919bfb9b1d4e5d7f29b Mon Sep 17 00:00:00 2001 From: Lucas Banegas Date: Fri, 13 Oct 2017 08:34:43 -0300 Subject: Describe compiled CSS (#24271) --- docs/4.0/getting-started/contents.md | 56 +++++++++++++++++++++++++++++++++++- docs/4.0/getting-started/download.md | 2 +- 2 files changed, 56 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/4.0/getting-started/contents.md b/docs/4.0/getting-started/contents.md index 96acbc053..3d5389fee 100644 --- a/docs/4.0/getting-started/contents.md +++ b/docs/4.0/getting-started/contents.md @@ -18,7 +18,15 @@ bootstrap/ │ ├── bootstrap.css │ ├── bootstrap.css.map │ ├── bootstrap.min.css -│ └── bootstrap.min.css.map +│ ├── bootstrap.min.css.map +│ ├── bootstrap-grid.css +│ ├── bootstrap-grid.css.map +│ ├── bootstrap-grid.min.css +│ ├── bootstrap-grid.min.css.map +│ ├── bootstrap-reboot.css +│ ├── bootstrap-reboot.css.map +│ ├── bootstrap-reboot.min.css +│ └── bootstrap-reboot.min.css.map └── js/ ├── bootstrap.js └── bootstrap.min.js @@ -26,6 +34,52 @@ bootstrap/ This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/web/tools/chrome-devtools/javascript/source-maps) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. +### Comparison of CSS files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CSS filesLayoutContentComponentsUtilities
+
bootstrap.css
+
bootstrap.min.css
+ 		AllAllAllAll
+
bootstrap-grid.css
+
bootstrap-grid.min.css
+ 		Only grid systemNoNoOnly flex utilities
+
bootstrap-reboot.css
+
bootstrap-reboot.min.css
+ 		NoOnly RebootNoNo
+ ## Bootstrap source code The Bootstrap source code download includes the precompiled CSS and JavaScript assets, along with source Sass, JavaScript, and documentation. More specifically, it includes the following and more: diff --git a/docs/4.0/getting-started/download.md b/docs/4.0/getting-started/download.md index cce660178..9f1199317 100644 --- a/docs/4.0/getting-started/download.md +++ b/docs/4.0/getting-started/download.md @@ -10,7 +10,7 @@ toc: true Download ready-to-use compiled code for **Bootstrap v{{ site.current_version}}** to easily drop into your project, which includes: -- Compiled and minified CSS bundles (default, grid-only, and Reboot-only) +- Compiled and minified CSS bundles (see [CSS files comparison]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/contents/#comparison-of-css-files)) - Compiled and minified JavaScript plugins This doesn't include documentation, source files, or any optional JavaScript dependencies (jQuery and Popper.js). -- cgit v1.2.3