0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Commit Graph

30 Commits

Author SHA1 Message Date
vsn4ik
f3aaccd46f Remove !default Scss flag in docs grid example 2015-12-09 00:20:37 +03:00
Chris Rebert
ade2ab1341 Remove non-responsive text alignment classes
These can be replaced by their `.text-xs-*` parallels.
This also avoids any complications from interactions between the responsive and non-responsive classes.
(e.g. `<div class="text-left text-md-right">`)

Refs #18300
[skip sauce]
2015-11-22 21:33:42 -08:00
Gleb Mazovetskiy
eabed0edf8 Change grid and container sizes to px
Changes grid and container sizes to `px`, as the
viewport pixel size does not depend on the font size.

The actual em values were inconsistent with the docs,
while the docs were not the same as the comments:

* `sm` breakpoint was 34em (544px) not 480px.
* `lg` container max-width was 60rem (960px), less gutter than `md`.
  Changed to 940px, same as Bootstrap 3.
* `xl` container max-width was 72.25rem which is 1140px not 1156px.
  Changed to 1140px matching the comment but not the docs.

Addresses #17070 and #17388.
2015-09-27 14:39:17 +01:00
Mark Otto
d9125290ed Merge pull request #17207 from kkirsche/patch-9
v4 - Force linebreaks after grid tier names in v4 grid docs
2015-09-01 20:53:31 -07:00
Heinrich Fenkart
0da684ff85 Merge pull request #17275 from mattez/fix-docs-layout-grid
Fix anchors, fix naming consistency
2015-08-25 00:21:39 +02:00
Chris Rebert
1ec0c49358 Replace remaining instances of defunct .visible* classes in docs
.visible-xs(-block) => .hidden-sm-up

Fixes #17263.
[skip sauce]
2015-08-24 14:42:21 -07:00
Matěj Kříž
a1b38092e2 Fix anchors, fix naming consistency
I found non working anchors and some naming in consistency. I hope I fixed well. Have a nice day.
2015-08-24 16:30:46 +02:00
Mark Otto
018eef9894 Merge pull request #17140 from kkirsche/patch-12
v4 - Rendered example bin in grid docs should use sass
2015-08-22 20:28:01 -07:00
Kevin Kirsche
cf5284f235 v4 - Force linebreaks after grid tier names in v4 grid docs
Fix #17176

Sorry, I f'd up the rebase in #17186
2015-08-21 08:04:44 -04:00
Mark Otto
bf2781d758 Merge pull request #17146 from kkirsche/patch-13
v4 - Add pixel values for the rem breakpoints and column sizes
2015-08-20 21:09:19 -07:00
Kevin Kirsche
5536facc68 Broken link in Sass mixins section of v4 docs
Fix #17177

Simplest example is using horizontal variants using rows.
2015-08-20 22:13:53 -04:00
Chris Rebert
8e6972b170 docs/layout/grid.md: Fix responsive utilities link 2015-08-20 18:34:59 -07:00
Heinrich Fenkart
66be25917a Docs: various fixes
Mostly links.
Fixes #17056.
2015-08-21 02:15:17 +02:00
Kevin Kirsche
ca9fdcee9c Add pixel values for the rem breakpoints and column sizes
Fix: #17145
2015-08-20 12:39:21 -04:00
Kevin Kirsche
5c03882aff Rendered example bin in grid docs should use sass
Fix #17129
2015-08-20 11:48:27 -04:00
Mark Otto
c064eef67b Massive cleanup
- Simpler main nav on all pages
- Back to purple masthead on homepage instead of dark graphite
- Active link styles on the main nav
- Cleaned up sidebar nav
- New docs layout name
- Homepage copy edits
- Updated bright purple docs color
2015-08-14 22:45:55 -07:00
Mark Otto
292ac7f302 rewrite some grid docs 2015-08-10 15:37:27 -07:00
Mark Otto
7370885338 grid docs tweaks 2015-08-08 16:51:13 -07:00
Mark Otto
fed0d8a2d4 restore page headers, use partial and page frontmatter to organize it 2015-08-05 17:47:45 -07:00
Mark Otto
b455ed8def add markdown toc stuff 2015-05-29 01:58:52 -07:00
Mark Otto
37e543759b scope grid example styles better 2015-04-23 01:30:55 -07:00
Mark Otto
33e32bffc8 new headers, ad placements, intro paragraphs on several pages, etc 2015-01-19 20:03:08 -08:00
Mark Otto
325748ff68 Merge branch 'master' into v4
Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
2015-01-19 14:48:12 -08:00
Chris Rebert
ff9c07f4aa fix numerical typo in grid docs 2015-01-06 17:46:46 -08:00
Mark Otto
fb176a97e1 change values, remove grid column size row 2014-12-31 10:46:50 -08:00
Chris Rebert
c6affe79b7 account for XL size tier in grid docs 2014-12-29 18:27:41 -08:00
Mark Otto
a1a3a007b6 tweak grid docs, add new tier 2014-12-04 21:02:04 -08:00
Mark Otto
156750941b move media queries docs to new section of layout 2014-12-04 16:51:19 -08:00
Mark Otto
b648a77ed3 Merge branch 'master' into v4
Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.eot
	dist/fonts/glyphicons-halflings-regular.svg
	dist/fonts/glyphicons-halflings-regular.ttf
	dist/fonts/glyphicons-halflings-regular.woff
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	docs/_includes/components/button-dropdowns.html
	docs/_includes/components/button-groups.html
	docs/_includes/components/dropdowns.html
	docs/_includes/components/glyphicons.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/labels.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/css/responsive-utilities.html
	docs/_includes/css/sass.html
	docs/_includes/css/tables.html
	docs/_includes/css/type.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/tabs.html
	docs/_includes/nav/components.html
	docs/_includes/nav/css.html
	docs/_includes/nav/javascript.html
	docs/_includes/nav/main.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/fonts/glyphicons-halflings-regular.eot
	docs/dist/fonts/glyphicons-halflings-regular.svg
	docs/dist/fonts/glyphicons-halflings-regular.ttf
	docs/dist/fonts/glyphicons-halflings-regular.woff
	docs/examples/carousel/index.html
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/navbar/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/sticky-footer-navbar/index.html
	docs/examples/theme/index.html
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	less/_carousel.less
	less/_forms.less
	less/glyphicons.less
2014-11-30 20:17:45 -08:00
Mark Otto
46f1fbe746 grid cleanup, nav rearranging 2014-07-11 22:58:43 -07:00