Mark Otto
37933a9e08
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/css/bootstrap.min.css
2013-09-11 12:31:21 -07:00
Lipis
a2a5be11a3
Updated the old btn-large in carousel example
2013-09-11 01:34:56 +02:00
Mark Otto
c8c3bf00b6
fixes #9985 : update grid classes in grid example
2013-09-09 13:56:10 -07:00
Mark Otto
f80fd03542
Remove nav from jumbotron example (temp fix for #10228 )
2013-09-06 09:57:19 -07:00
Mark Otto
c0f6d722b0
polish off #10227 with an inline comment
2013-09-04 12:16:46 -07:00
Mark Otto
88e1e20b95
Merge pull request #10227 from UTCWebDev/master
...
Fixes 10212 - Make custom max-width on row conform to Bootstrap convention
2013-09-04 12:15:45 -07:00
Christian
5d88943a52
Update index.html
...
Updated text in the jumbotron container to reflect the Bootstrap 3 change from 'hero unit' to 'jumbotron'.
2013-09-02 21:36:54 +09:00
Mark Otto
8df05b95df
Remove links to navbar examples from example navbars in Theme example--nullifies #9894
2013-09-01 23:46:23 +02:00
Mark Otto
62477653e7
fixes #10111 : different colors for dropdown link hover and active states
2013-09-01 11:00:40 +02:00
Mark Otto
e8f7d4fcef
fixes alignment and nav list in offcanvas example
2013-09-01 10:34:21 +02:00
Mark Otto
c9303c17ab
Merge pull request #10249 from coliff/patch-1
...
Update index.html (update text from hero unit to jumbotron)
2013-09-01 01:09:55 -07:00
Mark Otto
9e541fc717
fixes #10136
2013-09-01 09:46:33 +02:00
UTCWebDev
ee2e2ae0ae
Prevent X-scroll on small screens
...
html overflow-x must be hidden to prevent accidental x-scroll on small screens. This is more apparent with touch screens, where the user often gestures diagonally instead of a true vertical gesture.
2013-08-28 15:55:45 -04:00
Christian
32fbc882b9
Update index.html
...
Updated text in the jumbotron container to reflect the Bootstrap 3 change from hero unit to jumbotron. (Wasn't sure if it should be 'a Jumbotron' or just 'Jumbotron' though...
2013-08-28 20:09:17 +09:00
UTCWebDev
5ce4b8c7ff
Make custom max-width on row conform to Boostrap convention
...
Bootstrap break point for tablet portrait 768 keeps the row intact, so it's not appropriate to have off-canvas elements at that width. Custom off-canvas.css should be breakpoint 767px
2013-08-27 16:34:26 -04:00
Mark Otto
4f28fdd227
Fixes #9928 and #9932 : carousel example in IE10
...
* Use absolute positioning instead to remove navbar from flow of
document
* No more negative margin fu
* Flip around padding between container and navbar for proper display
in xs and sm viewports
2013-08-27 09:10:06 -07:00
Mark Otto
c84374f9de
fixes #9901
2013-08-27 08:53:48 -07:00
Mark Otto
4ad2ecf975
Improve upon #9937 : Link and put reset column stuff to action in the grid example
2013-08-26 17:58:15 -07:00
Mark Otto
4d23aa4ef5
Address #9873 and fix #9774
...
* Update styling of justified nav links to be more mobile friendly
(with all four rounded corners and some margin between items)
* Add note to docs to callout bogus WebKit rendering on component and
example
2013-08-26 17:37:52 -07:00
Luis Nell
8401855f16
Correct Typo
2013-08-25 23:58:01 +02:00
Kevin Suttle
dd9c15273c
Add even more role="button" attributes
...
Missed the <a class="btw" in my regex search
2013-08-24 16:31:15 -04:00
Mark Otto
705f7ba279
fixes #9876 : avoid dropdowns in navbar examples to prevent overlap
2013-08-23 23:39:11 -07:00
Mark Otto
c4c87fede5
fixes #9880 : use correct grid classes on jumbotron example
2013-08-22 23:25:26 -07:00
Christian
c76b7a53a4
Update justified-nav.css
...
Removed unnecessary ms-linear-gradient prefix. There was never a stable release of IE that supported -ms- prefixed gradients, those were only in preview versions (stable IE10 supports both prefixed and unprefixed gradients). (source: http://lea.verou.me/2013/04/can-we-get-rid-of-gradient-prefixes/ )
2013-08-21 16:30:12 +09:00
Chris Rebert
d924bca6f6
fix #9924
2013-08-20 12:41:41 -07:00
Mark Otto
285393fb77
Re-enable glyphicons in carousel controls and then remove redundant CSS from example
2013-08-19 00:58:29 -07:00
al // @idest
eb43c26855
Fix vertical alignment of carousel navigation arrows.
...
Navigation arrows were aligned to the top of page. Vertically centered them in this fix.
2013-08-19 00:54:54 -07:00
al // @idest
8b24c47788
Add background-color to carousel.
...
Set a background color for the carousel example so that white text is now legible. Also fixed typo on line 97.
2013-08-19 00:49:28 -07:00
Mark Otto
a9378a9267
Merge branch '3.0.0-wip' into bs3_homepage
...
Conflicts:
customize.html
dist/css/bootstrap.min.css
2013-08-18 20:15:45 -07:00
Mark Otto
a1db2d7a5e
Merge branch '3.0.0-wip' into bs3_panel_base_class
...
Conflicts:
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.min.css
2013-08-18 20:11:04 -07:00
Mark Otto
03ba9ed9ed
update theme to match
2013-08-18 19:53:28 -07:00
Mark Otto
bab51d27ac
Refactor panels to have a base class for improved flexibility when customizing (and no overriding to start, too)
2013-08-18 19:40:57 -07:00
Mark Otto
9dcae610e9
Merge branch '3.0.0-wip' into bs3_homepage
...
Conflicts:
customize.html
examples/justified-nav/justified-nav.css
2013-08-18 19:02:42 -07:00
Mark Otto
87a1d7e5a0
update non responsive example
2013-08-18 18:47:05 -07:00
Mark Otto
1bc13c659f
don't include other navbar links in non responsive docs; use generic links
2013-08-18 18:44:40 -07:00
Mark Otto
35ad599df6
prevent navbar from collapsing in non responsive example ( fixes #9812 )
2013-08-18 18:16:01 -07:00
Mark Otto
638db635d7
fix broken button
2013-08-18 15:45:56 -07:00
Julian Thilo
ef68cf8ebd
Add new navbar-default class to examples
2013-08-19 00:35:40 +02:00
Mark Otto
f8b65b41ab
Merge branch '3.0.0-wip' into bs3_restore_glyphicons
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-18 10:28:32 -07:00
Mark Otto
0c9bf6bcce
remove padding from justified nav masthead and footer
2013-08-18 10:02:32 -07:00
Panayiotis Lipiridis
e6e8499ab8
Got rid of body-content from examples
2013-08-18 12:25:23 +02:00
Mark Otto
72a3819f6c
remove carousel icons include
2013-08-18 01:55:47 -07:00
saiwang
0c094efe28
add IE's Conditional comments for respondjs and html5shiv
2013-08-18 14:28:52 +08:00
Mark Otto
c729f16282
it's levi-OH-sa, not levi-oh-SAR
2013-08-17 22:51:00 -07:00
Mark Otto
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
Mark Otto
b413aff045
Favicon in navbar example
2013-08-17 20:35:31 -07:00
Mark Otto
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
Mark Otto
b31ce3204d
Merge branch '3.0.0-wip' into bs3_theme
2013-08-17 19:00:35 -07:00
Mark Otto
3780edd956
update examples to use new .btn-lg class
2013-08-17 19:00:14 -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