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

726 Commits

Author SHA1 Message Date
Mark Otto
dae1a68fb1 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/navs.html
	docs/_includes/css/images.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/tabs.html
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-07-09 22:19:23 -07:00
Mark Otto
ed1bcc0af4 docs design changes for markdown content 2014-07-09 21:18:00 -07:00
Mark Otto
857fe32a70 Refactor navs: new classes, remove separate pills & tabs files, drop justified nav because it never really worked 2014-07-09 16:04:31 -07:00
Mark Otto
77a4bcad9e Drop the deprecated .visible-* classes (because we replaced them with .visible-*-block, -inline-block, -inline 2014-07-09 13:58:27 -07:00
Mark Otto
02fe0ecc31 Drop deprecated code from Less files 2014-07-09 13:54:32 -07:00
Mark Otto
a0d8c62f18 more navs work 2014-07-09 13:51:49 -07:00
Mark Otto
41f3af407b Merge branch 'derp' into derp_navs
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-07-09 10:48:58 -07:00
Mark Otto
54537b500e Refactor: drop all custom .progress-bar styles and replace with <progress> element 2014-07-09 01:39:34 -07:00
XhmikosR
643effe382 Run grunt. 2014-07-09 10:24:39 +03:00
Mark Otto
a8625f452e Badges, navs, and more 2014-07-09 00:15:20 -07:00
Mark Otto
f380ca21e2 Use .box-shadow() mixin so we can enable/disable them 2014-07-08 21:19:14 -07:00
Mark Otto
ff4ff3bd06 Drop: .opacity() mixin because we no longer support IE8 2014-07-08 19:22:19 -07:00
Mark Otto
c825629ffe Nuke all IE8 fallbacks and comments and hacks 2014-07-08 19:20:45 -07:00
Mark Otto
0e47ce959c move tabs and pills to separate files with unique classes 2014-07-08 19:00:48 -07:00
Mark Otto
6c7a6b4691 rems: table padding 2014-07-08 17:39:29 -07:00
Mark Otto
e6d64a5455 Nuke unused vars for panels wells and thumbnails 2014-07-08 17:32:03 -07:00
Mark Otto
5e1adc10bb Bring back button info 2014-07-08 17:30:11 -07:00
Mark Otto
f399d21ef5 Revamp button: rename .btn-default to .btn-secondary, drop .btn-info 2014-07-08 17:09:47 -07:00
Mark Otto
542f9973ed Fix navbar margins and update grid sidebar styles to match 2014-07-08 16:39:46 -07:00
Mark Otto
f6367bc0e4 Implement the new border-radius guard: only round things if global @enable-rounded == true 2014-07-08 16:25:01 -07:00
Mark Otto
f05365f73b rems: update breadcrumbs to use new sizing; improve variables by renaming @breadcrumb-separator to @breadcrumb-divider; change up colors 2014-07-08 16:00:52 -07:00
Mark Otto
8582659d5c Refactor: drop .dropdown .caret for a generated caret using .dropdown-toggle:after 2014-07-08 14:23:34 -07:00
Mark Otto
9c319d67ee Drop: Thumbnails completely, as they'll be replaced 2014-07-08 04:00:35 -07:00
Mark Otto
527eccaa9f Drop: Panels completely, as they'll be replaced 2014-07-08 03:56:47 -07:00
Mark Otto
c3b0870ec0 Overhaul semantic grid mixins
- Drops all the `.make-**-column` mixins for a single set to be used
within (or outside) media queries.
- Renames `.container-fixed` to `.make-container` for consistency.
- Updates built-in grid system to use new setup.

See http://jsbin.com/qiqet/2/ for an example of it in action.
2014-07-08 03:38:23 -07:00
Mark Otto
9f53f9aea1 rems: rework grid system vars to use rems/ems 2014-07-08 03:14:27 -07:00
Mark Otto
a06a35d27a Drop: Device-named container variables since we alreay sort of deprecated them many releases ago 2014-07-08 02:55:07 -07:00
Mark Otto
74ac24aa59 Drop: deprecated .dropdown-menu.pull-right styles 2014-07-08 02:40:35 -07:00
Mark Otto
4139545da2 rems: input sizes 2014-07-08 02:31:33 -07:00
Mark Otto
b50498acd4 Clean up variable alignment and comments; change grays to new custom values 2014-07-08 02:26:50 -07:00
Mark Otto
d7b38d8c4a Drop: all vendor prefix mixins because autoprefixer 2014-07-08 02:04:48 -07:00
Mark Otto
6fda409853 Fix input sizing and increase vertical padding on textareas 2014-07-08 01:44:09 -07:00
Mark Otto
d84fce7230 Drop: @screen-xs, @screen-xs-min, and @screen-phone 2014-07-08 01:25:23 -07:00
Mark Otto
8d50d4a684 rems: buttons 2014-07-08 01:22:02 -07:00
Mark Otto
413750a03c rems: code 2014-07-08 01:02:59 -07:00
Mark Otto
dae5ec5416 Drop Glyphicons 2014-07-08 00:33:21 -07:00
Mark Otto
b29268dc48 drop wells 2014-07-08 00:25:13 -07:00
Mark Otto
97008c381a restore font-weight and knock down font-size for .lead 2014-07-08 00:10:31 -07:00
Mark Otto
f5024eb13a start the move to rems 2014-07-07 23:36:40 -07:00
Mark Otto
81b59d3536 Merge branch 'master' into derp
Conflicts:
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/docs.min.js
	docs/assets/js/src/application.js
2014-07-07 22:10:22 -07:00
Mark Otto
a0d8d56593 grunt 2014-07-07 00:59:51 -07:00
Mark Otto
117ca8167a Merge branch 'master' of github.com:twbs/bootstrap 2014-07-06 23:45:36 -07:00
Mark Otto
225819ae66 Merge pull request #14029 from BBosman/touch-action
Add touch-action: manipulate to .btn
2014-07-06 23:43:43 -07:00
Mark Otto
8e2348e9ed Fixes #13746: Add docs section for brand image 2014-07-06 18:39:37 -07:00
Mark Otto
9be2bbb5ef Fixes #14053: Don't show radio/checkbox in justified button groups 2014-07-06 16:48:41 -07:00
Mark Otto
e2029e122c Fixes #13997: Move min-height for radio/checkbox to their inner label 2014-07-06 15:09:20 -07:00
Mark Otto
043b40636c grunt 2014-07-05 20:17:57 -07:00
Mark Otto
9677c95d83 Fixes #13967: Don't reset the cite element's font-style 2014-07-05 20:02:02 -07:00
Mark Otto
f22e7d857a Fixes #13953: Remove the progress bar min-width styles for low percentages to avoid jumping progress 2014-07-05 20:01:18 -07:00
Mark Otto
0378a6be2a Fixes #13943: Lighten the navbar inverse link color more since our text contrast change in v3.2.0 2014-07-05 19:59:50 -07:00