rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Code Issues Actions Packages Releases Activity
10,629 Commits 108 Branches 89 Tags 552 MiB
9dc3cf7f19
Commit Graph

247 Commits

Author SHA1 Message Date
Chris Rebert
c891be5e5f adjust filename to indicate that customize JS is minified 2014-01-07 19:10:31 -08:00
Chris Rebert
bf5017c01c fix #12143 2014-01-07 17:08:40 -08:00
Julian Thilo
7fcfe61f4d Update copyright notices in all places 
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
 2014-01-07 01:05:24 +01:00
Chris Rebert
938bc12c58 add /docs/assets JS to JSCS Grunt task config 2014-01-05 20:52:37 -08:00
Zlatan Vasović
0cc4fe6ee3 Drop trailling comma 
No need for it.
 2014-01-02 15:46:13 +01:00
Mark Otto
50cf0b1a9d Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state 2013-12-31 18:23:10 -08:00
Mark Otto
e3aa358696 derp 2013-12-31 13:57:35 -08:00
Mark Otto
ac3f48bb19 Fixes #12046: move .csscomb.json and .csslintrc to less/ folder 2013-12-31 13:16:28 -08:00
Mark Otto
78e1af58d6 typo 2013-12-31 11:57:44 -08:00
Mark Otto
b43371cd0a @nschonni's feedback <3 2013-12-31 11:38:32 -08:00
Mark Otto
1e4540f11b @cvrebert's feedback 2013-12-31 10:51:39 -08:00
Mark Otto
0df96d8c32 Merge branch 'master' into docs_dir 2013-12-31 10:38:31 -08:00
Chris Rebert
990c2392e5 mv sauce_browsers.yml out of the project root 2013-12-29 20:25:40 -08:00
Mark Otto
f10cf21a8f Streamline copy process by not bringing over full files into docs/dist/, only take minified ones 2013-12-28 23:05:02 -08:00
Mark Otto
a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
Zlatan Vasović
0016b508cb Merge two fs variable declarations into one 
One is enough.
 2013-12-28 23:33:32 +01:00
Mark Otto
567dc12e86 Fixes #12012: Use correct banner in docs js 2013-12-26 19:08:19 -08:00
XhmikosR
5eab9cbe82 Add docs-assets/css/docs.css to csslint too. 2013-12-26 19:49:33 +02:00
Zlatan Vasović
608926e808 Improve banner 2013-12-23 18:02:42 +01:00
Mark Otto
ec13eb8d38 Remove timestamp on generated Glyhpicons 2013-12-22 21:05:08 -08:00
Ross Allen
b048ea545f Write Glyphicons to _data, generate Glyphicons markup 
This generates a glyphicons.yml file from the glyphicons.less source,
and then components.html uses that data to generate the Glyphicons docs
by iterating through the data. The _data directory was introduced in
Jekyll 1.3.0, and GitHub Pages is already on [version 1.4.2][1].

Fixes #11862.

[1] https://github.com/github/pages-gem/blob/master/github-pages.gemspec#L16
 2013-12-18 20:15:51 -08:00
Mark Otto
40651cf1ea more license mentions 2013-12-18 15:08:16 -08:00
Mark Otto
1bc8607bdf Merge branch 'master' into css-source-maps 
Conflicts:
	Gruntfile.js
 2013-12-18 10:22:18 -08:00
Chris Rebert
dcfe710fa4 enable failHard grunt-html-validation option; fixes #11876 2013-12-17 01:35:16 -08:00
Chris Rebert
0f72123c43 move Sauce test browsers list out of Gruntfile into separate file 2013-12-16 00:42:45 -08:00
Chris Rebert
43c3d785ef explicitly set more HTML5 validator options 2013-12-15 19:42:47 -08:00
Mark Otto
55f6beb427 Merge branch 'master' into pr/11776 
Conflicts:
	package.json
 2013-12-15 14:09:50 -08:00
Chris Rebert
39a2dab722 parallelize Travis using build matrix & test subsuites 2013-12-14 19:11:04 -08:00
Chris Rebert
56d89ed7ae Sauce tests: update to later browsers supported by OS X 10.9 2013-12-12 21:58:44 -08:00
Tobias Lindig
3583aa2774 correct indentation 2013-12-10 14:47:50 +01:00
Tobias Lindig
9f12f840b9 Buildprocess: use module "load-grunt-tasks" to load grunt tasks directly from the package.json 2013-12-10 10:28:44 +01:00
Chris Rebert
95992ef7e9 enable strictMath in grunt-contrib-less config 2013-12-09 16:27:42 -08:00
Chris Rebert
9e38e25534 enable CSS source maps in grunt-contrib-less 2013-12-09 14:29:19 -08:00
Mark Otto
d466d527a4 Undo merge of #11778 and use cleancss min option 2013-12-09 00:12:11 -08:00
Mark Otto
de218bbba8 Merge branch 'pr/11779' into drop_recess_for_less 
Conflicts:
	Gruntfile.js
	package.json
 2013-12-08 23:56:22 -08:00
Mark Otto
ea61a19a04 Merge branch 'pr/11778' into drop_recess_for_less 
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css
 2013-12-08 23:48:07 -08:00
Mark Otto
4540f9e2d2 derp, don't sort min /cc @cvrebert 2013-12-08 22:16:43 -08:00
Mark Otto
aae9c2d136 merge, compile 2013-12-08 22:11:46 -08:00
Chris Rebert
dbe95f027d fixups to csscomb grunt task 2013-12-08 20:46:12 -08:00
Mark Otto
f1cb57c8c2 restore original options value 2013-12-08 19:12:37 -08:00
Mark Otto
c0200426ee Drop grunt-recess for grunt-contrib-less & co 2013-12-08 19:09:27 -08:00
XhmikosR
cbfbf1b2dd Add csslint support. 2013-12-08 13:23:25 +02:00
XhmikosR
fdc5d1dc34 Minify css with clean-css. 2013-12-08 13:05:10 +02:00
XhmikosR
eca8ff3803 Use single quotes consistently. 2013-12-08 12:44:14 +02:00
Zlatan Vasović
0c457d48f8 Drop redundant module import 2013-12-08 11:24:47 +01:00
Mark Otto
ed63dfd8d3 Merge pull request #11739 from XhmikosR/lint-assets 
Lint docs-assets/js/application.js and docs-assets/js/customizer.js.
 2013-12-08 02:16:16 -08:00
XhmikosR
2fc2fe75bd Lint docs-assets/js/application.js and docs-assets/js/customizer.js. 2013-12-07 05:05:13 +02:00
Chris Rebert
c1dae1e13c integrate JSCS 2013-12-06 17:26:07 -08:00
Chris Rebert
351f86e1db fix some JS to pass jscs 2013-12-06 17:23:45 -08:00
XhmikosR
3de4f23ea2 Minify docs-assets too. 2013-12-06 11:25:29 +02:00
Chris Rebert
bd9332a58a switch to Sauce Labs for our cross-browser JS unit testing needs 
Fixes #11087
 2013-12-03 21:57:22 -08:00
Tobias Lindig
5a826a65b2 Gruntfile.js: Set line feed char to '\n' to get same result on all platforms. 2013-12-03 10:49:37 -08:00
Zlatan Vasović
ab87085625 Use pkg.homepage 2013-11-30 16:11:41 +01:00
Mark Otto
a7a9dcaeb2 Alternate fix for #11303: add link to site in banner and remove @mdo and @fat usernames from it 2013-11-30 00:42:36 -08:00
Zlatan Vasović
9a8a571ad1 Fix some weird indents 2013-11-17 10:24:31 +01:00
Chris Rebert
0bb122a377 add Grunt task to change version numbers; fixes #11332 2013-11-04 11:22:30 -08:00
Zlatan Vasović
20cba845c2 Add another newline to improve final code readability 
This divides banner from code.
 2013-10-26 10:57:09 +02:00
Chris Rebert
54cd0f8c2f rm dummy 'src' attributes of <img>s & squelch validator warning; fixes #11216 2013-10-23 23:41:17 -07:00
Chris Rebert
0d122fc323 silence validator regarding http-equiv="X-UA-Compatible" 2013-10-23 23:25:17 -07:00
Chris Rebert
a388b7906e Merge pull request #10956 from ZDroid/patch-4 
Sort tasks alphabetically
 2013-10-09 18:31:17 -07:00
Chris Rebert
f9ed8e6f00 trivial refactor in build-customizer grunt task 2013-10-09 18:03:08 -07:00
herom
aad70834fc Fixes #9925: convert font data to base64, fixing 0xefbfbd (Unicode Replacement Character) chars in customizer fonts. 
Merges #9982
 2013-10-09 18:03:04 -07:00
Zlatan Vasović
146cd38867 Sort tasks alphabetically 2013-10-05 21:17:49 +02:00
Zlatan Vasović
dc5625c85b Indent banner to match the *'s 2013-10-02 14:33:17 +02:00
Chris Rebert
362c9c9f89 rm unnecessary backslashes from jqueryCheck 2013-09-29 15:37:22 -07:00
Dean Taylor
429e92fd58 Update Gruntfile.js fixing undefined jQuery check 
The check to see if jQuery was defined as incorrect causing the "Bootstrap requires jQuery" message to only be displayed if jQuery is defined and has a value which equates to `false`.
 2013-09-29 21:14:24 +01:00
Dean Taylor
f39db19306 Update Gruntfile.js removing pointless reading of customize.html. 
I couldn't see a reason to read "customize.html", removed line.
 2013-09-27 18:17:02 +01:00
Chris Rebert
8aa5181126 move /assets/ to /docs-assets/ ; fixes #10715 2013-09-23 13:02:26 -07:00
XhmikosR
b741608964 Show minification report for uglify-js. 2013-09-19 08:33:52 +03:00
Chris Rebert
2b5d7d23d0 generate CSS banners via Gruntfile; fixes #10101 2013-09-10 19:22:20 -07:00
Chris Rebert
76d8757b0a rm period from licensing header so it's not mistaken as part of the URL 2013-09-10 19:01:40 -07:00
Mark Otto
48d929d69e Use jekyll var for current version in docs; update banner in gruntfile to match .less banner 2013-08-23 22:38:51 -07:00
fat
b6ddaf63d6 fix customizer 2013-08-19 14:16:52 -07:00
Mark Otto
f95ab89fb1 really do the raw liquid tag 2013-08-19 13:58:29 -07:00
fat
c2d5861232 update gruntfile not to run validation + remove validation status 2013-08-19 12:22:42 -07:00
fat
c64a8cfc72 add glyphicons to customizer 2013-08-19 12:19:00 -07:00
Phillip Alexander
39bc5198ae Remove extra trailing comma in Gruntfile.js 
validation: {
      options: {
        reset: true
      },
 2013-08-18 23:54:25 -07:00
Chris Rebert
518488cb40 make Recess part of the Grunt test task to guard against bad LESS 2013-08-18 13:47:16 -07:00
Chris Rebert
b5d87fc42b rename HTML5 validation Grunt task since it checks the examples too 2013-08-18 13:43:53 -07:00
Mark Otto
1e0453f825 Restore glyphicons 2013-08-18 00:36:51 -07:00
Mark Otto
c56a749323 Finish first pass at and docment Bootstrap v2-ish theme 
* Adds new "theme" example
* Adds new theme.less file to provide all the overrides and additional
styles for the theme
* theme.less compiles, via Grunt, to two new files to `dist/css`,
bootstrap-theme.css and bootstrap-theme.min.css
 2013-08-17 18:59:50 -07:00
fat
5d84e02c1c add the customizer builder to the default grunt task 2013-08-17 16:44:54 -07:00
fat
5e89f71ab2 fix for #8768 2013-08-17 13:14:19 -07:00
Chris Rebert
bb5be0a2f9 add HTML5 validation of docs pages to the build 2013-08-12 17:49:01 -07:00
Jacob Thornton
89b69ed770 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 
Conflicts:
	_layouts/customize.html
 2013-08-07 23:10:11 -07:00
Jacob Thornton
b35b65d0b3 first prototype of new customizer 2013-08-07 23:06:29 -07:00
Chris Rebert
887125d9f5 apparently PRs against twbs/bootstrap have the same Travis slug 2013-08-07 13:30:00 -07:00
Chris Rebert
fd3c4cab73 disable BrowserStack for folks w/o their own key who are making PRs 2013-08-06 20:14:36 -07:00
Chris Rebert
cdc92e8139 only run browserstack tests in Travis 2013-08-06 12:25:26 -07:00
Rohan Jain
093cda244a Integrate testing with browserstack 2013-08-06 12:24:14 -07:00
Jon Schlinkert
55df26ae20 This pull request organizes the Gruntfile, makes better use of Grunt conventions and placates my OCD. 
Changes in the Gruntfile:

* Use two spaces for consistency with the rest of the codebase.
* Tasks are now organize based on task type. since lodash templates are used across tasks/targets, this makes it easier to follow.
* Use `src-dest` files format when only src-dest pairing is necessary. This saves a line over the files-object format, but more importantly it allows use the src or dest in lodash templates (e.g. `<%= concat.bootstrap.src %>`), which isn't possible in the files-object or files-array formats.
* Make the explicit order of the javascript files more obvious in concat task , maybe just a tiny bit more usable and easier to customize - but really just OCD
* Use `<%= pkg.name %>` variable for dest CSS, both for consistency with how javascript targets are defined, and to make it just little easier for devs to customize bootstrap.

ran the build to test, everything seems good.
 2013-08-03 19:03:38 -04:00
Chris Rebert
7ae32074a0 Remove hack/workaround for jshint/grunt bug that's now fixed 
See https://github.com/gruntjs/grunt-contrib-jshint/issues/86
 2013-07-29 17:17:52 -07:00
Chris Rebert
03b2866b9e tweak Gruntfile.js so it passes jshint 2013-07-27 21:39:11 -07:00
Chris Rebert
ba62cfeffe workaround possible bug in grunt-contrib-jshint 2013-07-27 21:38:59 -07:00
Chris Rebert
a317f67c1c re-integrate #8560 using @fat's code from the comment on #8614 2013-07-26 01:15:41 -07:00
Chris Rebert
292d8d6819 specify explicit ordering for grunt concat step 2013-07-26 01:07:56 -07:00
John-Philip Johansson
0d33455ef4 Replace Makefile with GruntJS 
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess

Rebased by @cvrebert
 2013-07-26 00:39:14 -07:00