2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Commit Graph

3452 Commits

Author SHA1 Message Date
Mark Otto 613a95d838 brand guidelines cleanup 2014-01-11 19:42:10 -08:00
Mark Otto 79c18da452 homepage improvements 2014-01-11 19:35:40 -08:00
Mark Otto bacfd65cb2 Merge branch 'master' into docs_derp
Conflicts:
	docs/getting-started.html
2014-01-11 19:13:10 -08:00
Chris Rebert 80c9c14ab9 rm lingering reference to Recess in the docs
Refs c0200426ee
2014-01-11 17:15:08 -08:00
Mark Otto e2908975ad Merge branch 'master' of github.com:twbs/bootstrap 2014-01-11 14:49:03 -08:00
Mark Otto 1127cd6287 grunt dist 2014-01-11 14:48:47 -08:00
Mark Otto e68d3b961e Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets
Conflicts:
	package.json
2014-01-11 14:48:04 -08:00
Mark Otto 8e41961f9e Merge pull request #12193 from ZDroid/migration
Update docs per `.container-fluid` addition
2014-01-11 13:08:24 -08:00
Zlatan Vasović 62fe50df73 Update docs per .container-fluid addition
- Remove `.container-fluid` from "removed classes".
- Container isn't fluid by default (`.container`) and `.row` isn't percentage-based, so update docs.
2014-01-11 22:04:33 +01:00
Mark Otto 8a04ed44a1 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-10 18:57:01 -08:00
Mark Otto 3a8e99e91e Fixes #12171: Ensure panel groups have a bottom margin since we nuke it on child panels 2014-01-10 18:56:44 -08:00
Chris Rebert b192d29981 refer to correct component 2014-01-10 18:56:39 -08:00
Mark Otto 17f2ef46aa docs mention for #12188 2014-01-10 18:47:51 -08:00
Chris Rebert e8cabf332a use height adjectives for greater clarity 2014-01-10 15:33:04 -08:00
Chris Rebert 46f5bbcf33 document #11675 2014-01-10 14:41:23 -08:00
Mark Otto 831bbb8b45 Clarify that the focus docs styles are not in the repo, per https://github.com/twbs/bootstrap-sass/issues/497 2014-01-09 21:21:51 -08:00
Mark Otto ea20f44815 Merge branch 'master' into docs_derp
Conflicts:
	docs/assets/css/docs.css
2014-01-09 20:33:55 -08:00
Mark Otto 7f153974e1 Fixes #11990 and #12159: Make range inputs block level and 100% wide by default 2014-01-09 18:07:14 -08:00
Mark Otto 99b66c1f2c grunt dist 2014-01-09 18:06:46 -08:00
Mark Otto 04161a8c75 more derp 2014-01-09 18:05:04 -08:00
Chris Rebert fc62379e61 grunt dist 2014-01-09 11:11:13 -08:00
Chris Rebert 29547a2102 JSHint is on crack?
Linting docs/grunt/bs-raw-files-generator.js ...ERROR
[L3:C5] W079: Redefinition of 'btoa'.
var btoa = require('btoa')
2014-01-08 18:45:40 -08:00
Chris Rebert 8a10bd5231 grunt build-customizer 2014-01-08 18:39:45 -08:00
Chris Rebert 72ff8ff9fb grunt dist 2014-01-08 18:39:08 -08:00
Chris Rebert db829f8620 add support for '//===' for <h3>s in bs-lessdoc 2014-01-08 12:41:51 -08:00
Chris Rebert 39861714a8 Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095
also updates variables file organization (courtesy @mdo)
2014-01-08 12:41:51 -08:00
Chris Rebert 1736bcb05c Merge pull request #12150 from twbs/extract-from-gruntfile
cleanup Gruntfile by extracting executable code
2014-01-08 11:01:03 -08:00
XhmikosR d7bf9372ec Remove extra newline from banner. 2014-01-08 13:41:17 +02:00
XhmikosR 016d573a80 Use the docs banner for all the docs generated files. 2014-01-08 13:41:17 +02:00
XhmikosR 9b71314fd8 Turn advanced optimizations off until it's fixed in clean-css. 2014-01-08 13:41:17 +02:00
XhmikosR f00bbdd994 Minify docs CSS too. 2014-01-08 13:41:17 +02:00
XhmikosR ebf7807985 docs-assets: concatenate and minify all javascript files. 2014-01-08 13:41:16 +02:00
wangsai 7e16425acb no preboot 2014-01-08 16:22:50 +08:00
Chris Rebert d7a128c636 extract glyphicons.yml generator out of Gruntfile into separate module 2014-01-07 22:34:09 -08:00
Chris Rebert d1c29af591 extract raw-files.js generator out of Gruntfile into separate module 2014-01-07 22:16:52 -08:00
Chris Rebert c891be5e5f adjust filename to indicate that customize JS is minified 2014-01-07 19:10:31 -08:00
Chris Rebert ef7bf0abf8 grunt dist build-customizer 2014-01-07 19:05:29 -08:00
Chris Rebert c635d8f547 have customizer output Bootstrap Theme too; fixes #12003 2014-01-07 18:57:15 -08:00
Chris Rebert 07309edce5 make customizer compilation code more generic 2014-01-07 18:55:13 -08:00
Chris Rebert bf5017c01c fix #12143 2014-01-07 17:08:40 -08:00
Julian Thilo 8fd177bfa7 Fix #12073: Consistent order of variations
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
2014-01-07 22:24:45 +01:00
Julian Thilo 8d903fbd02 duh, missed one more file
X-Ref: https://github.com/twbs/bootstrap/commit/7fcfe61f4da41356b2ae974ad20536db0d74e83f
2014-01-07 01:27:49 +01: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
Mark Otto f389111e68 justify text 2014-01-06 09:26:08 -08:00
juniorconte 7722ab5566 notes from .input-block-level 2014-01-06 11:41:15 -02:00
Chris Rebert bbe5041cbf Merge pull request #12116 from twbs/pacify-csslint
make CSSLint happier
2014-01-05 23:44:17 -08:00
Mark Otto a5e29a8f34 link 2014-01-05 23:43:13 -08:00
Mark Otto 745bec59cf Move homepage examples to data file 2014-01-05 23:37:14 -08:00
Mark Otto 9421f0af82 Merge branch 'master' into docs_derp
Conflicts:
	docs/_layouts/default.html
	docs/_layouts/home.html
2014-01-05 23:23:55 -08:00
Mark Otto 5b7f508c60 Merge pull request #12107 from twbs/same-footer-links
harmonize footer links on homepage & docs pages
2014-01-05 23:21:11 -08:00