Heinrich Fenkart
a2c0bb49b1
grunt
2014-10-31 11:09:01 +01:00
Heinrich Fenkart
12b3ba7278
Customizer: listen to the right event for manual file selection in import
2014-10-31 10:58:03 +01:00
Heinrich Fenkart
b91474e538
grunt
2014-10-31 10:31:56 +01:00
Heinrich Fenkart
b8c3c5c19b
grunt
2014-10-30 04:45:04 +01:00
Mark Otto
16dbdbd7a2
Merge branch 'master' into v3.3.0
...
Conflicts:
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
2014-10-29 11:56:48 -07:00
Mark Otto
15d668dd15
grunt
2014-10-29 11:13:25 -07:00
Mark Otto
5429e71401
fixes #14913 : badges in list group shouldn't have text shadow
2014-10-29 10:27:18 -07:00
Mark Otto
e07d741088
grunt
2014-10-29 09:54:43 -07:00
Mark Otto
22f9c8fc0a
grunt
2014-10-29 08:58:51 -07:00
Mark Otto
94b59b57d6
version bump
2014-10-29 08:56:20 -07:00
Mark Otto
a369a0a729
grunt
2014-10-29 08:51:05 -07:00
Mark Otto
a75c6d84e1
grunt
2014-10-28 23:08:42 -07:00
Mark Otto
45b59f4307
Reverts #14848 , the overflow scrolling in the docs sidebar /cc @hnrch02
2014-10-28 22:57:16 -07:00
Heinrich Fenkart
cf88a65f30
Fix customizer download with Firefox.
2014-10-29 06:48:00 +02:00
Heinrich Fenkart
bf2ad00ee0
grunt
2014-10-29 04:56:02 +01:00
Heinrich Fenkart
94b544c229
grunt
2014-10-29 04:44:52 +01:00
Heinrich Fenkart
a7f58a8356
grunt
2014-10-29 04:30:31 +01:00
Mark Otto
a5497da5be
grunt
2014-10-27 20:37:17 -07:00
Mark Otto
892f6e35b8
Merge branch 'master' of github.com:twbs/bootstrap
2014-10-27 20:30:02 -07:00
Chris Rebert
a43d4767ba
.bs-customizer-input => .col-xs-4
2014-10-27 15:02:21 -07:00
Mark Otto
e3d2146350
fix rounded corners on copy buttons
2014-10-27 03:23:44 -07:00
Mark Otto
c15aa36798
switch to max-width on containers
2014-10-27 03:07:34 -07:00
Mark Otto
d896faa1b9
grunt
2014-10-27 01:35:02 -07:00
Mark Otto
252583b661
grunt
2014-10-26 23:07:20 -07:00
Mark Otto
dcee894a8c
grunt
2014-10-26 22:57:38 -07:00
Mark Otto
f26821a83a
fix progress bar animated biznas
2014-10-26 22:48:12 -07:00
Mark Otto
d6b0f45fb7
Merge branch 'master' into derp
...
Conflicts:
Gruntfile.js
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
docs/_includes/components/dropdowns.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/components/progress-bars.html
docs/_includes/components/responsive-embed.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/less.html
docs/_includes/css/overview.html
docs/_includes/css/responsive-utilities.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/getting-started/template.html
docs/_includes/header.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/nav/components.html
docs/_includes/nav/getting-started.html
docs/_layouts/default.html
docs/about.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/components.html
docs/components/navbar.md
docs/css.html
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/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
docs/getting-started.html
docs/javascript.html
docs/migration.html
less/_animation.less
less/_modal.less
less/_navbar.less
less/_variables.less
less/glyphicons.less
less/navs.less
less/panels.less
less/progress-bars.less
2014-10-26 22:31:59 -07:00
Mark Otto
66bb0b4fc9
Merge branch 'master' into need-to-activate-animated-progressbar
2014-10-26 14:43:32 -07:00
Mark Otto
05c785bfae
grunt
2014-10-26 14:42:06 -07:00
Heinrich Fenkart
66e140db82
Docs: progress bars' animation now needs to be manually toggled
...
Refs #14409
2014-10-26 20:43:41 +01:00
Mark Otto
743aaf6100
fix clipboard button and examples
2014-10-25 22:39:01 -07:00
Heinrich Fenkart
2cbb1d9374
grunt
2014-10-26 04:39:49 +01:00
Mark Otto
783eced7ab
follow up fix for #14837 /cc @hnrch02
2014-10-25 20:20:24 -07:00
Heinrich Fenkart
5f2e6fa58b
grunt
2014-10-26 03:53:10 +01:00
Heinrich Fenkart
44cc763229
grunt
2014-10-26 03:17:19 +01:00
Mark Otto
2c2564faef
Fixes #14736 : Reverts the remaining progress bar min value overrides from #12848
2014-10-25 19:10:03 -07:00
Mark Otto
3fcd65af41
Fixes #14806 : reset the text-shadow in the themed buttons
2014-10-25 18:57:27 -07:00
Mark Otto
9bf9aab132
grunt
2014-10-25 18:29:15 -07:00
Mark Otto
41a26ced24
Fixes #14814 : Use the link active bg variables for theme navbar gradients
2014-10-25 18:27:40 -07:00
Mark Otto
38217ee405
Merge branch 'pr/14801'
...
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
2014-10-25 18:16:40 -07:00
Mark Otto
6e3c55a115
grunt
2014-10-25 18:13:50 -07:00
Mark Otto
a0e6bd96de
grunt
2014-10-25 17:54:06 -07:00
Mark Otto
018c1c0b6e
Merge pull request #14871 from twbs/fix-#14810
...
Move "Copy" button in `code`.
2014-10-25 17:49:13 -07:00
Heinrich Fenkart
e9d6f256c2
grunt
2014-10-26 01:59:25 +02:00
XhmikosR
db550a9235
Run grunt.
2014-10-25 14:12:21 +03:00
XhmikosR
0ba39d45b4
Move "Copy" button in code.
2014-10-25 01:48:02 +03:00
Mark Otto
80aca8c17e
grunt
2014-10-24 13:27:28 -07:00
Mark Otto
79b38361ab
20px from bottom because the final frontier
2014-10-24 13:26:05 -07:00
Mark Otto
1979a311d4
Merge branch 'master' of github.com:twbs/bootstrap
2014-10-24 13:24:34 -07:00
Mark Otto
23e3995cec
guhrunt
2014-10-24 13:24:28 -07:00
Mark Otto
e631b721ec
Merge pull request #14848 from knownasilya/patch-1
...
Make the docs' nav sidebar scrollable
2014-10-24 13:24:14 -07:00
Heinrich Fenkart
51f1f58be8
grunt
2014-10-23 06:39:51 +02:00
Heinrich Fenkart
9814256736
Merge pull request #14852 from twbs/jquery-version-check
...
Add jQuery version check to existing jQuery presence check
2014-10-23 06:15:36 +02:00
Heinrich Fenkart
1604af041b
Add jQuery version check to existing jQuery presence check
...
Fixes #14809 .
Closes #14825 .
2014-10-23 05:57:15 +02:00
Heinrich Fenkart
e0cea19cbc
grunt
2014-10-23 05:23:29 +02:00
Heinrich Fenkart
40c309b39a
grunt
2014-10-22 21:39:37 +02:00
Heinrich Fenkart
2bc5277b44
grunt
2014-10-22 21:04:18 +02:00
Ilya Radchenko
fb70b13dc3
Allow to scroll the nav
...
Basically it's impossible to use the navigation if it's expanded. This will allow it to be scrollable so that the menus are accessable.
2014-10-22 11:56:12 -04:00
XhmikosR
27478b966b
Run grunt.
...
[ci skip]
2014-10-22 14:18:18 +03:00
XhmikosR
961ed36f01
Update Holder.js to v2.4.1.
...
[ci skip]
2014-10-22 14:18:13 +03:00
XhmikosR
40ce5670e7
Update JSZip to v2.4.0.
...
[ci skip]
2014-10-22 14:17:48 +03:00
Heinrich Fenkart
930c422f22
grunt
2014-10-22 04:28:16 +02:00
XhmikosR
9f82f27b9d
Update less/print.less to the latest html5 bp version.
...
Also, keep the html5 boilerplate link in the built CSS.
2014-10-13 13:32:39 +03:00
Heinrich Fenkart
4a89fd02b7
grunt
2014-10-10 08:35:56 +02:00
XhmikosR
9299f5dfa2
Run grunt.
...
[ci skip]
2014-10-09 08:17:56 +03:00
XhmikosR
a1a2dfebb5
Update less.js to v1.7.5.
2014-10-09 08:16:32 +03:00
XhmikosR
924c68f8bb
Update FileSaver.js v2014-08-29.
2014-10-09 08:16:32 +03:00
XhmikosR
7ded2d185d
Update Blob.js to v2014-07-24.
2014-10-09 08:16:31 +03:00
XhmikosR
07f1d89dd2
Run grunt.
2014-10-07 19:57:01 +03:00
Heinrich Fenkart
5bb08c50fa
grunt
2014-10-03 08:17:49 +02:00
Mark Otto
f75fc32462
grunt
2014-10-02 22:21:02 -07:00
Mark Otto
76268c4b96
more grunt
2014-10-02 21:21:49 -07:00
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
Mark Otto
10f9260119
docs spacing for headings and leads
2014-07-09 21:35:35 -07:00
Mark Otto
ed1bcc0af4
docs design changes for markdown content
2014-07-09 21:18:00 -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
87c9ce5333
Remove unused docs CSS
2014-07-09 10:47:53 -07:00
Mark Otto
d738c8729b
remove commented out docs js
2014-07-09 02:44:11 -07:00
Mark Otto
b5242d3068
nuke ie8 responsive file warning js
2014-07-09 02:43:25 -07:00
Mark Otto
41d6cad4b6
Docs: Refactor to use .less file instead, importing Bootstrap vars and mixins, and cleaning all the things up
2014-07-09 02:40:05 -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
XhmikosR
d88a837fea
Update uglify-js to v2.4.14.
2014-07-09 10:22:43 +03:00
Mark Otto
79f56dbea9
nuke commented out css
2014-07-09 00:15:52 -07:00
Mark Otto
a8625f452e
Badges, navs, and more
2014-07-09 00:15:20 -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
cde7648d28
docs header padding
2014-07-08 16:54:32 -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
86099bfb33
clean up commented out docs css
2014-07-08 16:03:31 -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
fd5a24dca0
fix sidenav padding
2014-07-08 14:31:38 -07:00
Mark Otto
413750a03c
rems: code
2014-07-08 01:02:59 -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
2ccbc38685
Cut down on homepage file size; reorg some docs CSS
2014-07-07 19:40:15 -07:00
Chris Rebert
5d1abf8b38
Merge pull request #14036 from twbs/fix-13575
...
Jekyll: Use non-minified assets when not running from GitHub Pages
2014-07-07 19:36:32 -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
b44d4ef724
grunt
2014-07-06 15:35:24 -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
d55462fae8
grunt
2014-07-05 20:10:44 -07:00
Mark Otto
3c99de9764
grunt
2014-07-05 19:57:15 -07:00
Chris Rebert
1dc54dc160
use non-minified Bootstrap JS when on non-gh-pages
2014-07-03 13:40:47 -07:00
Chris Rebert
92fd25a2a2
use non-minified docs JS on non-gh-pages
2014-07-03 13:18:44 -07:00
Chris Rebert
b793fbb13a
use non-minified docs CSS on non-gh-pages
2014-07-03 13:12:58 -07:00
Mark Otto
23dd323da1
grunt
2014-07-03 00:57:37 -07: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
4f8697cbbb
grunt
2014-07-02 23:44:56 -07:00
XhmikosR
225351431e
Update dependencies.
2014-06-30 18:35:50 +03:00
Mark Otto
018114fc09
Merge pull request #13954 from hnrch02/persist-preview-theme
...
Save "Preview theme" state; resolves #13940
2014-06-28 21:43:04 -07:00
XhmikosR
fec94e1695
Update "grunt-autoprefixer".
2014-06-27 07:38:46 +03:00
Heinrich Fenkart
92ca842830
Save "Preview theme" state; resolves #13940
2014-06-27 02:08:58 +02:00
Chris Rebert
b9527acc45
JSCS hotfix
...
[skip sauce] [skip validator]
2014-06-26 13:01:21 -07:00
Chris Rebert
fde088751a
regenerate docs.min.js
...
[skip sauce]
2014-06-26 12:21:45 -07:00
Chris Rebert
0bc2edd191
add docs JS to activate popover demos; fixes #13937
2014-06-26 12:21:33 -07:00
Chris Rebert
c0b3f18c0c
rm apparent dead code from docs JS
...
.bs-docs-navbar class doesn't seem to be used anywhere at all
2014-06-26 10:53:58 -07:00
Chris Rebert
43ecc8726b
add comment explaining which demos this JS is for
2014-06-26 10:52:12 -07:00
Mark Otto
ff6b279b3c
bump to v3.2.0
2014-06-26 09:13:24 -07:00
Mark Otto
719ebd8239
grunt
2014-06-26 02:49:21 -07:00
Mark Otto
4dcdc08d89
grunt
2014-06-25 23:03:40 -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
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
Chris Rebert
c2c19a4d2d
Revert UMD ( #13772 & friends) for now, due to #13812 .
...
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.
Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee#10038 introduced by #13772 "
This reverts commit e9d6756a1a#12909 "
This reverts commit 1c6fa9010d#13811 "
This reverts commit f347d7d955
2014-06-23 11:11:59 -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
1482947405
grunt
2014-06-19 15:25:50 -07:00
Mark Otto
a4fa8d07c8
grunt dist
2014-06-19 15:24:24 -07:00
Heinrich Fenkart
587451ad9a
Update a few source files to comply to new JSCS rules
2014-06-19 21:08:05 +02:00
XhmikosR
abe7afd87a
Run grunt.
2014-06-19 12:58:34 +03:00
XhmikosR
0418c7678d
Update JSZip to v2.3.0.
2014-06-19 12:03:10 +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
11cf54f9df
grunt
2014-06-18 18:22:11 -07:00
Mark Otto
fdf174e498
grunt dist
2014-06-18 15:46:38 -07:00
Ross Allen
8c403dc1dc
Darken @gray-light to meet accessibility guidelines
...
`@gray-light` darkens from #999 to #777 , which puts `.text-muted` at the
threshold for the 4.5:1 WCAG minimum contrast[1]. #777:#fff is 4.48:1.
The “Example” headers in docs become #959595 , which is contrast ratio
3:1, the minimum for larger text. Since the headers are less important
than the surrounding text, 3:1 is fine and an improvement on the
previous #bbb:#fff (1.92:1).
Fixes issue #13847 .
[1] http://www.w3.org/TR/UNDERSTANDING-WCAG20/visual-audio-contrast-contrast.html
2014-06-18 14:47:14 -07:00
XhmikosR
6d45f733e5
Run grunt.
2014-06-18 13:16:32 +03:00
Chris Rebert
f347d7d955
address #13811
2014-06-17 18:53:52 -07:00
Mark Otto
82bd8b6dfd
twerk copy
2014-06-09 23:29:44 -07:00
XhmikosR
1b8935ee95
Run grunt dist.
2014-06-10 08:30:17 +03:00
XhmikosR
89c0e4d2ab
Update ZeroClipboard to v1.3.5.
...
Also use the official filenames.
2014-06-10 08:30:17 +03:00
XhmikosR
5057e7c7b8
Remove unused variables and make tests pass.
2014-06-10 08:30:17 +03:00
Mark Otto
7d1365ce1c
Refactor and restyle.
2014-06-10 08:30:16 +03:00
soundarapandian
250e021ff1
Integrate ZeroClipboard to easily copy code snippets
2014-06-10 08:30:16 +03:00
Mark Otto
b35840e48d
simpler and updated docs copy for icon font file paths
2014-06-09 21:00:27 -07:00
XhmikosR
41b92b967a
Run grunt.
...
[ci skip]
2014-06-09 11:10:09 +03:00
XhmikosR
8cdc34f6e3
Update filesaver.js to v2014-05-27.
...
[ci skip]
2014-06-09 11:10:08 +03:00
XhmikosR
91bed93d55
Update Blob.js to v2014-05-31.
...
[ci skip]
2014-06-09 11:10:08 +03:00
Mark Otto
1309085d57
change up the padding on bs-docs-header container to alleviate #13682
2014-06-08 23:09:06 -07:00
XhmikosR
29d00e0cd7
Move apple-touch-icon-precomposed.png and favicon.ico in docs root.
...
This way, it works in all browsers.
2014-06-09 01:14:44 +03:00
XhmikosR
79cbf5501e
Use a 152x152 apple touch icon.
2014-06-09 01:14:44 +03:00
XhmikosR
9884a3d775
Re-create favicon.ico from the new SVG image.
2014-06-09 01:14:44 +03: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
XhmikosR
e2cabe4971
Minor style tweaks.
2014-06-06 01:23:07 +03:00
XhmikosR
7b0acf14d8
Comply to the new style.
2014-06-06 01:23:07 +03:00
Chris Rebert
a8641b4db7
Merge pull request #10632 from stuartpb/patch-1
...
Customizer: Alert on successful save to Gist
2014-06-05 13:58:22 -07:00
Mark Otto
46974490e4
grunt dist for docs
2014-05-22 21:39:37 -07:00
Mark Otto
4f60a7fae9
don't change code bg on callouts
2014-05-22 21:34:49 -07:00
Mark Otto
64bb8be707
more callout tweaks
2014-05-22 21:34:24 -07:00
Mark Otto
abbf6da6aa
tighten up callouts and remove backgrounds
2014-05-22 21:12:13 -07:00
Mark Otto
12b5d46f17
move it to the sidebar
2014-05-22 18:38:43 -07:00
Mark Otto
707b362b80
Merge branch 'master' into docs-theme-toggler
...
Conflicts:
docs/assets/css/docs.min.css
2014-05-20 23:27:40 -07:00
Stuart P. Bentley
d5d64c2e4e
Update showSuccess to use new classes
2014-05-17 13:22:57 -04:00
Stuart P. Bentley
b5f9e2eb60
Customizer: Alert on successful save to Gist
2014-05-13 00:52:44 -04:00
Mark Otto
8ee6a6be80
grunt
2014-05-12 21:28:14 -07:00
Mark Otto
f39b272fed
grunt
2014-05-12 21:19:01 -07:00
Mark Otto
d03fd289d9
grunt for raw js
2014-05-12 21:17:42 -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
bdd822a94c
regenerate minified docs JS & CSS
2014-05-07 20:19:40 -07:00
Chris Rebert
7d0f7e8441
add button to toggle the optional theme when viewing the docs; fixes #9764
2014-05-07 16:12:42 -07:00
XhmikosR
06fae12023
Update JSZip to v2.2.2.
2014-05-06 12:43:41 +03:00
Mark Otto
bae289d1fe
Merge pull request #13433 from watilde/fixed-navbar-radius-of-example-at-docs
...
Fixed navbar radius of example at docs
2014-05-03 18:50:28 -07:00
XhmikosR
2c1fe5374e
Merge pull request #13424 from twbs/docs-libs
...
Update docs libs
2014-04-30 08:00:21 +03:00
XhmikosR
30b07b942e
Run grunt.
2014-04-26 08:35:48 +03:00
XhmikosR
ab1087f6e5
Update holder.js to v2.3.2.
2014-04-26 08:35:48 +03:00
XhmikosR
f2eff55064
Update JSZip to v2.2.1.
2014-04-26 08:35:47 +03:00
Daijiro Wachi
485b7d0940
Fixed navbar radius of example at docs
2014-04-26 02:04:07 +09:00
Chris Rebert
937ef4824e
remove semicolons :'-(
2014-04-24 19:14:06 -07:00
Chris Rebert
d4728b8c6d
add script to warn folks trying to test old IE using IE's unreliable emulation modes
2014-04-24 19:14:06 -07:00
Mark Otto
fe11ac77a2
Merge pull request #13390 from twbs/ie10-viewport-bug
...
add IE10 viewport bug workaround to examples
2014-04-24 18:50:30 -07:00
Chris Rebert
eaddbd92bb
grunt dist
2014-04-20 16:19:13 -07:00
Chris Rebert
448086f95a
add IE10 viewport bug workaround to examples
...
Closes #13379 .
2014-04-20 16:09:49 -07:00
XhmikosR
e0c3ae6133
Merge pull request #13151 from twbs/customizer-uglifyjs2
...
Customizer: switch to UglifyJS2
2014-04-21 01:35:17 +03:00
Chris Rebert
e9f0bed44d
quote data-* attribute value in docs JS per best-practices
2014-04-18 18:53:05 -07:00
XhmikosR
1267a9a02b
Run grunt.
2014-04-09 10:16:56 +03:00
XhmikosR
2c16b3151c
Add the license header in the non minified build too.
2014-04-09 10:15:02 +03:00
XhmikosR
7950c0ff0a
Add the jquery check in customizer's output.
2014-04-09 10:15:02 +03:00
XhmikosR
3f90763995
Customizer: switch to UglifyJS2 (v2.4.13).
...
The uglify build is generated with `uglifyjs --self -o uglify.min.js`.
2014-04-09 10:15:02 +03:00
XhmikosR
2f0f8ec6d1
Run grunt dist.
2014-04-09 10:02:34 +03:00
XhmikosR
45b476bdbf
JS: remove unused variables.
2014-04-09 10:01:48 +03:00
Mark Otto
bfb99413ee
grunt dist
2014-04-06 20:49:22 -07:00
Chris Rebert
8ca182876d
customizer: squelch error when can't save Gist
2014-04-03 17:02:10 -07:00
XhmikosR
4c2626fecb
Run grunt.
2014-04-03 10:53:44 +03:00
XhmikosR
8c95ff748f
Run grunt.
2014-04-01 08:26:47 +03:00
Chris Rebert
b5ae8f9722
grunt update-shrinkwrap build-customizer dist
2014-03-28 11:19:22 -07:00
Chris Rebert
07314b5475
enhance customizer to handle transitive Less @import-s
2014-03-28 11:12:28 -07:00
Chris Rebert
1853e31a10
rename generateCustomCSS to generateCustomLess for accuracy
2014-03-28 11:12:28 -07:00
Chris Rebert
e8551d4f50
grunt dist
2014-03-28 11:00:39 -07:00
Chris Rebert
5458134f5e
Add Gist & Customizer URLs to customized files & config.json
...
Fixes #9951
Fixes #12865
2014-03-28 10:58:32 -07:00
XhmikosR
10586bf040
Run grunt.
2014-03-27 08:02:51 +02:00
Mark Otto
ff0a33ab8c
cleanup svg
2014-03-24 23:57:38 -07:00
Mark Otto
488c6b43ed
grunt
2014-03-24 21:16:07 -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
bc250fb1e7
grunt
2014-03-24 19:41:20 -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
c6648d58f0
grunt
2014-03-24 19:09:30 -07:00
Mark Otto
8198bbad2a
Merge branch 'master' of github.com:twbs/bootstrap
2014-03-24 19:08:17 -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
Zlatan Vasović
8ae48183b2
Fix #13138 : use underscore prefix to ignore directories
2014-03-24 21:47:59 +01:00
XhmikosR
4fb1fdbf74
Update JSZip to v2.2.0.
2014-03-23 08:10:00 +02:00
Mark Otto
fed2b0f7eb
nav cleanup and responsiveness
2014-03-18 13:01:50 -07:00
XhmikosR
1e41df6b69
Move ie8-responsive-file-warning.js one dir up.
...
This is a regression of d08bbdc6ec
2014-03-17 17:49:27 +02:00
Mark Otto
35ddc8427e
revamp all the things
2014-03-17 02:03:16 -07:00
Chris Rebert
910ff24b4b
regenerate customize.min.js
2014-03-16 22:37:32 -07:00
Chris Rebert
1ff6d33aa8
use @ssorallen's blob support test in customizer; fixes #12617
2014-03-16 22:37:31 -07:00
Mark Otto
b3f30bb70e
grunt
2014-03-16 20:46:00 -07:00
Mark Otto
43cf003f9a
Update gruntfile to point to new customizer nav, run grunt
2014-03-16 20:40:30 -07:00
Mark Otto
b7ab799824
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/js/bootstrap.min.js
docs/dist/js/bootstrap.min.js
2014-03-16 19:06:17 -07:00
Mark Otto
2a43e7e78a
Break up docs into includes
2014-03-16 19:03:53 -07:00
fat
dd7cab84f6
build
2014-03-16 18:44:58 -07:00
XhmikosR
d4a4bbb729
Update dependencies.
2014-03-12 20:22:22 +02: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
38d0908aff
Add recompiled assets after nuking toc in mixins.less.
2014-03-09 23:51:38 -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
a7b0fa7ebf
ugh grunt
2014-03-09 22:28:29 -07:00
Mark Otto
213860408e
moar grunt
2014-03-09 22:19:02 -07:00
Mark Otto
30deb5697c
grunt
2014-03-09 22:06:14 -07:00
Mark Otto
ccb17f110d
Merge branch 'master' into fix-8869
2014-03-09 22:01:38 -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
0b415c6099
Merge branch 'master' into mixin-table-of-contents
...
* master:
Fix bad grunt merge and then G R U N T
Reorder the Gruntfile a bit
Fixes #12892 : Link to one of the SO articles on Bootstrap modals and YouTube
Remove unneeded quotes.
Rename generateRawFilesJs to generateRawFiles
Remove redundant parens
Conflicts:
docs/assets/js/raw-files.min.js
test-infra/npm-shrinkwrap.canonical.json
2014-03-09 16:40:40 -07:00
mrmrs
71e9902d9a
Adjusts some section titles to be more explicit.
...
FIXES #12992
2014-03-09 16:25:27 -07:00
Mark Otto
4883605624
Fix bad grunt merge and then G R U N T
2014-03-09 16:15:53 -07:00
mrmrs
fc74ee5f67
Changes compiled assets after changing mixins.less
2014-03-09 16:15:35 -07:00
XhmikosR
68b3e3f3be
Merge pull request #12986 from twbs/unneeded-quotes
...
Remove unneeded quotes.
2014-03-10 01:07:14 +02:00
Mark Otto
27da9728bc
grunt
2014-03-09 13:50:55 -07:00
XhmikosR
9d027d2bee
Remove unneeded quotes.
2014-03-09 11:10:52 +02:00
Mark Otto
ef5d8e98e2
Merge branch 'master' into sr-only-focusable
...
Conflicts:
dist/css/bootstrap.css
2014-03-08 20:34:29 -08:00
Mark Otto
b8ab0c66ac
grunt
2014-03-08 20:03:31 -08:00
fat
4d96e69a55
fixes #9836
2014-03-08 19:45:38 -08:00
Mark Otto
74aab91671
grunt
2014-03-08 19:32:40 -08:00
fat
e9cced72fd
fix #9342
2014-03-08 19:20:47 -08:00
Mark Otto
4b6e1b6754
grunt dist
2014-03-08 17:40:58 -08:00
Mark Otto
7c3881086f
Fix comment
2014-03-08 17:11:48 -08:00
Mark Otto
bcfb27b962
grunt
2014-03-08 16:11:24 -08:00
Mark Otto
03701b8d4b
Fixes #12966 : Ensure icon font vars are loaded into Customizer
2014-03-08 15:32:24 -08:00
Mark Otto
67c747a109
grunt
2014-03-08 15:30:18 -08:00
Zlatan Vasović
d08bbdc6ec
Reorganize docs assets
2014-03-07 17:37:23 +01: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
Mark Otto
e25dacba14
Merge branch 'master' into typography-example-updates
...
Conflicts:
docs/assets/js/customize.min.js
2014-03-07 01:10:16 -08:00
Mark Otto
ac4dd30460
G R U N T G R U N T
2014-03-07 01:08:29 -08:00
mrmrs
d1d5d90413
Fixes #12748
2014-03-07 00:59:22 -08:00
Mark Otto
d44e98b34d
G R U N T
2014-03-07 00:50:28 -08:00
Mark Otto
fe0d5959d2
Merge branch 'master' of github.com:twbs/bootstrap
2014-03-07 00:28:29 -08:00
Mark Otto
5bd2799978
G R U N T
2014-03-07 00:26:38 -08:00
XhmikosR
24ec60e6e5
Merge pull request #12931 from twbs/line-endings
2014-03-07 10:24:32 +02:00
Mark Otto
c03b8f1f0f
Merge branch 'master' into pr/12670
2014-03-07 00:23:52 -08:00
Mark Otto
6452b409aa
grunt for days
2014-03-07 00:23:22 -08:00
XhmikosR
6a3faa6ab3
Normalize line endings
2014-03-07 10:22:57 +02:00
Bas Bosman
cb7eb674ac
Add autoprefixer
2014-03-07 09:01:54 +01: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
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
XhmikosR
d7dc8a7bd3
Merge pull request #12853 from twbs/jscs
...
Switch to JSCS
2014-03-05 08:42:50 +02:00
Mark Otto
a4df363174
grunt after merging #12917
2014-03-04 14:35:23 -08:00
Mark Otto
026e2f8d30
Grunt after merging #12863
2014-03-04 14:24:09 -08:00
Mark Otto
8f2a787c36
grunt
2014-03-04 14:20:48 -08:00
Mark Otto
5193f9f607
add svg logos to brand guidelines
2014-03-04 13:32:02 -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
587814f16e
Simplify gruntfile more to remove theme RTL
2014-03-03 22:49:43 -08:00
Mark Otto
7e764a29fa
grunt
2014-03-03 21:56:40 -08:00
XhmikosR
cd134f1ed6
Merge pull request #12864 from twbs/csslint-fix
...
Csslint fix
2014-03-02 09:50:21 +02:00
XhmikosR
e5affbfa0a
Run grunt.
2014-03-01 20:58:53 +02:00
