Mark Otto
26ca131a95
Merge branch 'wpbrains-media-component' into 2.1.2-wip
2012-09-17 18:15:44 -07:00
Mark Otto
143fef9f95
overhaul the docs and css to merge into 2.1.2 since this was against master
2012-09-17 18:15:39 -07:00
Mark Otto
917b46a343
resolve conflicts and remake
2012-09-17 16:43:18 -07:00
Mark Otto
caa79ed594
fixes #5001 : proper ids on form examples
2012-09-17 16:26:51 -07:00
Mark Otto
6881c193ca
fixes #5039 : properly set .row-fluid margins for .controls-row
2012-09-17 16:09:36 -07:00
Mark Otto
03a406d920
fixes #5041 : add new navbar css tests for each variation, remove width: 100%; from .navbar-static-top
2012-09-17 15:49:22 -07:00
Mark Otto
f69e244a60
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-09-17 15:28:41 -07:00
Mark Otto
cd876fb659
Merge pull request #5125 from tapcanvas/tab-body-bg
...
Use @bodyBackground on .nav-tabs active state instead of static color
2012-09-17 15:28:31 -07:00
Mark Otto
6f3bef195a
nuke new examples for now
2012-09-17 08:53:13 -07:00
Mark Otto
1ea09b751e
fixes #5163 : add new var for navbar collapse's default view, use that in responsive navbar css
2012-09-17 08:52:19 -07:00
Mark Otto
6e25aacc91
more carouself example work
2012-09-16 21:54:06 -07:00
Robert McLaws
6aa15eb01f
Support for left-opening dropdown submenus
...
Adds a new class called .dropdown-submenu-left. It is useful when you
have a .pull-right DropDown that has submenus. Without this, the menu
opens left past the page boundary, which can trigger the scrollbars and
cause other nastiness.
2012-09-16 03:02:31 -04:00
Mark Otto
6c4b276cd4
way cooler carousel example, along with updated screenshots for examples
2012-09-14 15:55:46 -07:00
Mark Otto
7857089065
tweak copy on each template, add sign in template
2012-09-14 15:21:44 -07:00
Mark Otto
0bcbcf69ec
adding new examples
2012-09-14 15:17:46 -07:00
Mark Otto
e4e2e37c5c
add in some more examples (will work em in later), removed fleetio per their request, and added gather content to replace it
2012-09-14 14:48:03 -07:00
Mark Otto
5aa1018496
i18n homepage
2012-09-14 14:31:14 -07:00
Mark Otto
faa760f563
revert docs change
2012-09-14 10:30:55 -07:00
Martin Bean
2ead9a5bc3
Standardized spelling of 'JavaScript'; added icons to file trees
2012-09-14 14:06:15 +01:00
Adrien Cahen
5331fe39df
fix active tab bg on non-white body
2012-09-13 12:16:18 -07:00
Mark Otto
595e1a189c
fixes #5119 : javascript in navbar typo
2012-09-13 10:07:57 -07:00
Brian Campbell
a40ab1cd66
mistakenly committed ALL assets. since only bootstrap.css and bootstrap.min.css are changed i removed all others
2012-09-12 18:11:42 -06:00
Mark Otto
15bb78ce80
fixes #5107 : make all .btn-group inline-block by default instead of just within a .btn-toolbar
2012-09-12 16:37:41 -07:00
Mark Otto
e1deba30aa
fixes #5097 : js docs typos
2012-09-12 16:22:52 -07:00
Mark Otto
537c5cc33d
use local var for a few other .box-shadow mixins to fix CSS not compiling
2012-09-12 16:18:52 -07:00
Mark Otto
65d322958c
add space
2012-09-12 16:11:03 -07:00
Mark Otto
38303dd997
revert the js evaluation in .box-shadow mixin, fix last mixin usages to escape if using >1 shadows
2012-09-12 15:53:29 -07:00
Mark Otto
bbadd429a8
change up box-shadow mixin usage everywhere to use escaping again, or local var if necessary for further var evaluation
2012-09-12 15:48:56 -07:00
Brian Campbell
2c8eff0eec
Updated pagination to support .pagination-large, .pagination-small, .pagination-mini matching button sizes. Updated related docs.
2012-09-12 14:10:03 -06:00
Mark Otto
0489c708c7
fixes #5040 manually: remove overflow: auto; from .modal to resolve sporadic modal right padding issues with scrollbars
2012-09-10 22:51:16 -07:00
Mark Otto
39791a8ea8
fixes #5059 manually: include media type in css getting started block
2012-09-10 22:44:08 -07:00
Mark Otto
cd2b12f788
fixes #5064 manually: remove fancy quote mark
2012-09-10 22:41:14 -07:00
Mark Otto
10faf28aef
Merge pull request #5051 from GeoffYoung/2.1.2-wip
...
Update modal example code to match example
2012-09-10 10:04:34 -07:00
Geoff Young
76e42edb29
Updated sample markup to reflect live demo.
2012-09-09 18:58:23 -04:00
Mark Otto
f29f98501c
run make after merging #5028 , which removes the left margin of responsive fluid grid offsets
2012-09-07 11:42:21 -07:00
Mark Otto
1f8e2d2617
Merge branch 'dionysiosarvanitis-master' into 2.1.2-wip
2012-09-07 11:41:35 -07:00
Mark Otto
61332d727e
fixes #5020 : submenu support in dropup
2012-09-07 11:34:05 -07:00
Mark Otto
f2bd7d9f27
fixes #5018 : .btn-block in .modal-footer no longer has left margin
2012-09-07 11:10:00 -07:00
Mark Otto
6c5c3c81ec
Merge branch 'tiny-typos' of https://github.com/ramiro/bootstrap into ramiro-tiny-typos
2012-09-07 11:06:08 -07:00
Mark Otto
7a0f5c6c00
fixes #5010 : .pager span selector should be scoped to immediate children only
2012-09-07 11:04:51 -07:00
Dionysios G. Arvanitis
cc4f8b9f6c
remove offset margin in row-fluid mobile layout
2012-09-07 17:54:15 +03:00
Giuliano Velli
501a2d69e1
Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component
2012-09-07 10:13:26 +02:00
Giuliano Velli
7762a77c21
Modified the file to conform to bootstrap standards and fix an IE7 css selector issue
...
Signed-off-by: Giuliano Velli <giuliano@giusi.org>
2012-09-07 09:59:52 +02:00
Ramiro Morales
138b5a8c05
Fix small documentatio typos.
2012-09-05 23:07:52 -03:00
Mark Otto
d4a16d35eb
fixes #4996 : incorrect border radius on a table
2012-09-05 10:05:54 -07:00
Mark Otto
3fa4ca2d87
Merge branch 'spantaleev-patch-1' into 2.1.2-wip
2012-09-05 10:04:38 -07:00
Mark Otto
dfb3175d4b
rebuild after merge
2012-09-05 10:04:28 -07:00
Mark Otto
08b8571cb8
version bump to get this started
2012-09-05 10:00:57 -07:00
Slavi Pantaleev
5ff5d351bf
Do not force white icons in active tab links
...
Active `.nav-tabs` elements are not blue (like pills),
so forcing a white icon there is not appropriate.
2012-09-05 19:07:53 +03:00
Jacob Thornton
c52368d3c5
last rebuild before 2.1.1 release
2012-09-04 20:44:11 -07:00
