Mark Otto
1633da2ce8
remove unnecessary docs sections for media queries page
2015-01-19 15:44:53 -08:00
Mark Otto
72bc9b97f0
fix homepage nav styles
2015-01-19 15:44:45 -08:00
Mark Otto
a72741ed62
nuke files
2015-01-19 15:25:53 -08:00
Mark Otto
d8c94029d3
move around files
2015-01-19 15:25:49 -08:00
Bootstrap's Grunt bot
c643a3d331
automatic grunt dist
2015-01-19 23:20:54 +00:00
Mark Otto
b6c0007f21
Merge pull request #15606 from tagliala/trim-whitespaces
...
Trim whitespaces
2015-01-19 15:13:16 -08:00
Mark Otto
faedb7fec4
grunt
2015-01-19 14:55:25 -08:00
Mark Otto
7440c38469
fix invalid css
2015-01-19 14:50:41 -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
Geremia Taglialatela
e90f98dd0c
Trim whitespaces
2015-01-19 21:26:01 +01:00
XhmikosR
a8139a0392
Update QUnit to v1.17.0.
2015-01-19 20:10:34 +02:00
XhmikosR
4fd01b7ac1
Merge pull request #15605 from twbs/deps
...
Update devDependencies.
2015-01-19 19:54:43 +02:00
XhmikosR
fbc220defd
Update devDependencies.
2015-01-19 19:20:13 +02:00
Mark Otto
24aad4fe3a
customizer typo
2015-01-19 09:19:09 -08:00
Mark Otto
bcf7dd38b5
Merge pull request #15604 from twbs/ship_v3.3.2
...
Ship v3.3.2
2015-01-19 09:03:09 -08:00
Mark Otto
fa47de717e
grunt
2015-01-19 08:33:33 -08:00
Mark Otto
c683e7dea7
bump versions
2015-01-19 08:32:13 -08:00
Mark Otto
ce29def7a6
grunt
2015-01-19 08:27:15 -08:00
Thomas McDonald
0964504fda
remove less references from package files
...
Closes #62 (of v4)
2015-01-18 19:06:51 -08:00
Chris Rebert
1236e7a996
Merge pull request #64 from twbs/fix-build
...
Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"
2015-01-18 15:08:12 -08:00
Mark Otto
4ed95f5fa2
fixes #15497 : increase decimals on line-height-large from 1.33 to 1.3333333 to fix button sizing in Win 8.1 Chrome
2015-01-18 15:03:14 -08:00
Chris Rebert
1e5ce1e1a9
Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"
...
This reverts commit 2916ac43ed57baacc49d2cc7550b8d1dfe87b261.
This reverts commit 3d635f30795deb11ee7feaea5595b78c70221389.
This reverts commit 61a21205575aa03b4fbbacee2052d20bf75941d4.
This change broke the Grunt build.
2015-01-18 15:00:58 -08:00
Chris Rebert
61a2120557
fix main SCSS file paths
...
Fixes 2916ac43ed57baacc49d2cc7550b8d1dfe87b261 errata
FYI @glebm
2015-01-18 14:29:53 -08:00
Mark Otto
06c00d5591
Merge branch 'master' of github.com:twbs/bootstrap
2015-01-18 13:39:50 -08:00
Mark Otto
db8eeaa17a
Fixes #15142 : Add position: relative; to .dropup for proper placement of menus
2015-01-18 13:39:40 -08:00
Chris Rebert
161eac4fd7
rm dummy href from dismiss-on-next-click popover example; fixes #15277
2015-01-18 12:51:47 -08:00
Mark Otto
1bf1ba7103
Merge branch 'master' into pr/15278
...
Conflicts:
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.css.map
docs/dist/css/bootstrap.min.css
2015-01-18 12:24:29 -08:00
Mark Otto
22b79dae3c
grunt
2015-01-18 12:22:43 -08:00
Mark Otto
bf69fbdf1f
Merge pull request #15594 from twbs/fix_15493
...
Fixes #15493 : inherit color on small/.small in .panel-title
2015-01-17 21:51:03 -08:00
Mark Otto
de491e914a
fixes #15493 : inherit color on small/.small in .panel-title
2015-01-17 21:35:55 -08:00
Bootstrap's Grunt bot
c020669b07
automatic grunt dist
2015-01-18 05:11:01 +00:00
Mark Otto
e39b5b5b25
Merge pull request #15551 from lee101/master
...
Fix table-striped to work with bootstraps tooltips on rows
2015-01-17 21:07:13 -08:00
Chris Rebert
8a1efe91df
#15576 errata: #15298 also reproduces on Linux
...
See https://github.com/twbs/bootstrap/issues/15298#issuecomment-69216754
2015-01-16 15:16:52 -08:00
Bootstrap's Grunt bot
46710efba4
automatic grunt dist
2015-01-16 21:41:05 +00:00
Mark Otto
b1daf3803e
Merge pull request #15589 from KevinJannis/patch-3
...
Added blank line between selectors in badges
2015-01-16 13:31:52 -08:00
Kevin Jannis
be8eafd76b
Added blank line between selectors in badges
2015-01-16 21:44:27 +01:00
Bootstrap's Grunt bot
2a1adb5f94
automatic grunt dist
2015-01-16 19:11:06 +00:00
Chris Rebert
85a6595a71
.form-control: add note about <select> & border-radius
...
Refs #15340
2015-01-16 11:02:51 -08:00
Bootstrap's Grunt bot
b7c332f183
automatic grunt dist
2015-01-16 16:41:05 +00:00
XhmikosR
f6a96e7824
Merge pull request #15583 from twbs/deps
...
Update devDependencies.
2015-01-16 18:38:52 +02:00
Chris Rebert
2eaa7e0e1c
Merge pull request #15581 from twbs/inline-form-with-visible-labels
...
Add example of using .form-inline with visible <label>s
2015-01-16 08:20:41 -08:00
XhmikosR
0481ce973f
Fix bogus JSCS warning.
2015-01-16 17:50:05 +02:00
XhmikosR
0e79fe1a9f
Update JSCS config for the new version.
2015-01-16 17:49:58 +02:00
XhmikosR
f5a5621af2
Update devDependencies.
2015-01-16 17:49:58 +02:00
Mark Otto
f9ef6d2471
Merge pull request #15585 from dancourse/patch-1
...
12 items of *fewer* as it's a countable item
2015-01-16 03:03:28 -08:00
Bootstrap's Grunt bot
e0da137158
automatic grunt dist
2015-01-16 10:51:20 +00:00
Mark Otto
02921b4d75
Merge pull request #15584 from KevinJannis/patch-2
...
Added blank lines between selectors for alerts
2015-01-16 02:41:11 -08:00
Dan Course
21f7254e10
12 items of *fewer* as it's a countable item
...
http://www.oxforddictionaries.com/words/less-or-fewer
2015-01-16 10:36:46 +00:00
Kevin Jannis
1c131fb95d
Added blank lines between selectors for alerts
2015-01-16 10:06:35 +01:00
Chris Rebert
ca2c1e1576
custom widths not always required for inline form fields
...
[skip sauce]
2015-01-15 17:52:02 -08:00
