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

54 Commits

Author SHA1 Message Date
Mark Otto
eb2e1102be Flexbox all the time (Drop IE9 support and remove $enable-flex option) (#21389)
* remove the $enable-flex variable option

* remove bootstrap-flex.css dist file and it's grunt task

* remove the separate flex css file for docs; it's all the same now

* remove flexbox docs (porting some to the main grid docs in next commit)

* clean up few grid docs bits to simplify copy, start to mention flexbox

* port relevant flexbox-grid.md content to grid.md

- clean up mixins
- update how it works section
- bring over sizing and alignment sections

* remove the $enable-flex from the options.md page

* update lead paragraph to mention flexbox

* update migration to mention loss of ie9 support

* remove mention of flexbox dist file

* clarify IE support

* making a note

* remove flexbox variant mentions from component docs

- updates docs for media object, navs, list group, and cards to consolidate docs
- no more need to callout flexbox variants since it's now the default

* remove $enable-flex if/else from sass files

* remove flex dist files

* update scss lint property order to account for flex properties

* linting

* change to numberless classes for autosizing, wrap in highlighting div

* bump gruntfile and postcss to ie10

* redo intro sections

* rearrange

* phew, redo hella grid docs

- rearrange all the things
- consolidate some bits

* remove reference to flexbox mode

* more border action for demo

* Make some changes to the .card's in .card-deck's to ensure footers align to the bottom
2016-12-21 20:26:17 -08:00
Simon Bächler
8402d2321f Use a variable for the default font weights. Fixes #20741
Websites might use different weights such as medium or thin or use light as default weight instead of normal.
Also referenced: #18605 and #16170.
2016-10-19 21:41:27 +02:00
Mark Otto
227f066650 Revert "Drop the $small-font-size variable for the newer $font-size-sm one" 2016-10-16 18:49:55 -07:00
Mark Otto
8f6a47303a Drop the -font-size variable for the newer -size-sm one
Originally -font-size was added in v3 to set the font-size of the <small> element. Now that we have newer, global type variables, we can use those instead for these kind of things.

Fixes #20859
2016-10-09 12:45:58 -07:00
Mark Otto
e194db05c8 Merge branch 'v4-dev' into mark-padding 2016-02-16 20:25:40 -08:00
Mark Otto
853921df32 Merge pull request #19210 from twbs/small-font-size
Add $small-font-size variable
2016-02-16 20:23:54 -08:00
Chris Rebert
cdc0a7a748 Introduce $mark-bg variable so that <mark>'s background-color can be customized independently of $state-warning-bg
[skip sauce]
[skip validator]
2016-02-16 00:44:55 -08:00
Chris Rebert
4278eb57ab Add $small-font-size variable
[skip sauce]
[skip validator]
2016-02-15 23:59:53 -08:00
Chris Rebert
7441beba67 Add $mark-padding variable
[skip sauce]
[skip validator]
2016-02-15 23:55:20 -08:00
Mark Otto
eee0a685a4 only do it for non-flex version 2016-02-06 20:02:39 -08:00
Mark Otto
ccf971d860 Fixes #17969: Clear horizontal dls
- Using the grid classes, they still need clearfixes since rows aren't injected between them all
- Update docs to fix broken classes
2016-02-06 20:01:37 -08:00
Chris Rebert
23979a9994 Revert separation of <hN> and .hN heading styles
This reverts commit deeb74e321.

Reverts #18038
Fixes #18992
[skip sauce]
[skip validator]
2016-02-04 00:05:02 -08:00
Mark Otto
ba37c37615 Redo line-height globally
- Rename -height to -height-base to match other vars
- Drop use of -height across the board and rely on it to be inherited
- Adjust padding of .dropdown-header to account for different line-height of h6 heading element (this needs refactoring for variables and rems also)
2016-02-03 19:45:13 -08:00
Chris Rebert
a22c696485 Extract $blockquote-border-width variable
[skip sauce]
2016-01-14 22:27:08 -08:00
Chris Rebert
4c86e37c2d Remove .dl-horizontal; it's redundant to the grid system; fixes #18652
[skip sauce]
2015-12-24 21:26:26 -07:00
Mark Otto
9e872efb3f rip out the .blockquote-* children classes for margin utils 2015-12-07 23:36:35 -08:00
Mark Otto
886bbe9bc0 Merge pull request #18138 from bassjobsen/patch-12
refactor blockqoutes to to avoid tag selectors & child selectors
2015-12-07 23:32:31 -08:00
Mark Otto
515ff1aacb rewrite list-inline to use margin and simpler styles 2015-12-07 23:31:02 -08:00
Mark Otto
d3c87d32fa Merge branch 'patch-11' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-11 2015-12-07 23:28:31 -08:00
Chris Rebert
e8dcb2f917 Add $list-inline-padding variable
[skip sauce]
[skip validator]
2015-12-04 01:56:49 -08:00
O'meid
677b7bd1c0 scss: move Figures from _type to _images 2015-11-12 22:13:13 -08:00
Chris Rebert
d8d709da1f Consolidate redundant heading style declaration
[skip sauce]
[skip validator]
2015-11-10 21:19:35 -08:00
Bass Jobsen
0fdfde7709 Update _type.scss 2015-11-03 10:52:18 +01:00
Bass Jobsen
bffd2905b9 refactor blockqoutes to to avoid tag selectors & child selectors css v4 2015-11-03 10:17:21 +01:00
Bass Jobsen
63ea4a38f8 refactor list-inlineto toavoid tag selectors & child selectors 2015-11-03 01:53:28 +01:00
Chris Rebert
c3834b8d5a Merge pull request #18038 from twbs/fix-16947
Make heading class styles trump heading element styles
2015-10-27 09:38:20 -07:00
Chris Rebert
5f30f2740b Trivially simplify heading margin-bottom declarations
[skip sauce]
[skip validator]
2015-10-23 19:23:06 -07:00
Chris Rebert
deeb74e321 Make heading class styles trump heading element styles; fixes #16947
[skip sauce]
[skip validator]
2015-10-23 17:03:33 -07:00
Marko Prelec
d5e47c57f1 Extract list-unstyled mixin; closes #17792
/fyi @mdo
2015-10-13 01:24:11 -07:00
Kevin Kirsche
54fba7cbe5 Rename .img-responsive class to .img-fluid
Fix #17166
2015-09-01 21:12:28 -07:00
Kevin Kirsche
d51f0a4f81 Use double colons for psuedo elements
Fix #17052
2015-08-24 13:22:10 -04:00
Mark Otto
b2dccb15d7 fix majority of scss linter errors 2015-08-23 01:00:22 -07:00
Mark Otto
c3373df95f clean out comments that aren't all that helpful 2015-08-17 18:33:34 -07:00
Mark Otto
1da01e68ba variables cleanup
- new vars for .lead size and weight (previously had none)
- new var for default margin-bottom on h1-h6 elements (previously had none)
- rearranged vars to combine two typography sections into one in variables.scss
- reassigned border-width var to hr-border-width
- made hr-border more specific as hr-border-color
2015-08-13 23:18:32 -07:00
Mark Otto
b1a74195c8 simpler type, docs callout for reproducing the v3 style headings and small text 2015-08-12 20:45:21 -07:00
Mark Otto
eaeee93fa3 docs rearrange 2015-08-09 23:38:16 -07:00
Mark Otto
08d6dc5b71 add basic figure support 2015-08-09 21:42:47 -07:00
Mark Otto
7a50a2cbe8 introduce display heading classes 2015-08-09 21:17:27 -07:00
Mark Otto
ed42fc9b76 line-height-base to line-height var 2015-06-22 23:24:32 -07:00
Mark Otto
219c4cbf87 remove another extend 2015-04-26 00:08:40 -07:00
Mark Otto
88a92e433d move abbr stuff for tooltip to reboot, clean up type scss 2015-04-18 11:13:45 -07:00
Mark Otto
bf085b1a02 delete the .page-header and its docs 2015-04-17 20:00:38 -07:00
Mark Otto
7049a07444 More reboot work, commenting out things that have been moved over 2015-04-17 00:22:35 -07:00
Mark Otto
06c2862d25 start stubbing out a new reboot section and file 2015-04-16 18:39:45 -07:00
Mark Otto
36e4cd0287 Move .img- classes to new _images.scss; move hr to _type.scss 2015-04-16 17:10:47 -07:00
Mark Otto
517977fca4 fix validation, run grunt dist 2015-03-01 14:11:22 -08:00
Mark Otto
c16fee5efd Merge branch 'master' into v4
Conflicts:
	.travis.yml
	Gruntfile.js
	bower.json
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/breadcrumbs.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/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/customizer-variables.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/examples.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.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/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/vendor/FileSaver.js
	docs/assets/js/vendor/autoprefixer.js
	docs/assets/js/vendor/uglify.min.js
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.min.js
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/narrow-jumbotron/narrow-jumbotron.css
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/theme/index.html
	grunt/configBridge.json
	js/affix.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tooltip.js
	less/badges.less
	less/glyphicons.less
	less/type.less
	less/variables.less
	package.json
	scss/_dropdown.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
2015-03-01 13:44:10 -08:00
Gleb Mazovetskiy
c0c16edc41 Update styles for Ruby Sass compat 2014-12-24 22:22:15 +02:00
Chris Rebert
8250f41948 rm trailing whitespace 2014-12-19 18:35:58 -08:00
Mark Otto
3737cb1d46 Use grid classes or mixins on .dl-horizontal, update docs to include it, removes auto truncate and makes .text-overflow mixin into a .text-truncate class and mixin combo for better granularity 2014-12-11 14:12:10 -08:00