Mark Otto
7b42103df6
kill bottom margin on last docs section
2014-01-18 11:33:50 -08:00
Mark Otto
78e81a1de9
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
docs/assets/css/pack.min.css
2014-01-15 16:25:29 -08:00
Mark Otto
7e7264e224
fix ad placement
2014-01-15 16:25:04 -08:00
Julian Thilo
95f24dca9a
Fix customizer's toggle buttons' margin
2014-01-16 01:19:00 +01:00
Mark Otto
6986bdb2a7
Fix page headers
2014-01-15 15:01:41 -08:00
Mark Otto
c4b41ceae3
header masthead changes
2014-01-13 22:59:09 -08:00
Mark Otto
b776749507
make page headers like masthead
2014-01-13 22:54:22 -08:00
Mark Otto
eca81939cc
Merge branch 'master' into docs_derp
...
Conflicts:
docs/assets/css/pack.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
2014-01-13 22:43:18 -08:00
Chris Rebert
aff64cffce
avoid redundant banner in minified docs CSS
2014-01-13 21:31:40 -08:00
Mark Otto
b17dca240e
Merge branch 'master' into docs_derp
...
Conflicts:
docs/assets/js/docs.min.js
2014-01-12 16:10:57 -08:00
Mark Otto
4b1ff7fa49
Formatting and docs changes
2014-01-12 00:04:24 -08:00
Mark Otto
36aa3afb4f
Improve spacing and alignment of sections and their headings
2014-01-11 23:15:37 -08:00
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
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
ea20f44815
Merge branch 'master' into docs_derp
...
Conflicts:
docs/assets/css/docs.css
2014-01-09 20:33:55 -08:00
Mark Otto
04161a8c75
more derp
2014-01-09 18:05:04 -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
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
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
9fa2c95d78
make CSSLint happier; refs #12094
2014-01-05 21:29:26 -08:00
Mark Otto
70459c1454
Merge branch 'master' into docs_derp
...
Conflicts:
docs/_includes/footer.html
docs/assets/css/docs.css
2014-01-01 12:27:09 -08: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
b253cb2c1e
Merge branch 'master' into docs_derp
...
Conflicts:
_config.yml
docs/_includes/footer.html
docs/_includes/nav-main.html
docs/_includes/old-bs-docs.html
docs/_layouts/default.html
docs/_layouts/home.html
docs/getting-started.html
docs/index.html
2013-12-31 13:53:33 -08:00
Mark Otto
a9c829bc0c
Rearrange repository contents because muahahahahahaha
2013-12-28 22:47:03 -08:00
Mark Otto
a8005b3d0b
flatten docs dir back into root
2013-07-18 17:41:30 -07:00
Mark Otto
3abfe029ea
vertically center ad
2013-07-18 13:35:55 -07:00
Mark Otto
a34470ac5d
Merge branch 'bs3_old_docs_callout' into bs3_rc1
2013-07-18 13:07:49 -07:00
Mark Otto
9425382376
Merge branch 'bs3_add_ads' into bs3_rc1
2013-07-18 13:07:17 -07:00
Mark Otto
64efa86036
for some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed dimensions
2013-07-18 02:19:13 -07:00
Mark Otto
6e04925328
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-18 01:25:28 -07:00
Mark Otto
e72b524d41
Fixes #8374 : ensure navbar is always at least 50px
2013-07-18 01:25:08 -07:00
fat
6ec8a1e44f
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-07-18 01:08:19 -07:00
Mark Otto
181b276774
Fixes #8397 : better navbar padding with grid gutter stuff
2013-07-18 01:04:54 -07:00
fat
37e899d766
get button js working with actual form elements p cooll
2013-07-18 00:59:31 -07:00
Mark Otto
f757cf4cf3
run make on mixin changes from #8380
2013-07-18 00:50:57 -07:00
Mark Otto
8dc7807dcd
change characters
2013-07-18 00:48:02 -07:00
Mark Otto
1363ffa473
Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip
2013-07-18 00:43:48 -07:00
Mark Otto
79a10feb7a
Fixes #8452 : adds .active to table classes
2013-07-18 00:10:22 -07:00
Mark Otto
bc79f8a399
Bump tooltips to use @font-size-small (11px to 12px)
2013-07-17 23:55:58 -07:00
Mark Otto
e57758cbb4
Drop .nav-header for .dropdown-header
...
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
2013-07-17 23:54:09 -07:00
Mark Otto
d3a139622e
fixes #8491 : add vars for table padding
2013-07-17 23:34:04 -07:00
Mark Otto
d7d1c2a767
add ads to v3 docs
2013-07-17 23:22:28 -07:00
Mark Otto
3ad0cf9e94
add callouts for bootstrap 2.3.2 docs and 3.0 rc1 post
2013-07-17 22:58:49 -07:00
Mark Otto
542e03ae3a
Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam
...
Conflicts:
docs/components.html
docs/css.html
docs/customize.html
2013-07-17 19:33:30 -07:00
