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
Mark Otto
d66b65ddde
Merge branch 'master' into icon_paths
...
Conflicts:
dist/css/bootstrap.css.map
docs/dist/css/bootstrap.css.map
2014-05-22 23:01:42 -07:00
Mark Otto
fab9ab8fe9
Reset the padding on radio/checkbox labels in form-inline
2014-05-22 18:42:21 -07:00
Chris Rebert
1340a491e5
grunt dist
2014-05-21 23:37:06 -07:00
Mark Otto
91d51d3fba
Merge branch 'master' into icon_paths
2014-05-20 23:21:12 -07:00
Mark Otto
f39b272fed
grunt
2014-05-12 21:19:01 -07:00
Mark Otto
7e1f2994d1
grunt dist
2014-05-12 21:15:27 -07:00
Mark Otto
c42cd8164c
Merge branch 'master' into icon_paths
...
Conflicts:
dist/css/bootstrap.css.map
docs/dist/css/bootstrap.css.map
2014-05-12 20:26:23 -07:00
Mark Otto
d4c7248749
grunt dist
2014-05-12 20:26:01 -07:00
Mark Otto
31956be6ef
Merge branch 'master' into icon_paths
...
Conflicts:
dist/css/bootstrap-rtl.css
dist/css/bootstrap.css.map
dist/js/bootstrap.min.js
docs/dist/css/bootstrap.css.map
docs/dist/js/bootstrap.min.js
2014-05-12 19:57:49 -07:00
Mark Otto
0d1018cb2f
grunt
2014-05-12 19:53:12 -07:00
Mark Otto
f5513fd30e
nuke rtl
2014-05-12 19:47:53 -07:00
Chris Rebert
cb2ef1eff4
grunt dist
2014-05-08 16:35:03 -07:00
Mark Otto
510f4fe50a
Fixes #13478 , reverts #10941
2014-05-08 15:41:08 -07:00
Mark Otto
4c3ef52fc1
Merge branch 'pr/13320'
...
Conflicts:
dist/css/bootstrap-rtl.min.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap-rtl.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-04-30 19:48:22 -07:00
Mark Otto
108b7c390e
grunt dist
2014-04-30 19:47:56 -07:00
Mark Otto
b217357252
grunt dist
2014-04-30 19:35:47 -07:00
XhmikosR
30b07b942e
Run grunt
.
2014-04-26 08:35:48 +03:00
Chris Rebert
eaddbd92bb
grunt dist
2014-04-20 16:19:13 -07:00
Mark Otto
06fb9406bd
grunt dist
2014-04-17 00:56:22 -07:00
XhmikosR
2f0f8ec6d1
Run grunt dist
.
2014-04-09 10:02:34 +03:00
Mark Otto
de86b36b50
grunt dist
2014-04-08 23:59:17 -07:00
Mark Otto
bfb99413ee
grunt dist
2014-04-06 20:49:22 -07:00
XhmikosR
4c2626fecb
Run grunt
.
2014-04-03 10:53:44 +03:00
Tyler Cipriani
0907244256
Modal body shift fix for IE10/11
...
Closes #13103 by merging it.
2014-03-28 23:45:22 -07:00
Chris Rebert
e8551d4f50
grunt dist
2014-03-28 11:00:39 -07:00
XhmikosR
10586bf040
Run grunt
.
2014-03-27 08:02:51 +02:00
Mark Otto
acf5707323
Fixes #13066 : Add z-index to the form control feedback icons so input groups don't render on top of them
2014-03-24 20:07:54 -07:00
Mark Otto
b4f4c7b16f
Fixes #13037 : add text-align: left; to prevent alignment change in dropdowns
2014-03-24 20:02:56 -07:00
Mark Otto
6951b48e65
grunt
2014-03-24 20:01:46 -07:00
Mark Otto
ce013440e7
grunt
2014-03-24 19:31:12 -07:00
Mark Otto
6f6bce5944
Fixes #13141 : Add a max-width: 100%; to label elements so IE8 wraps text
2014-03-24 19:26:41 -07:00
Mark Otto
21084192b6
Fixes #13079 : Scope .open class in button variant mixin to immediate children
2014-03-24 19:08:05 -07:00
Chris Rebert
0dc88edeb9
grunt dist
2014-03-20 01:16:01 -07:00
Mark Otto
43cf003f9a
Update gruntfile to point to new customizer nav, run grunt
2014-03-16 20:40:30 -07:00
fat
dd7cab84f6
build
2014-03-16 18:44:58 -07:00
XhmikosR
f750f7e448
Run usebanner before cssmin.
2014-03-11 19:49:11 +02:00
Mark Otto
6f13a14e4b
moar grunt
2014-03-10 16:51:53 -07:00
Mark Otto
74c391b9ad
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/css/bootstrap.css.map
docs/assets/js/customize.min.js
docs/dist/css/bootstrap.css.map
2014-03-10 16:43:01 -07:00
Mark Otto
a83ca38713
Fixes #13003 : Move padding on radio and checkbox options from the surrounding div to the label to remove the no-click deadzone caused by negative margin
2014-03-10 16:41:56 -07:00
Mark Otto
552f170e3c
even more grunt
2014-03-10 13:31:34 -07:00
Mark Otto
a36643dd33
Merge branch 'master' into modular-the-mixins
...
Conflicts:
dist/css/bootstrap.css.map
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
2014-03-10 00:08:29 -07:00
Mark Otto
564b79ca87
grunt
2014-03-09 23:58:29 -07:00
mrmrs
b0bc9ef815
Add consistent newline at end of files in less/mixins
2014-03-09 23:44:11 -07:00
mrmrs
2f380a9683
Merge branch 'master' into modular-the-mixins
...
* master:
Replace some images on the Carousel example with some base64 encoded 1x1 gifs
ugh grunt
moar grunt
mo copy
http://www.youtube.com/watch?v=AJWtLf4-WWs
grunt
Copy change
fix grammar in comment in forms.less
Fixes #12759
Fixes #12738
replace .visible-{size} with .visible-{size}-{display} ; fixes #8869
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
less/mixins.less
2014-03-09 23:28:08 -07:00
mrmrs
348b7de7f7
Break mixins.less up into smaller modules.
...
Move all deprecated vendor prefix mixins to less/mixins/vendor-prefixes.less
Create mixins directory and move partials to that directory.
FIXES #12994
2014-03-09 23:18:48 -07:00
Mark Otto
30deb5697c
grunt
2014-03-09 22:06:14 -07:00
Mark Otto
a15c24410b
Fixes #12759
...
Ensures proper sizing and alignment of input groups within inline and
navbar forms.
* Uses `inline-table` on the input group
* Nukes the widths to `width: auto`—without this, the parent input
group doesn’t size correctly and functions as `display: table;` or
`block`
2014-03-09 21:25:51 -07:00
Mark Otto
b4d66b7f6b
Fixes #12738
...
* Removes default max-height from .navbar-collapse (so not every navbar
will get a max-height collapse section)
* Scopes regular 340px max-height to fixed top and bottom navbars only
(those are the only ones that really need a max-height to enable
scrolling)
* Adds a landscape media query for phones to cap the max-height at
200px for fixed navbars"
2014-03-09 20:45:32 -07:00
Mark Otto
1a5fb4ef24
Fixes #12843 : Scope label styles for horizontal forms to a media query so their narrow viewport display looks just like a normal form
2014-03-09 17:22:52 -07:00
Mark Otto
2f955907f9
Fixes #12669 : Properly reset line-height on date inputs for all sizes; Fix IE8+'s misaslignment of text within date inputs
2014-03-09 17:12:39 -07:00
Mark Otto
b69e4d636a
Reorganize mixins and G R U N T
2014-03-09 16:50:30 -07:00
mrmrs
71e9902d9a
Adjusts some section titles to be more explicit.
...
FIXES #12992
2014-03-09 16:25:27 -07:00
mrmrs
fc74ee5f67
Changes compiled assets after changing mixins.less
2014-03-09 16:15:35 -07:00
Mark Otto
ef5d8e98e2
Merge branch 'master' into sr-only-focusable
...
Conflicts:
dist/css/bootstrap.css
2014-03-08 20:34:29 -08:00
fat
4d96e69a55
fixes #9836
2014-03-08 19:45:38 -08:00
fat
e9cced72fd
fix #9342
2014-03-08 19:20:47 -08:00
Mark Otto
bcfb27b962
grunt
2014-03-08 16:11:24 -08:00
Mark Otto
67c747a109
grunt
2014-03-08 15:30:18 -08:00
Mark Otto
0143e38a67
Merge branch 'master' into document_popover_focus
...
Conflicts:
docs/assets/js/docs.min.js
2014-03-07 01:30:28 -08:00
mrmrs
d1d5d90413
Fixes #12748
2014-03-07 00:59:22 -08:00
Mark Otto
5bd2799978
G R U N T
2014-03-07 00:26:38 -08:00
Mark Otto
6452b409aa
grunt for days
2014-03-07 00:23:22 -08:00
Mark Otto
164b41b28d
Fixes #12937 : Darken active button states just a smidge more
2014-03-07 00:19:26 -08:00
Mark Otto
705ff7f227
Moving the embed to it's own CSS file, moving the docs to the Components page with an example, fixing a Glyhpicons list problem in the docs
2014-03-06 23:18:13 -08:00
Mark Otto
12c619f5b9
Merge branch 'master' into boulox-responsive-embed
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/css.html
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-03-06 22:40:25 -08:00
Mark Otto
7e299c6a49
Fixes #12683 : Remove the overflow: hidden; from the .panel-group > .panel because it apparently serves no purpose and cuts off nested dropdown menus.
2014-03-06 22:32:21 -08:00
Mark Otto
df3eb66ede
Merge branch 'master' into popovers-use-radii-var
...
Conflicts:
dist/css/bootstrap.css.map
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
2014-03-06 21:44:46 -08:00
Mark Otto
0c9308a3b2
Rewrite the disabled list group items to simplify styles
2014-03-06 21:40:22 -08:00
Mark Otto
c8614c0f15
Merge branch 'master' into pr/12490
...
Conflicts:
less/list-group.less
2014-03-06 21:32:52 -08:00
Mark Otto
9dc796155c
Fixes #12722 : Fixes up responsive tables in print
...
Safari renders this fine for one reason or another, but Chrome still renders the media query styles to make tables responsive. This change scopes them to screen devices only, so printing looks boss everywhere.
2014-03-06 21:25:34 -08:00
mrmrs
4868096dbd
Fixes #12934
2014-03-06 21:05:29 -08:00
Mark Otto
17e41098c8
Fixes #12824 : Remove white-space: nowrap from code elements
2014-03-06 20:39:19 -08:00
Mark Otto
8526adf69c
grunt
2014-03-06 20:33:10 -08:00
Mark Otto
10eb167e35
Fixes #12901 : Refactors list group active state for use on non-anchors
2014-03-04 22:42:13 -08:00
Mark Otto
24de9b0994
Fixes #12848 : Account for and document progress bars at 0-3%
2014-03-04 16:55:15 -08:00
Mark Otto
026e2f8d30
Grunt after merging #12863
2014-03-04 14:24:09 -08:00
Mark Otto
7733f24373
Fixes #12868 : Enables icon feedback on validation states for large/small inputs.
...
Also reorders the CSS to place Glyhpicons as a dependency before other components for fewer overrides and less specific CSS.
2014-03-04 14:12:57 -08:00
Mark Otto
f45df64670
Fixes #12914 : Darken immediate children hr elements in jumbotrons
2014-03-04 13:54:09 -08:00
Mark Otto
d6e07f045c
Merge branch 'master' into rtl_via_css_flip
...
Conflicts:
docs/assets/js/raw-files.min.js
2014-03-04 00:41:57 -08:00
Mark Otto
1399497a02
grunt
2014-03-04 00:30:40 -08:00
Mark Otto
559b90f944
Rename RTL files and add some basic docs
2014-03-03 23:50:04 -08:00
Mark Otto
4dd7b4bd87
Don't RTL the theme file--no need
2014-03-03 21:54:07 -08:00
Mark Otto
af39290a9d
Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip
...
Conflicts:
Gruntfile.js
package.json
test-infra/npm-shrinkwrap.canonical.json
2014-03-03 21:52:56 -08:00
Mark Otto
2ece8dd336
Merge branch 'master' into rtl_via_css_flip
2014-03-03 21:50:03 -08:00
Mark Otto
e381635b1f
Fixes #12593 : Add support for table bodies and table rows to the collapse plugin
2014-03-03 21:39:53 -08:00
XhmikosR
e5affbfa0a
Run grunt
.
2014-03-01 20:58:53 +02:00
XhmikosR
c48042f440
Run grunt dist.
2014-02-26 01:23:52 +02:00
Chris Rebert
e40c1e5e6d
add Grunt task for css-flip-ing & add RTL to Gruntfile configs
2014-02-25 10:31:02 -08:00
Mark Otto
b22f064c2e
Use CSS Flip to generate RTL variation
2014-02-24 19:22:41 -08:00
Mark Otto
429fc9331e
grunt dist
2014-02-24 19:10:23 -08:00
Mark Otto
66a229bdbf
Fixes #12822 : Scope panel collapse styles to immediate panel bodies only
2014-02-22 22:46:03 -08:00
Mark Otto
7b60470e9b
Fixes #12801 : Add padding to the bottom of .form-control-static to match height of standard form controls
2014-02-22 14:16:11 -08:00
Mark Otto
7e551ecaf7
Update modals to use more consistent padding—modal body and footer now match modal header
2014-02-22 12:38:56 -08:00
Mark Otto
4ccf088a24
Merge branch 'master' into pr/12813
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-22 12:20:53 -08:00
Mark Otto
b99be29f32
Fixes #12756 : Ensure horizontal dls are cleared by moving the clearfix out of the media query
2014-02-22 12:13:11 -08:00
Supergibbs
49094844ac
Correctly set .btn-link colors in a .navbar and .navbar-inverse #12694
2014-02-21 20:51:06 -08:00
Mark Otto
4b622c60c1
grunt
2014-02-21 17:42:25 -08:00
Mark Otto
385fb68981
grunt
2014-02-13 08:59:03 -08:00
Mark Otto
88fdd45427
v3.1.1 bump
2014-02-13 01:12:26 -08:00
Mark Otto
eb20d6f132
Fixes #11659 , #12698 , and #12349 : Always apply position and z-index form controls in input groups for proper borders
2014-02-11 14:20:01 -08:00
Mark Otto
8551f42ae2
Merge branch 'master' into pr/12412
...
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
test-infra/npm-shrinkwrap.canonical.json
2014-02-11 09:50:40 -08:00
Mark Otto
728067b586
Update Glyphicons
2014-02-10 21:28:05 -08:00
Mark Otto
9427310a09
Fixes #12674
...
* The problem with #12674 is that it reassigns the same variable, but the color values were purposely different.
* This uses Less's color functions to generate the proper darker colors.
* Why darker colors? Because those CSS carets render lighter than their solid border counterparts. Consider it a design hack.
2014-02-10 20:49:17 -08:00
Mark Otto
769339ed18
grunt dist
2014-02-08 17:30:40 -08:00
Mark Otto
44bb7b20c7
Fixes #12625 : Only remove first list group item's top and last list group item's bottom borders when the list group is first or last
2014-02-08 17:29:10 -08:00
Mark Otto
e9199718d6
Merge branch 'master' into fix-12154
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-08 16:52:22 -08:00
Mark Otto
3fc7a4cffa
grunt with new mixins
2014-02-08 16:31:42 -08:00
Mark Otto
26e2d7cdc9
grunt
2014-02-08 16:13:30 -08:00
Mark Otto
e3cfd5821d
Merge branch 'master' into pr/12462
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-08 16:01:56 -08:00
Mark Otto
c8315edd73
Merge branch 'master' into pr/12639
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-08 15:37:35 -08:00
Mark Otto
06f1293acf
Merge branch 'master' into panels_and_tables
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-07 18:36:27 -08:00
Mark Otto
a2f08158d0
Nuke shit I added in 4d7b2ddba9
that shouldn't come until v4
2014-02-07 15:44:50 -08:00
Bas Bosman
a0052b5a37
Drop -o-user-select
2014-02-07 14:14:32 +01:00
Mark Otto
4d7b2ddba9
Fixes #12486 : Restore full width inputs for input groups in inline forms and navbars
2014-02-07 02:58:10 -08:00
Mark Otto
d91d9b0ade
Fixes #12447 : Properly reset borders on table cells in panels
2014-02-07 02:38:01 -08:00
Mark Otto
3ccc16cad0
grunt for days
2014-02-07 02:24:37 -08:00
Mark Otto
228d4e59fc
Fixes #12555 : Rearrange variables to place grids and containers closer
2014-02-07 01:22:30 -08:00
Mark Otto
ace0abfdb6
Merge branch 'master' into thumbnail-extend
...
Conflicts:
dist/css/bootstrap.css
2014-02-06 18:52:03 -08:00
Supergibbs
08ff305ed7
Added border radiuses to table when in a panel. Fixes #12461
2014-02-05 14:29:23 -08:00
Mark Otto
00cb50a41a
grunt dist--includes changes from #12025 and decimal changes, likely from a change in dependencies
2014-02-04 19:27:25 -08:00
Mark Otto
ef3c560a06
Reorder grunt dist tasks to ensure JS gets copied over
2014-02-04 02:04:23 -08:00
Mark Otto
07098d1bb7
Fixes #12470 : Scope large modal styles to minimum viewport width
2014-02-04 02:01:31 -08:00
Mark Otto
ec6c9d2824
Don't offset customizer alert, grunt dist
2014-02-04 00:18:34 -08:00
Mark Otto
58bf3f9432
grunt after last commits
2014-01-31 13:40:32 -08:00
Mark Otto
1409cde7e8
Bump versions, run grunt
2014-01-30 08:30:37 -08:00
Mark Otto
d2f1887bb5
Merge branch 'master' into pr/12388
...
Conflicts:
dist/css/bootstrap.min.css
2014-01-29 22:18:29 -08:00
Mark Otto
9195d8e8eb
Follow up to #11655 : don't reset opacity on disabled buttons
2014-01-29 21:57:44 -08:00
Mark Otto
d631e0b92d
Fix #12422 : Reset height on multiple select in input size mixin
2014-01-29 21:34:10 -08:00
Mark Otto
545c957f17
Fixes #12424 : Account for Normalize change on figure element so that we don't potentially screw folks over
2014-01-29 21:23:23 -08:00
Mark Otto
a9a4d81730
grunt
2014-01-28 10:08:40 -08:00
Mark Otto
b7ac009a52
Remove #8350 's reset for number inputs since Normalize fixes those upstream
2014-01-27 12:25:39 -08:00
Mark Otto
400720d00b
Remove optgroup resets from #7611 since Normalize fixes those upstream
2014-01-27 12:24:35 -08:00
Mark Otto
6a0a139cda
Upgrade to Normalize v3-rc1 in prep for v3 final
2014-01-27 12:08:55 -08:00
Mark Otto
64e8132426
Fix #12359 : Reset min-width on fieldsets so that they don't break responsive tables and behave more like standard block level elements
2014-01-24 11:55:59 -06:00
Mark Otto
44fc629d44
Fix #12353 : Scope table border reset in panels to first-child rows
2014-01-23 22:52:26 -06:00
Mark Otto
f748390cf5
Follow-up to #12250 : remove remaining page margins for print
2014-01-22 21:51:23 -06:00
Mark Otto
08e83a62b7
Fix #11655 : Fix broken disabled states for iOS form controls and buttons
2014-01-22 21:43:08 -06:00
Mark Otto
f4dd6221d4
Merge branch 'responsive-embed' of https://github.com/boulox/bootstrap into boulox-responsive-embed
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
2014-01-13 20:01:54 -08:00
Chris Rebert
4787a69efb
fix #12154
2014-01-12 13:51:03 -08:00
Mark Otto
3a8e99e91e
Fixes #12171 : Ensure panel groups have a bottom margin since we nuke it on child panels
2014-01-10 18:56:44 -08:00
Mark Otto
7f153974e1
Fixes #11990 and #12159 : Make range inputs block level and 100% wide by default
2014-01-09 18:07:14 -08:00
Mark Otto
99b66c1f2c
grunt dist
2014-01-09 18:06:46 -08:00
Chris Rebert
fc62379e61
grunt dist
2014-01-09 11:11:13 -08:00
Chris Rebert
72ff8ff9fb
grunt dist
2014-01-08 18:39:08 -08:00
Chris Rebert
bf5017c01c
fix #12143
2014-01-07 17:08:40 -08:00
Julian Thilo
8fd177bfa7
Fix #12073 : Consistent order of variations
...
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
2014-01-07 22:24:45 +01:00
Julian Thilo
8d903fbd02
duh, missed one more file
...
X-Ref: 7fcfe61f4d
2014-01-07 01:27:49 +01:00
Julian Thilo
7fcfe61f4d
Update copyright notices in all places
...
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
2014-01-07 01:05:24 +01:00
Zlatan Vasović
1c83d68ca4
New Year
2014-01-01 15:37:08 +01:00
Mark Otto
50cf0b1a9d
Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030 : navbar toggle focus state
2013-12-31 18:23:10 -08:00
Mark Otto
f10cf21a8f
Streamline copy process by not bringing over full files into docs/dist/, only take minified ones
2013-12-28 23:05:02 -08:00
Mark Otto
a9c829bc0c
Rearrange repository contents because muahahahahahaha
2013-12-28 22:47:03 -08:00
Mark Otto
2115ac525b
Run grunt dist after adding 'a' requirement to the text emphasis classes
2014-01-18 14:40:48 -08:00
Mark Otto
7b42103df6
kill bottom margin on last docs section
2014-01-18 11:33:50 -08:00
Mark Otto
380019ccb2
Split box-sizing reset for faster rendering
2014-01-16 20:00:28 -08:00
fat
3b2418e688
remove flaky pos bottom test which is effect by unit scroll pos
2014-01-16 13:44:08 -08:00
Mark Otto
413c8a6da5
Fixes #12210 : badges in xs buttons
2014-01-14 21:44:38 -08:00