Mark Otto
f4eefd28d1
Merge branch 'master' into sr_friendly_hidden_content
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
2014-08-27 22:38:46 -07:00
Mark Otto
1ebc7e62a8
grunt
2014-08-27 22:37:10 -07:00
Mark Otto
f5890adb17
grunt
2014-08-27 22:25:24 -07:00
Mark Otto
0140198699
grunt
2014-08-23 13:46:28 -07:00
Mark Otto
32a6d9b404
Full grunt
2014-08-23 13:43:41 -07:00
Mark Otto
4fc96e8029
grunt
2014-08-23 13:35:22 -07:00
Mark Otto
6a0eb4e6bd
grunt
2014-08-23 12:19:36 -07:00
Chris Rebert
e7d5905f38
grunt
2014-08-17 15:44:25 -07:00
Mark Otto
3d5fd6f00d
remove that
2014-08-05 17:49:22 -07:00
Mark Otto
d4e58c755e
fuck around with responsive reflow table idea
2014-08-05 17:45:24 -07:00
Mark Otto
25d6824e6c
cards
2014-08-05 17:12:24 -07:00
Mark Otto
af0921062f
rename imported files to preface with underscore; rerun grunt dist
2014-08-04 15:36:41 -07:00
Mark Otto
ef9e76c2c5
comment out firefox specific code for linter to parse fully
2014-08-04 15:17:43 -07:00
Mark Otto
724240fe4f
Merge branch 'master' into derp
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/customizer-variables.html
docs/_includes/js/overview.html
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/carousel.less
2014-08-04 15:09:23 -07:00
Mark Otto
14e8ec2514
unfuck all that because lol dependencies
2014-08-04 10:14:11 -07:00
Heinrich Fenkart
b10b373c60
Follow-up to #13074 : use spec syntax instead of deprecated mixins
2014-08-04 06:19:42 +02:00
Mark Otto
ae9c160932
Merge branch 'master' into derp
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-08-03 16:18:41 -07:00
Mark Otto
6424acf69a
Fixes #14234 : Reset the hack IE8-10 with another hack just for IE11 for temporal inputs and line-height
2014-08-02 21:16:32 -07:00
Mark Otto
9d0872b748
Fixes #14251 : Remove the -webkit-overflow-scrolling to prevent Safari from screwing up widths
2014-08-02 19:05:46 -07:00
Mark Otto
de77d04899
Merge branch 'master' into derp
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-08-02 18:46:11 -07:00
Mark Otto
67d39404a2
grunt
2014-08-02 18:41:00 -07:00
Mark Otto
089d434895
Merge branch 'master' into derp
...
Conflicts:
_config.yml
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/glyphicons.html
docs/_includes/css/forms.html
docs/_includes/css/tables.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/header.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/dropdowns.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/javascript.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/browser-bugs.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/grid/index.html
docs/examples/jumbotron-narrow/index.html
docs/examples/jumbotron/index.html
docs/examples/justified-nav/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/offcanvas/index.html
docs/examples/signin/index.html
docs/examples/starter-template/index.html
docs/examples/sticky-footer-navbar/index.html
docs/examples/sticky-footer/index.html
docs/examples/theme/index.html
docs/examples/tooltip-viewport/index.html
less/code.less
less/panels.less
less/variables.less
2014-08-02 18:30:59 -07:00
Mark Otto
b9e6848dc8
Fixes #14253 : Add borders for tables that follow bodies in panels
2014-08-02 13:55:02 -07:00
Mark Otto
feed9aed5b
Fixes #13202 : Always use overflow: auto; on .table-responsive to prevent content breaking out of containers
2014-08-02 13:05:11 -07:00
XhmikosR
de1d8c36ad
Run grunt.
2014-08-01 19:49:54 +03:00
Mark Otto
98d693ba7b
Fixes #14142 : Adding horizontal padding to captions in tables in panels.
2014-07-23 21:03:46 -07:00
Mark Otto
078aafe7fd
Fixes #14221 : Make .form-control-static work in inline forms as well
2014-07-23 20:54:07 -07:00
Mark Otto
6dde491ddf
Fixes #14168 : bold nested kbd elements
2014-07-23 20:49:47 -07:00
Mark Otto
5713bd74d6
Fixes #12669 again: Redeclare the line-heights again for date inputs in IE8+
2014-07-23 20:32:05 -07:00
XhmikosR
8d435cbb3c
Run grunt.
2014-07-22 08:25:41 +03:00
Chris Rebert
49519e9816
grunt dist
2014-07-21 00:35:41 -07:00
Mark Otto
76368ef0a9
grunt dist
2014-07-14 09:04:47 -07:00
Mark Otto
4d6ab7c068
experiment with more utilities
2014-07-14 08:48:26 -07:00
Mark Otto
e6ee1b228f
inverse table idea
2014-07-14 00:23:46 -07:00
Mark Otto
d60d34231a
table headers
2014-07-13 23:45:34 -07:00
Mark Otto
3e896193ab
new navbar ideas
2014-07-13 23:33:54 -07:00
Mark Otto
66f7062e81
transitions mixin and global variable, add it to buttons
2014-07-13 13:31:07 -07:00
Mark Otto
8c586a8e3e
Fixes #14074 : Make open dropdown nav links in navbar use gradients
2014-07-12 17:59:02 -07:00
Mark Otto
5cfde0d3a5
Merge branch 'master' into derp
...
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/javascript/dropdowns.md
less/utilities.less
2014-07-12 16:15:45 -07:00
Mark Otto
fe0ef38898
Fixes #14095 : Add basic styling for captions, which we've for some reason been missing all this time.
2014-07-12 15:55:15 -07:00
Mark Otto
2962f845a5
grunt
2014-07-12 15:47:42 -07:00
Mark Otto
3e8cddf867
Fixes #13974 , #14123 : Remove translate3d repaint performance enhancement for text rendering and position wonkiness
2014-07-12 15:22:41 -07:00
Mark Otto
bd292ca3b8
Fixes #14107 : Lighten placeholder text
2014-07-12 15:13:18 -07:00
Mark Otto
6336895b96
Change code variables to match pre
2014-07-12 01:23:06 -07:00
Mark Otto
a63c066e3d
rearrange a few things; drop compiled theme file
2014-07-11 22:46:10 -07:00
XhmikosR
94472ee74a
Run grunt.
2014-07-10 10:03:24 +03:00
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
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
93a7421f2c
.btn-default to .btn-secondary
2014-07-08 17:14:14 -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
354d423668
grunt
2014-07-06 15:08:37 -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
Mark Otto
3c99de9764
grunt
2014-07-05 19:57:15 -07:00
Bas Bosman
4975978083
Remove superfluous cursor:pointer
2014-07-03 13:17:14 +02:00
Bas Bosman
47521fd7d0
Add touch-action: manipulate to buttons
2014-07-03 12:53:23 +02:00
Mark Otto
3537481c97
Fixes #12738 again: use max-device-width instead of max-width for .navbar-collapse height in landscape devices
2014-07-03 00:55:32 -07:00
Mark Otto
fcf9470a20
typo
2014-07-02 23:35:37 -07:00
Mark Otto
96b545c6b5
Fixes #13989 : Don't extend the input sizes; manually chain the selectors
2014-07-02 23:14:23 -07:00
Mark Otto
fb37ec16f8
Merge branch 'master' into pr/14005
2014-07-02 22:55:01 -07:00
Mark Otto
b4958aba69
merge in and resolve conflicts
2014-07-02 22:54:56 -07:00
XhmikosR
2a47034598
Copy all files in docs/dist.
...
Now we are on par with what we have on the gh-pages dist/ folder.
2014-07-01 07:38:38 +03:00
XhmikosR
225351431e
Update dependencies.
2014-06-30 18:35:50 +03:00
XhmikosR
fec94e1695
Update "grunt-autoprefixer".
2014-06-27 07:38:46 +03:00
Mark Otto
ff6b279b3c
bump to v3.2.0
2014-06-26 09:13:24 -07:00
Mark Otto
4045740c54
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-06-25 16:57:22 -07:00
Mark Otto
e40df7cfac
fixes #13912 : make radios/checkboxes work with inline forms again
2014-06-25 16:56:36 -07:00
XhmikosR
4abb095783
Run grunt.
...
Revert a991cd572c
2014-06-25 02:07:17 +03:00
Chris Rebert
a991cd572c
grunt dist; closes #13914
2014-06-24 15:06:47 -07:00
XhmikosR
15c63fa137
Run grunt.
2014-06-24 19:01:40 +03:00
Mark Otto
df7cfe8652
Fixes #13903 : Restore side padding on .btn-block
2014-06-23 10:38:45 -07:00
Mark Otto
e98fc373e3
Fixes #13872 more: add overrides for lg and sm input modifiers
2014-06-20 13:24:14 -07:00
Mark Otto
1e53dcd137
Fixes #13872 : Always apply padding to .form-control-static for that vertical alignment
2014-06-19 18:33:41 -07:00
Mark Otto
8bd4163ad4
fixes #13881 : restore existing striped progress bar behavior with theme styles
2014-06-19 18:14:56 -07:00
Mark Otto
a4fa8d07c8
grunt dist
2014-06-19 15:24:24 -07:00
XhmikosR
abe7afd87a
Run grunt.
2014-06-19 12:58:34 +03:00
Mark Otto
162a27f67a
grunt
2014-06-18 23:50:16 -07:00
Mark Otto
99f176e7ec
rewrite striped and active to deprecate the parent selectors, change the docs
2014-06-18 22:35:05 -07:00
Mark Otto
d222c21f84
grunt
2014-06-18 22:24:56 -07:00
Mark Otto
74982cf101
grunt
2014-06-18 22:23:31 -07:00
Mark Otto
74a264fb98
fixes #13021 : add .form-group-sm/-lg
2014-06-18 18:19:17 -07:00
Mark Otto
46e8a5817d
fixes #10073 : add width: 100%; for ie10 and below to size svg.img-responsive correctly
2014-06-18 17:34:09 -07:00
Mark Otto
fdf174e498
grunt dist
2014-06-18 15:46:38 -07:00
XhmikosR
6d45f733e5
Run grunt.
2014-06-18 13:16:32 +03:00
Chris Rebert
8bee6549ad
grunt dist
2014-06-17 18:23:14 -07:00
Mark Otto
b1a9168b15
grunt dist
2014-06-11 18:13:50 -07:00
Mark Otto
f09d6b7a98
grunt
2014-06-10 23:15:09 -07:00
Mark Otto
5c1357b3e9
grunt
2014-06-10 22:58:21 -07:00
Mark Otto
7bcd78847f
grunt
2014-06-10 22:51:17 -07:00
Mark Otto
57bd8f943b
grunt
2014-06-10 22:47:25 -07:00
Mark Otto
dcbe484a09
New text align class, .text-nowrap, for preventing text from breaking to new lines. Applies it to the grid docs table.
2014-06-10 21:20:34 -07:00
Mark Otto
631e04b6fc
Fixes #13548 : Use position: absolute; to fix checkbox and radio line-height problems that were introduced after #13003
2014-06-10 20:50:58 -07:00
Mark Otto
c0e82accad
grunt
2014-06-10 20:17:22 -07:00
Mark Otto
9a51410fd3
grunt
2014-06-10 18:11:26 -07:00
Mark Otto
4aca4cf866
grunt for table change
2014-06-10 00:26:20 -07:00
Mark Otto
e06970948b
Fixes #13616 : Add custom gutter support to containers
2014-06-10 00:24:23 -07:00
Mark Otto
9e1652aa50
grunt
2014-06-09 22:25:24 -07:00
Mark Otto
8d9ef8f0a1
Addresses part of #13643 : Correct webkit-linear-gradient syntax in horizontal gradients
2014-06-08 23:02:16 -07:00
Mark Otto
85cde774b9
remove max-width: 100%; from table and place it on .table
2014-06-08 16:54:05 -07:00
Mark Otto
5dbfdd47c5
fixes #13375
2014-06-08 14:08:06 -07:00
Mark Otto
d1872b4c98
Merge branch 'master' into pr/13736
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
2014-06-08 13:57:44 -07:00
Mark Otto
5cd72ce230
grunt
2014-06-08 13:55:40 -07:00
Mark Otto
34891de173
grunt
2014-06-08 11:19:35 -07:00
Mark Otto
1e3b93804f
grunt
2014-06-08 11:18:59 -07:00
XhmikosR
03a8949d7c
Run grunt.
2014-06-06 01:23:07 +03:00
Chris Rebert
8e568a8e36
grunt dist
2014-05-23 15:49:13 -07:00
