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
Michael J.
0c03d0c273
grunt now watch files in all folders/subfolders
2014-07-31 10:21:56 +08:00
Chris Rebert
031cb969d7
Have HTML5 validator ignore autocomplete="off" on input[type="checkbox"]
...
Not clear from the spec whether this is invalid per se.
But it is the current best known workaround for Firefox's unusual behavior.
2014-07-18 14:19:16 -07:00
Mark Otto
fecbaca907
grunt some more things, rebuild customizer nav
2014-07-12 18:11:07 -07:00
Mark Otto
a63c066e3d
rearrange a few things; drop compiled theme file
2014-07-11 22:46:10 -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
vsn4ik
59171b3377
Gruntfile.js: Add semicolon in "_update-shrinkwrap" task.
2014-07-11 03:42:09 +04:00
Mark Otto
87c9ce5333
Remove unused docs CSS
2014-07-09 10:47:53 -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
bb3157c2d9
Add new grunt task for faster builds; nuke fonts
2014-07-08 16:25:23 -07:00
Mark Otto
f6367bc0e4
Implement the new border-radius guard: only round things if global @enable-rounded == true
2014-07-08 16:25:01 -07:00
Mark Otto
dae5ec5416
Drop Glyphicons
2014-07-08 00:33:21 -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
Chris Rebert
36b5308926
remove Glyphicons docs autogeneration from Grunt
...
Simplifies the build tooling a teeny bit.
This data file shouldn't need to be updated for v3 ever again.
This task will also be unnecessary in v4.
[skip sauce] [skip validator]
2014-07-07 11:06:19 -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
XhmikosR
2a47034598
Copy all files in docs/dist.
...
Now we are on par with what we have on the gh-pages dist/ folder.
2014-07-01 07:38:38 +03:00
XhmikosR
b93b7b1b6d
Revert "Revert "Turn off clean-css' advanced optimizations.""
...
This reverts commit e31c2edf88
2014-06-25 01:53:10 +03:00
Chris Rebert
e31c2edf88
Revert "Turn off clean-css' advanced optimizations."
...
This reverts commit 25ca51319b
2014-06-24 14:54:51 -07:00
Chris Rebert
6ec5b8cea8
retry each test up to 3 times in the event of timeout
...
Big thanks to @gvas for https://github.com/axemclion/grunt-saucelabs/pull/136 ! <3
2014-06-24 12:17:38 -07:00
XhmikosR
25ca51319b
Turn off clean-css' advanced optimizations.
...
Works around #13914 .
We might give it another go in the future but the stuff this breaks over the time does not justify having it enabled. The gain in size is negligible:
dist/css/bootstrap.min.css: 108.65 kB → 109.5 kB
dist/css/bootstrap-theme.min.css: 18.84 kB → 18.86 kB
docs/assets/css/docs.min.css: 20.44 kB → 20.61 kB
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
Chris Rebert
3c4ba2a08c
Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generation
...
Instead of our homegrown grunt/shrinkwrap.js
Fixes #13483 .
New npm-shrinkwrap.json is human-readable but still in a consistent/stable format.
Should aid debugging, produce better diffs, and be less prone to merge conflicts
2014-06-19 11:46:37 -07:00
XhmikosR
4686d1483b
Merge pull request #13829 from BBosman/preserve
...
Always use preserveComment: 'some'
2014-06-19 12:57:52 +03:00
Chris Rebert
f347d7d955
address #13811
2014-06-17 18:53:52 -07:00
Chris Rebert
85c15eec0f
Gruntfile: add note about duplicate copy of jqueryCheck code
...
Refs #13842
2014-06-17 18:48:15 -07:00
Bas Bosman
3f68c40ac1
Make autoprefixer browsers fixed
...
Closes #13795 by merging it.
2014-06-17 11:56:16 -07:00
Bas Bosman
fdc33ced17
Always use preserveComment: 'some'
2014-06-15 16:41:53 +02:00
XhmikosR
89c0e4d2ab
Update ZeroClipboard to v1.3.5.
...
Also use the official filenames.
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
XhmikosR
7b0acf14d8
Comply to the new style.
2014-06-06 01:23:07 +03:00
XhmikosR
5ef9383f53
Tweak JSHint and JSCS checks.
...
Be more consistent across the whole codebase.
Also, make use of JSHint's 2.5.1 `extends` and `qunit` options. This way we set our basis options in js/.jshintrc and override the rest.
2014-06-06 01:23:06 +03:00
Robert Dodd
8e354c4240
Reassigned minification of CSS to cssmin task.
...
Reassigned minification of CSS files from the less task to the cssmin
task
2014-05-19 17:07:31 +10:00
Chris Rebert
6638fc1649
Gruntfile: skip steps when $TWBS_DO_*=0
2014-05-18 17:20:54 -07:00
Chris Rebert
db26c9f4b4
Gruntfile: extract runSubset() func
2014-05-18 17:20:54 -07:00
Chris Rebert
828a5baa00
remove update-shrinkwrap from the default Grunt task
...
Most folks shouldn't care about the shrinkwrap.
It should only be run on-demand, not as a routine/periodic thing.
2014-05-13 02:08:25 -07:00
XhmikosR
d0fca8aaad
Remove RTL leftovers.
2014-05-13 09:26:24 +03:00
Mark Otto
58f03754c6
unfuck the gruntifle
2014-05-12 22:01:29 -07:00
Mark Otto
e52920ca87
no more concurrency
2014-05-12 21:50:13 -07:00
Mark Otto
d8baec85f5
remove the comment
2014-05-12 20:14:39 -07:00
Mark Otto
f5513fd30e
nuke rtl
2014-05-12 19:47:53 -07:00
Chris Rebert
eab6d3ead8
add IE warning scripts to linter config
2014-04-24 19:14:06 -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
dea1945b47
Gruntfile.js: Remove default report option.
2014-03-27 19:48:23 +02:00
Zlatan Vasović
8ae48183b2
Fix #13138 : use underscore prefix to ignore directories
2014-03-24 21:47:59 +01:00
Zlatan Vasović
86dfcd1a96
Add build-glyphicons-data log
...
Closes #12987
2014-03-17 03:36:58 -07:00
Chris Rebert
dcffbbab61
pass grunt into generateRawFilesJs instead of require()ing it
2014-03-17 03:33:42 -07:00
Mark Otto
43cf003f9a
Update gruntfile to point to new customizer nav, run grunt
2014-03-16 20:40:30 -07:00
