Mark Otto
f579b66b80
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
docs/assets/js/raw-files.min.js
2014-10-02 21:19:43 -07:00
Mark Otto
12091b9567
Fixes #14711 : Account for list groups in collapsing panels
2014-10-02 21:19:20 -07:00
Heinrich Fenkart
68b80836cf
grunt
2014-10-03 05:20:23 +02:00
Heinrich Fenkart
32162b16cb
grunt
2014-10-01 21:10:33 +02:00
Mark Otto
121b204b14
grunt
2014-09-26 13:48:31 -07:00
Mark Otto
8e25695d09
Fixes #14687 : Include video element in responsive embed
2014-09-26 13:45:28 -07:00
Heinrich Fenkart
0d04dcaebd
grunt
2014-09-26 00:10:41 +02:00
Heinrich Fenkart
7ce6824748
grunt
2014-09-25 02:23:48 +02:00
Mark Otto
4969c2055d
grunt
2014-09-22 14:27:13 -07:00
Heinrich Fenkart
36ebec5e76
grunt
2014-09-22 21:47:24 +02:00
Mark Otto
d1660ad078
Swap -small and -large variables for -sm and -lg
2014-09-21 16:04:37 -07:00
Mark Otto
e33922eb06
grunt
2014-09-18 19:11:47 -07:00
Mark Otto
98b745a06b
grunt
2014-09-18 19:00:30 -07:00
Mark Otto
75204aeafa
grunt
2014-09-18 18:33:52 -07:00
Mark Otto
1917b2d870
G R U N T
2014-09-17 22:00:12 -07:00
Mark Otto
92e81718a3
Use .clearfix mixin instead of overflow on examples
2014-09-17 21:43:46 -07:00
Mark Otto
ca2711fc8e
rewrite jumbotron less and make heading use a class
2014-09-17 20:03:32 -07:00
Mark Otto
86828fcd3d
Some secondary button border action
2014-09-17 18:10:28 -07:00
Mark Otto
9f2aeafe85
Merge branch 'master' into derp
...
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.svg
docs/_includes/components/badges.html
docs/_includes/components/input-groups.html
docs/_includes/components/pagination.html
docs/_includes/css/forms.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/home-nav.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.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/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/dist/fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.svg
less/_button-group.less
less/_jumbotron.less
less/_variables.less
less/mixins/vendor-prefixes.less
less/panels.less
less/thumbnails.less
package.json
2014-09-17 15:21:31 -07:00
Heinrich Fenkart
5a5cf224e1
grunt
2014-09-16 05:59:09 +02:00
Heinrich Fenkart
16f9529ed1
grunt
2014-09-16 05:40:03 +02:00
Heinrich Fenkart
d0f76e416c
grunt
2014-09-13 04:46:31 +02:00
Heinrich Fenkart
0a4c39dc40
Teh grunt
...
https://www.youtube.com/watch?v=L-4VxEtWyRo
2014-09-13 03:15:04 +02:00
Heinrich Fenkart
0cf94b82ee
grunt
2014-09-13 02:42:18 +02:00
Heinrich Fenkart
cabace78da
G R U N T
2014-09-11 23:43:27 +02:00
Heinrich Fenkart
9b9e2f5d13
grunt and missing new line
2014-09-09 01:23:48 +02:00
Heinrich Fenkart
9702579aeb
run grunt
2014-09-09 00:12:33 +02:00
Heinrich Fenkart
c9602c29c3
grunt
2014-09-08 22:41:45 +02:00
Mark Otto
6cec0399d0
grunt
2014-09-08 11:40:23 -07:00
Mark Otto
f2783fbf83
Fixes #14319 : Prevent jumbotron reflow by ensuring padding of .container isn't interferred with by .jumbotron side padding
2014-09-08 10:29:45 -07:00
Mark Otto
48a1308e5d
grunt
2014-09-08 10:23:25 -07:00
XhmikosR
5b9fcea9f2
Run grunt.
2014-09-08 09:04:33 +03:00
Mark Otto
551306fe9d
grunt
2014-08-28 17:22:08 -07:00
Mark Otto
783e001786
grunt
2014-08-27 23:35:54 -07:00
Mark Otto
72ddad6fc8
Fixes #14439 : Add static tooltip example to docs
2014-08-27 23:33:03 -07:00
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
XhmikosR
b1bb57360c
Specify cursor: pointer for #import-manual-trigger.
2014-08-26 13:12:54 +03: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
3c0e2e28f8
fixes #14425 : remove invalid css property
2014-08-23 13:37:29 -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
Chris Rebert
71c2c372f6
Fix #14411 by setting JSON Content-Type for Gist API request
2014-08-17 15:41:53 -07:00
Mark Otto
7629e08d2b
space out consecutive navs better
2014-08-05 17:17:00 -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
9096c20021
grunt
2014-08-04 14:05:12 -07:00
Mark Otto
9e92b74aa3
fix ads text
2014-08-03 16:58:59 -07:00
Mark Otto
99edff6dda
fix sidebar again
2014-08-03 16:23:32 -07: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
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
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
XhmikosR
de1d8c36ad
Run grunt.
2014-08-01 19:49:54 +03:00
Thomas Welton
9739271c04
Add drag and drop config import; closes #11004
...
Closes #13790 by merging a rebased version of it.
2014-07-31 11:45:21 -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
463fe476d8
Merge pull request #14166 from hnrch02/docs-cleanup
...
Docs cleanup
2014-07-23 20:39:40 -07:00
XhmikosR
97cb2803d7
Run grunt.
2014-07-22 08:31:36 +03:00
XhmikosR
caed585033
Update Filesaver.js to v2014-07-21.
2014-07-22 08:29:06 +03:00
XhmikosR
5c569dc4d4
Update Blob.js to the latest version.
2014-07-22 08:29:06 +03:00
XhmikosR
8d435cbb3c
Run grunt.
2014-07-22 08:25:41 +03:00
Heinrich Fenkart
38335b2a3d
Merge alert examples and add .bs-example-standalone class
2014-07-17 05:16:48 +02:00
Chris Rebert
b3d068f2d3
regenerate docs/assets/js/docs.min.js
2014-07-15 17:21:39 -07:00
Chris Rebert
11db482371
popover dismiss-on-next-click example: instead of <button>, use <a> w/ tabindex
...
Fixes #14038 .
Research supporting this choice of approach:
https://gist.github.com/cvrebert/68659d0333a578d75372
Why not <button>?
Even with a `tabindex` attribute, they don't gain focus when clicked upon in:
* Mac OS X Firefox 30.0
* Mac OS X Safari 7.0.5
2014-07-15 16:57:54 -07:00
Mark Otto
d60d34231a
table headers
2014-07-13 23:45:34 -07:00
Mark Otto
b831dc06af
more rems
2014-07-13 13:50:35 -07:00
Mark Otto
66f7062e81
transitions mixin and global variable, add it to buttons
2014-07-13 13:31:07 -07:00
Mark Otto
a1bd7634d7
more docs rems, some mixin optimization
2014-07-13 13:19:58 -07:00
Mark Otto
2211af5ed1
more rems in docs
2014-07-13 12:47:24 -07:00
Mark Otto
3d36227616
rem-ify the footer and masthead
2014-07-13 12:38:06 -07:00
Mark Otto
0d89b7f55e
rem-ify homepage icon
2014-07-13 12:15:14 -07:00
Mark Otto
aaccb80c3c
yellow var
2014-07-13 12:10:54 -07:00
Mark Otto
b137f0b874
vars
2014-07-13 12:04:05 -07:00
Mark Otto
bf4984145a
nesting docs css
2014-07-13 12:00:17 -07:00
Mark Otto
fecbaca907
grunt some more things, rebuild customizer nav
2014-07-12 18:11:07 -07:00
Mark Otto
7a8d9dbdbf
grunt
2014-07-12 18:06:26 -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
717a50ce19
grunt
2014-07-12 15:37:13 -07:00
Mark Otto
bd292ca3b8
Fixes #14107 : Lighten placeholder text
2014-07-12 15:13:18 -07:00
Mark Otto
a63c066e3d
rearrange a few things; drop compiled theme file
2014-07-11 22:46:10 -07:00
Mark Otto
d2baa4fd40
tweak docs sidenav styles
2014-07-11 22:35:07 -07:00
Mark Otto
cabb86d126
Merge branch 'master' into derp
...
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
docs/_includes/components/progress-bars.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
2014-07-11 00:38:28 -07:00
Mark Otto
4993ab6e00
start markdowning getting started and moving things to separate pages
2014-07-10 17:54:06 -07:00
Mark Otto
35c90fe13d
rewrite getting started quick start and download in markdown
2014-07-10 02:24:13 -07:00
Mark Otto
1af9ae1671
docs change
2014-07-10 00:52:10 -07:00
Mark Otto
7cfaf2f29e
simplify example css
2014-07-10 00:31:09 -07:00
Mark Otto
fb775bae21
fix sidenav js
2014-07-10 00:24:34 -07:00
XhmikosR
94472ee74a
Run grunt.
2014-07-10 10:03:24 +03:00
XhmikosR
e598247bcc
Update uglify-js to v2.4.15.
2014-07-10 10:02:41 +03:00
Mark Otto
bae1604110
really fix the docs
2014-07-09 23:24:17 -07:00
Mark Otto
61d9606fff
remove outline
2014-07-09 23:22:43 -07:00
Mark Otto
616a7a50eb
nuke commented out sidenav; fix docs
2014-07-09 23:20:33 -07: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
216bc3d68b
Rewrite grid docs in markdown
2014-07-09 22:00:07 -07:00
