Mark Otto
260378411d
Update README.md
2015-01-20 15:40:32 -08:00
Chris Rebert
d9f437f4ec
Merge pull request #15619 from twbs/markdown
...
Change markdown library
2015-01-20 13:25:24 -08:00
Chris Rebert
92b267f357
update shrinkwrap
2015-01-20 13:05:58 -08:00
Chris Rebert
30b74105dd
remarkable -> markdown-it
2015-01-20 13:04:55 -08:00
Chris Rebert
136058b562
Merge pull request #15618 from twbs/update-sauce
...
update grunt-saucelabs to ~8.5.0
2015-01-20 13:04:17 -08:00
Chris Rebert
0b7f6b941a
update shrinkwrap
2015-01-20 12:49:46 -08:00
Chris Rebert
429809c9cc
update grunt-saucelabs to ~8.5.0
2015-01-20 12:49:08 -08:00
Mark Otto
33e32bffc8
new headers, ad placements, intro paragraphs on several pages, etc
2015-01-19 20:03:08 -08:00
Mark Otto
ff1d10affb
fix scrollspy nav
2015-01-19 18:51:21 -08:00
Chris Rebert
8ecdda0b35
Merge pull request #52 from twbs/normalize-figure
...
Let Normalize.css normalize <figure>'s margin
2015-01-19 16:58:01 -08:00
Mark Otto
6f61201f87
fix broken brand logos
2015-01-19 16:18:38 -08:00
Mark Otto
2327a1d44d
no need for additional subheading
2015-01-19 16:17:54 -08:00
Mark Otto
e2c6dd29d8
tons of docs helpers cleanup
2015-01-19 16:15:51 -08:00
Mark Otto
6ba05d95d5
properly reset button.close styles
2015-01-19 16:11:39 -08:00
Mark Otto
29c7a0f002
fix quick floats example
2015-01-19 16:11:29 -08:00
Mark Otto
dfdb99c989
fix broken breadcrumb divider
2015-01-19 16:08:48 -08:00
Mark Otto
21dc9b1f57
fix broken buttons
2015-01-19 16:03:41 -08:00
Mark Otto
e1dfe01c9f
separate examples for inline radios and checkboxes
2015-01-19 16:01:28 -08:00
Mark Otto
43e45ce06c
consolidate forms docs
2015-01-19 16:00:56 -08:00
Mark Otto
dba0e3c947
docs subheading tweaks
2015-01-19 15:53:21 -08:00
Mark Otto
3fe96e8f50
fix border color on inverse tables
2015-01-19 15:52:40 -08:00
Mark Otto
affd89122f
better separation of docs sections with a light bottom border on h2s
2015-01-19 15:49:44 -08:00
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
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