8ae9736ead
Merge branch 'remove-body-content' of https://github.com/lipis/bootstrap into lipis-remove-body-content
2013-08-18 10:00:30 -07:00
78701778d0
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-18 10:00:20 -07:00
4246f6a01f
fixes #9769 : use navbar border radius var in theme
2013-08-18 09:58:21 -07:00
db5aee54df
Merge pull request #9782 from minddust/3.0.0-wip
...
Update progressbar docs
2013-08-18 09:01:41 -07:00
142ada4219
Update progressbar
...
there is no gradient in 3.x
2013-08-18 17:17:07 +02:00
ce410dc36e
fixed caret
2013-08-18 20:13:48 +08:00
863b03cf38
updates to migration
2013-08-18 07:20:56 -04:00
d1519400f2
updates to migration
2013-08-18 07:19:53 -04:00
e6e8499ab8
Got rid of body-content from examples
2013-08-18 12:25:23 +02:00
6b24297c5b
update urls
2013-08-18 02:11:57 -07:00
fd97c2fce4
bad copypasta
2013-08-18 02:04:39 -07:00
c7e5fa15e0
Merge branch '3.0.0-wip' into bs3_restore_glyphicons
2013-08-18 02:04:10 -07:00
72a3819f6c
remove carousel icons include
2013-08-18 01:55:47 -07:00
e13ca6d384
Upgrade to latest glyphicons
2013-08-18 01:46:26 -07:00
b09fcc019c
remove old glyphicons mention
2013-08-18 01:32:33 -07:00
f2e35bf702
docs layout and alignment refinement
2013-08-18 01:23:45 -07:00
1e0453f825
Restore glyphicons
2013-08-18 00:36:51 -07:00
b790bbbafc
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-18 00:29:15 -07:00
57f5872467
bunch of updates to customizer
2013-08-18 00:28:52 -07:00
09d80fab99
Merge pull request #9761 from wangsai/fix-eamples-respondjs
...
add IE's Conditional comments for respondjs and html5shiv
2013-08-17 23:55:05 -07:00
578a14e14a
Rearrange the docs CSS
2013-08-17 23:53:27 -07:00
0c094efe28
add IE's Conditional comments for respondjs and html5shiv
2013-08-18 14:28:52 +08:00
d13c4e5e5b
Update URLs in config to what I think they need to be; add theme CDN url
2013-08-17 23:07:15 -07:00
c729f16282
it's levi-OH-sa, not levi-oh-SAR
2013-08-17 22:51:00 -07:00
40cbfb69d2
undo old change to navbar brand from this branch
2013-08-17 22:44:59 -07:00
6b74b871df
clean up padding and alignment and stuff
2013-08-17 22:43:15 -07:00
18766db634
Merge branch '3.0.0-wip' into bs3_homepage
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-17 22:39:07 -07:00
04a73ebe42
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 22:11:27 -07:00
3e02b0f5d0
Update docs text a bit
2013-08-17 22:11:21 -07:00
95732b429f
add dependency support to customizer
2013-08-17 21:50:01 -07:00
f891f91bac
Reorder bootstrap.less to match docs oder
2013-08-17 21:18:00 -07:00
811120ffa2
Add data-dependency to less and js files in customizer
2013-08-17 21:17:35 -07:00
8d59d8def7
sub headings for modals and mobile devices on browser support
2013-08-17 21:01:58 -07:00
9533a1339f
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 21:00:20 -07:00
5539db5237
Navbar update
...
Addresses a few different cases where the navbar has and doesn't have a
container, and accordingly adjusts the padding and margin of key
elements.
2013-08-17 21:00:13 -07:00
b413aff045
Favicon in navbar example
2013-08-17 20:35:31 -07:00
d713f8341c
Update jumbotron
...
* Defaults to no rounded corners and full width in the viewport
* When in a container, the jumbotron has extra padding and will have
rounded corners
* Updates default jumbotron example to show the full width default
display
Fixes #9759 .
2013-08-17 20:33:52 -07:00
47fcb322eb
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 20:29:36 -07:00
734b6acf13
add small fix for tooltip consistency + fix customizer syntax issue
2013-08-17 20:28:58 -07:00
d9e38312d2
copy edit
2013-08-17 20:11:18 -07:00
f6c151aa20
Merge pull request #9756 from twbs/bs3_theme
...
BS3: Add optional theme (fixes #8706 )
2013-08-17 19:17:25 -07:00
9a66906d3d
generic comment
2013-08-17 19:14:13 -07:00
761b80c391
Merge branch '3.0.0-wip' into bs3_theme
2013-08-17 19:09:33 -07:00
06c3d87973
use correct arg name
2013-08-17 19:07:59 -07:00
9828aa5b4d
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 19:04:58 -07:00
00d2986858
add logging
2013-08-17 19:04:41 -07:00
b31ce3204d
Merge branch '3.0.0-wip' into bs3_theme
2013-08-17 19:00:35 -07:00
0098c358c8
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 19:00:22 -07:00
3780edd956
update examples to use new .btn-lg class
2013-08-17 19:00:14 -07:00
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
Mark Otto