Chris Rebert
71c2c372f6
Fix #14411 by setting JSON Content-Type for Gist API request
2014-08-17 15:41:53 -07:00
Mark Otto
9096c20021
grunt
2014-08-04 14:05:12 -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
7a8d9dbdbf
grunt
2014-07-12 18:06:26 -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
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
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
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
.
Revert "Fix regression of #10038 introduced by #13772 "
This reverts commit e9d6756a1a
.
Revert "MD/CommonJS/Globals #12909 "
This reverts commit 1c6fa9010d
.
Revert "address #13811 "
This reverts commit f347d7d955
.
Conflicts:
js/carousel.js
js/collapse.js
js/dropdown.js
js/modal.js
js/tab.js
js/tooltip.js
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
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
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
XhmikosR
dfb4917493
Update less.js to v1.7.0.
2014-03-01 20:14:49 +02:00
XhmikosR
537e10033e
Switch to using JSCS for the indentation check.
2014-02-28 17:30:08 +02:00
XhmikosR
a7339a0f4c
Move csslint overrides in Gruntfile.js.
...
This works around https://github.com/gruntjs/grunt-contrib-csslint/issues/26
2014-02-27 11:39:30 +02:00
XhmikosR
2ef9f9b213
Run csscomb before cssmin.
2014-02-27 10:52:30 +02:00
XhmikosR
8ff7e64359
Add docs.css in the CSSComb task.
2014-02-27 10:12:52 +02: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
Chris Rebert
bdd7651e32
replace .visible-{size} with .visible-{size}-{display} ; fixes #8869
2014-02-21 17:44:40 -08:00
Mark Otto
4b622c60c1
grunt
2014-02-21 17:42:25 -08:00
XhmikosR
65ffe69bdf
Fix customizer.js indentation warnings.
2014-02-14 11:02:03 +02:00
XhmikosR
ff2c506d2b
Update less.js to v1.6.3.
2014-02-13 20:54:21 +02:00
Mark Otto
a365d8689c
grunt
2014-02-13 09:24:59 -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
XhmikosR
d8cfcad7c7
Merge pull request #12710 from ZDroid/customize-multistr
...
Fix multistr errors in customizer.js
2014-02-13 08:53:47 +02:00
Zlatan Vasović
f3735d5b12
Fix scrollspy typo in docs.css
2014-02-12 21:01:37 +01:00
Zlatan Vasović
fe2222e733
Fix multistr errors in customizer.js
2014-02-12 20:54:43 +01:00
Chris Rebert
40142bdc51
fix #12708 by updating class names in the docs JS
2014-02-12 11:02:56 -08:00
XhmikosR
5796b56d96
Switch to the minified JSZip.
2014-02-12 20:50:47 +02: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
38ebf57af5
grunt
2014-02-10 21:41:14 -08:00
Mark Otto
784a95d945
Documents #10140
2014-02-10 21:34:05 -08:00
Mark Otto
728067b586
Update Glyphicons
2014-02-10 21:28:05 -08:00
Mark Otto
3350c73666
http://www.youtube.com/watch?v=YQwYNca4iog
2014-02-10 20:52:20 -08:00
Mark Otto
4973bfd5d7
Fixes #12685 : Display current version under download button on homepage
2014-02-10 20:23:29 -08:00
Mark Otto
0d49920e0d
Fixes #12610 : Better and more consistent prefixing of docs CSS with .bs-docs-
2014-02-08 23:24:38 -08:00