Commit Graph

3115 Commits

Author SHA1 Message Date
Mark Otto
ee0789ff8f Fixes #7721: change @navbar-text to @navbar-color, along with inverse options 2013-05-03 15:29:32 -07:00
Mark Otto
a6f7f96a93 recompile after last justified nav tweaks 2013-05-03 15:29:10 -07:00
Mark Otto
4357ed72e0 Update justified nav CSS for proper selectors 2013-05-03 15:18:27 -07:00
Mark Otto
747e108e0b Merge pull request #7670 from DarDar/3.0.0-wip
Use @font-size-... variables instead of hardcoded font-size in px
2013-05-03 15:05:29 -07:00
Mark Otto
af4a33f8c0 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-03 14:57:07 -07:00
Mark Otto
e1d947f53e Scope .table-bordered styles to immediate children only 2013-05-03 14:56:57 -07:00
Mark Otto
9d9fd5e0d1 remove .fade from static modal example, but include in code snippet 2013-05-03 14:46:09 -07:00
Mark Otto
0959a78ff1 Merge pull request #7769 from holic/3.0.0-sticky-footer
Use padding instead of #push with box-sizing: border-box
2013-05-03 14:29:11 -07:00
Mark Otto
7cceaa6956 Merge branch 'bs3_cdn_docs_mention' into 3.0.0-wip
Conflicts:
	docs/docs.html
2013-05-03 14:13:06 -07:00
Mark Otto
14861e9cc3 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-03 14:11:23 -07:00
Mark Otto
b5d68f59c2 Add cursor: pointer; to .checkbox and .radio and their inline counterparts 2013-05-03 11:56:00 -07:00
Mark Otto
b0bd5899c5 Merge pull request #7762 from sethlilly/3.0.0-wip
Corrected typo in carousel.html
2013-05-03 11:21:13 -07:00
Mark Otto
1587b8948f run make on previous commits 2013-05-03 10:53:26 -07:00
Mark Otto
e1c67b149f More navbar CSS and docs cleanup
* Rearrange sections
* Add code snippets for text and links in navbars
* Add .navbar-link back in
* Add mention of .navbar-text, but it still needs to be re-implemented
* Update nav to reflect new order
2013-05-02 23:13:43 -07:00
Mark Otto
94792b9dae Improve buttons in navbars
* Add top margin, calculated by subtracting height of an input from height of a navbar, and dividing by two
* Uses the same method as .navbar-form
* To use, add .navbar-btn to any button outside a form element
* Also add section to docs detailing buttons in navbars, and add more ids for the other unlinked and unmentioned sections in the side nav
2013-05-02 23:05:09 -07:00
Mark Otto
bec8c90fd7 Cleanup .navbar-form styles
* Nuke the commented out navbar forms code that's not currently needed
* Add a few more examples to the .navbar-form docs section
* Remove (for now at least) top padding on checkbox and radios
2013-05-02 22:54:14 -07:00
Mark Otto
a4f2c9e156 add customizer link to docs homepage 2013-05-02 22:44:43 -07:00
Kevin Ingersoll
08fea3304a Fix input border flicker in Chrome from @garoevans, closes #7689 2013-05-03 15:33:12 +12:00
Kevin Ingersoll
07117f97b6 Use padding instead of #push with box-sizing: border-box 2013-05-03 15:23:10 +12:00
Seth Lilly
a62e97091c Corrected typo in carousel.html
Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag.
2013-05-02 14:03:54 -03:00
DarDar
9cd3a92713 Use @font-size-... variables instead of hardcoded font-size in px 2013-05-02 08:05:00 +02:00
Mark Otto
f8fd524def add the fade class to the default modal docs 2013-04-30 19:55:02 -07:00
Mark Otto
47155e8aa3 outdent the rows for tablets and above 2013-04-30 19:35:52 -07:00
Mark Otto
0780faad45 make that left/right padding, not top/bottom on navbar 2013-04-30 19:20:41 -07:00
Mark Otto
69f5447afa add back bottom margin to navbars 2013-04-30 19:12:48 -07:00
Mark Otto
e8b7318646 no need for zero padding on navbar top/bottom; better comment 2013-04-30 19:07:28 -07:00
Mark Otto
e67d3818ed nuke line numbers 2013-04-30 11:32:11 -07:00
Mark Otto
26bc36107e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-28 22:46:10 -07:00
Mark Otto
e13d05317e single colon pseudo element for ie8 2013-04-28 22:45:56 -07:00
Mark Otto
0cb1188a9c Merge pull request #7718 from burnsra/3.0.0-wip-breadcrumbs
Cleanup breadcrumb divider last item
2013-04-28 20:14:26 -07:00
Robert Burns
62afdd0176 Update examples after grid changes 2013-04-28 22:22:33 -04:00
Robert Burns
447be1b326 Cleanup breadcrumb divider last item
Modify to hide both padding and leading/trailing whitespace
Thanks to https://github.com/holic for suggestion
2013-04-28 21:51:02 -04:00
Mark Otto
cd06c5baac Merge pull request #7704 from twitter/bs3_moar_grid_changes
BS3: Overhaul grid system once more
2013-04-28 18:44:54 -07:00
Mark Otto
5edfdc02f2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-28 14:27:58 -07:00
Mark Otto
bbee78b30b derp on navbar toggle and docs positions 2013-04-28 14:27:48 -07:00
Mark Otto
227c4639e4 Merge pull request #7713 from burnsra/3.0.0-wip-navs-overhaul
Fix navbar on phone/tablet devices after navbar overhaul
2013-04-28 14:26:10 -07:00
Robert Burns
3326e1b21e Fix navbar on phone/tablet devices after navbar overhaul 2013-04-28 10:09:57 -04:00
Robert Burns
ddc0e98716 Update examples after overhaul of navbar navs 2013-04-28 09:10:01 -04:00
Mark Otto
8b3a1702d4 Overhaul navbar navs
* Switch from  to  to eliminate an element in selectors
* Drop .navbar-divider entirely
2013-04-27 18:28:39 -07:00
Mark Otto
2ffa0e4409 Add maximum bounds variables for so our responsive utilities don't overlap 2013-04-27 11:55:45 -07:00
Kevin
9ce7f22e99 Adding media queries breakpoints variables 2013-04-27 18:47:47 +02:00
Mark Otto
efd3b0c171 Back to two grid classes, .col and .col-lg-* 2013-04-26 23:59:51 -07:00
Mark Otto
8ae9c6ab34 Fixes #7688: move font-weight for glyphicons to before pseudo element 2013-04-26 23:14:06 -07:00
Mark Otto
aa146582d6 Redo the getting started section to mention BootstrapCDN 2013-04-26 20:51:48 -07:00
Mark Otto
57ba494409 running make 2013-04-26 10:44:44 -07:00
Stephen Edgar
8311ad513f 'docs' folder .editorconfig code guide updates 2013-04-24 14:38:51 +02:00
Artur Kwiatkowski
55bbb9ffd7 Nuked local .a() mixins and simplified the nesting 2013-04-22 15:34:23 +02:00
Artur Kwiatkowski
b7dcefea83 Merge branch '3.0.0-wip' of https://github.com/twitter/bootstrap into 3.0.0-wip 2013-04-22 15:21:55 +02:00
Mark Otto
e0d60b1325 Fixes #7617: lowercase and dash gray color vars 2013-04-21 19:35:36 -07:00
Mark Otto
364f8330a1 Fixes #7648: Thumbnail caption should use @text-color variable. Also adds other thumbnail vars 2013-04-21 18:29:06 -07:00
Mark Otto
30d6e0530e Fixes #7577: Attempt to fix, at least, issues with Windows Phone 8 and responsive not kicking in correctly 2013-04-21 14:50:44 -07:00
Mark Otto
dc4436dbc9 Only use .danger for alerts, no more .error 2013-04-20 15:36:11 -07:00
Mark Otto
0c9b161bb8 Fixes #7093: more consistent scrollspy docs 2013-04-20 15:32:16 -07:00
Mark Otto
510c9a6ad8 First pass at updated responsive utilities to be mobile-first. Pulled from #7490 by @apotropaic 2013-04-20 12:33:09 -07:00
Mark Otto
04d782efab correct grid class in example code 2013-04-20 12:29:12 -07:00
Mark Otto
70f8d77012 correct grid class mention in docs 2013-04-20 12:28:36 -07:00
Mark Otto
a956a3258b Alternate docs mention of breadcrumbs separator, as called out in #7601 2013-04-20 12:23:27 -07:00
Mark Otto
ba7d928c37 Merge pull request #7645 from burnsra/3.0.0-wip-docs
Fix carousel examples within docs
2013-04-20 12:11:35 -07:00
Mark Otto
afdab35aca Fixes #7640: only reset margin on last-child p within blockquotes 2013-04-20 12:09:08 -07:00
Robert Burns
ce719925af Fix carousel examples within docs 2013-04-20 13:26:18 -04:00
Artur Kwiatkowski
39bb8146f8 more nested labels component 2013-04-19 21:31:55 +02:00
Mark Otto
61ea1ae909 Merge pull request #7598 from wangshishuo/3.0.0-wip
change nav's #tables-hover to #tables-hover-rows
2013-04-18 19:48:17 -07:00
Mark Otto
5c9bd1a221 Merge pull request #7608 from Fowowski/3.0.0-wip
more nested less rules - pager component
2013-04-18 19:47:26 -07:00
Fabien
7b5fcc2c9a Remove dupe css rule of table element
This are already declare in normalize
2013-04-19 02:48:08 +02:00
Jeremy Denoun
d3e0d4a7ba update docs 2013-04-18 17:05:50 +02:00
Artur Kwiatkowski
4bd6abaff2 applied @pagination-bg for .disabled state instead of hardcoded color in hex 2013-04-17 19:47:23 +02:00
wangshishuo
5892cea207 change nav's #tables-hover to #tables-hover-rows 2013-04-17 12:27:30 +08:00
Artur Kwiatkowski
dc97a1967b more nested navs 2013-04-16 16:45:51 +02:00
Mark Otto
5b38a1a357 Merge branch 'bs3_homepage' into 3.0.0-wip 2013-04-15 00:16:40 -07:00
Mark Otto
5471ce8ea3 Fixes #5256: Use > selector for better nesting of tables 2013-04-14 20:33:54 -07:00
Mark Otto
ab7070bb49 change var from @table-border to @table-border-color 2013-04-14 19:45:32 -07:00
Mark Otto
02eba5e5fc center 2013-04-14 16:31:52 -07:00
Mark Otto
7dca242b5e nuke all the assets 2013-04-14 15:33:48 -07:00
Mark Otto
8d9106f2c5 nuke hidden homepage content 2013-04-14 15:32:52 -07:00
Mark Otto
0b3e9ced54 Merge branch '3.0.0-wip' into bs3_homepage 2013-04-14 13:45:10 -07:00
Mark Otto
526534f337 more copy edits to sidenotes 2013-04-14 13:01:00 -07:00
Mark Otto
ccb6ac570f lighter .highlight in sidenotes as well 2013-04-14 13:00:53 -07:00
Mark Otto
0a84a7c43d shorter copy 2013-04-14 12:56:21 -07:00
Mark Otto
32761b3303 use spaces for indenting, not tabs /cc @juthilo 2013-04-14 12:54:56 -07:00
Mark Otto
f78945ccc9 More contrast with code snippets in sidenotes 2013-04-14 12:54:02 -07:00
Mark Otto
5f88887c7e redo all the things 2013-04-14 12:49:35 -07:00
Julian Thilo
2b228bae60 More work on the sidenotes
* Convert more inline advices (compatibility, dependencies, ...) to
sidenotes
* Add sidenotes for:
** Note on plugin dependencies in general
** Required padding for navbar-fixed- (incl. code snippet)
* Fixed text for the small tag
2013-04-14 18:36:11 +02:00
Mark Otto
f226463b05 Restore on links in dropdowns as they are randomly breaking onto new lines 2013-04-13 23:54:51 -07:00
Mark Otto
86bb3b8126 IE8 doesn't need help with responsive images, they work just dandy apparently (see http://jsbin.com/idesit/1) 2013-04-13 23:17:39 -07:00
Mark Otto
eefddb1eab more indenting 2013-04-13 22:49:21 -07:00
Mark Otto
20259e2350 fixes #7191 and cleans up indenting some 2013-04-13 22:48:44 -07:00
Mark Otto
fc8b9fb07d swap all bold p tags in sidenotes for h4s 2013-04-13 22:10:34 -07:00
Mark Otto
382a86f46e Merge branch '3.0.0-docs1' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs1 2013-04-13 21:50:17 -07:00
Julian Thilo
d7bc89b433 Sidenotes instead of alerts
* I propose: make the docs rely more heavily on the new design language,
replace alerts (not the .alert examples) by sidenotes.
* Remove alert-heading class, which no longer exists in CSS.
2013-04-14 04:04:01 +02:00
Paul Tyng
bec5679264 update docs bootstrap.css 2013-04-13 17:13:14 -03:00
Mark Otto
ae98f1803f add modal variables and tweak padding for min-height on modal title 2013-04-12 20:56:19 -07:00
Mark Otto
a96dd1bd28 Merge branch '3.0.0-wip' of https://github.com/garvincasimir/bootstrap into garvincasimir-3.0.0-wip 2013-04-12 20:45:10 -07:00
Mark Otto
b3bb89520d add comma; more accurate code snippet 2013-04-11 20:16:20 -07:00
Mark Otto
5b7596a5b3 Merge branch '3.0.0-wip' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-wip 2013-04-11 20:12:53 -07:00
Mark Otto
7acadc09db Merge pull request #7546 from CoffeeAndCode/3.0.0-wip
fixed typo in typography documentation
2013-04-11 19:54:17 -07:00
Jonathan Knapp
0d70b3c54e fixed typo in typography documentation 2013-04-11 16:02:29 -03:00
Stephen Edgar
3dc8be74fe Fix docs.html Table Row Danger CSS Class 2013-04-11 20:24:13 +10:00
Julian Thilo
78d64e97e9 Dusting the docs
* Fix some typos, grammar, sentence structure
* Fix left-over error tr class
* Remove uneditable inputs section
* Make compatibility sections stand out as sidenotes
* Make modal example scrollable on big screens, too
* Make some examples more self-explanatory
2013-04-10 19:18:04 +02:00
Julian Thilo
ece78ff086 cololol
Correct all span, push, pull, offset classes to col- schema
Fix a typo
2013-04-10 00:04:44 +02:00
Mark Otto
24f8d9e137 don't use table for label variatons 2013-04-09 10:43:37 -07:00
Mark Otto
1a546278b9 make back to top and big headings only for tablets and up 2013-04-09 10:20:50 -07:00
Mark Otto
dd533aaaf0 better buttons on mobile 2013-04-09 10:16:37 -07:00
Mark Otto
92977fb13e fixes #7503: don't do dat 2013-04-07 22:58:16 -07:00
Jamie Knight
c78c66527d Update docs.html
Added heads up regarding lone icons providing accessibility issues for screen readers.
2013-04-07 16:25:00 +02:00
Phil Freo
06a4bb38c0 Fix typo in docs 2013-04-06 21:02:24 -07:00
Garvin
05710e10f7 Added min-height to modal-header for modals with no header text 2013-04-06 21:48:53 -04:00
Andrew Scofied
c1ab200985 updated docs, changed out span* for col-span-* 2013-04-03 09:48:39 -07:00
Mark Otto
eadfa59d92 Add small grid for phones and tablets 2013-04-02 19:40:43 -07:00
Mark Otto
610eb8fb78 sidenote edit under customization section 2013-04-02 18:02:53 -07:00
Mark Otto
c570ae49ef fix that sidenav 2013-04-02 16:22:42 -07:00
Mark Otto
0ac711059b refactor some of the carousel caption stuff to center it and tighten styles up; update carousel template to start to redo mobile first 2013-04-02 16:17:04 -07:00
Mark Otto
0f51a750a8 Merge branch 'example-fix' of https://github.com/Boulox/bootstrap into Boulox-example-fix 2013-04-02 14:49:42 -07:00
Fabien
e56461fbd7 Improve responsiveness for tablet and below of navbar in carousel example
- Remove margin-top of navbar-wrapper
- Remove border radius of navbar
- Space out the carousel
2013-04-02 13:39:04 +02:00
Fabien
8f99692f56 remove unused img from previous commit 2013-04-02 13:31:15 +02:00
Fabien
e0bce6af12 Replace png img by holder.js in carousel example 2013-04-02 13:30:13 +02:00
Fabien
aa51a36686 Fix corss link for sticky footer 2013-04-02 13:26:35 +02:00
Fabien
9ecc43d21a Fix link to navbar doc 2013-04-02 13:22:31 +02:00
Robert Burns
3233155bb4 Fix responsive view for inverted navbar example 2013-04-01 22:02:35 -04:00
Mark Otto
7e31bea114 run make 2013-04-01 13:25:51 -07:00
Mark Otto
12f043f1bb Merge branch '3.0.0-wip-carousel' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-carousel 2013-04-01 13:17:31 -07:00
Mark Otto
292734d7f3 Docs examples update
* Remove unused fluid image
* Add image, link, and description for new grid example
* Update sign in example image
2013-04-01 13:14:39 -07:00
Mark Otto
eac987c0d2 only negative indent nested grid rows; add new grid example 2013-04-01 12:55:48 -07:00
Mark Otto
a0726e605f add type attr 2013-04-01 12:10:53 -07:00
Mark Otto
e6d6fcffb0 button for navbar toggle 2013-04-01 12:09:49 -07:00
Mark Otto
93db7c2c74 more link fixing 2013-04-01 11:14:11 -07:00
Mark Otto
c231dba7ee updated links on homepage 2013-04-01 11:10:56 -07:00
Robert Burns
89bbeec898 Additional cleanup to responsive navbar 2013-04-01 12:58:40 -04:00
Robert Burns
1816483baa Add carousel indicators to example 2013-04-01 09:29:43 -04:00
Robert Burns
e183dd46a2 Update carousel-caption btn styles 2013-04-01 09:27:49 -04:00
Mark Otto
19d5e61668 clearer separation with section headers; simpler customizing copy 2013-04-01 00:34:58 -07:00
Mark Otto
7bee10a5ef oops, restore customizer 2013-04-01 00:11:47 -07:00
Mark Otto
9df6dc81b5 bring in customizing bootstrap section from old gist 2013-04-01 00:02:51 -07:00
Mark Otto
d8b3e48e14 add proper markup to list group in panels section 2013-03-31 22:58:01 -07:00
Mark Otto
2f8deea95a add .panel-primary 2013-03-31 22:22:52 -07:00
Mark Otto
0fbfa167e1 fix text class in docs 2013-03-31 19:55:05 -07:00
Mark Otto
3365d4a06a Merge branch '3.0.0-wip-fixes' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-fixes 2013-03-31 19:28:27 -07:00
Mark Otto
c69310153e Fixes #7438: remove max-height from justified nav tabs with some CSS wankery 2013-03-31 19:26:40 -07:00
Robert Burns
d299ff4fce Fix image paths and carousel controls for carousel example 2013-03-31 21:47:02 -04:00
Mark Otto
4c49458336 remove text-rendering optimizeLegibility from headings 2013-03-31 18:40:07 -07:00
Mark Otto
db284a97d6 more consistent navbar vars 2013-03-31 17:56:31 -07:00
Mark Otto
d6f37f3c56 @link-color-hover to @link-hover-color 2013-03-31 17:27:22 -07:00
Mark Otto
d5fa1d80bb use @pagination- vars on pager component; change @pagination-bg-active to @pagination-active-bg 2013-03-31 17:22:12 -07:00
Mark Otto
6b23a66c29 -background to -bg on tooltip and popover vars 2013-03-31 17:19:12 -07:00
Mark Otto
c5042e050e fix nav divider 2013-03-31 17:17:10 -07:00
Mark Otto
388a4c878d remove lingering rem 2013-03-31 13:20:54 -07:00
Mark Otto
674768b177 restore px unit on @font-size-base 2013-03-31 12:00:04 -07:00
Mark Otto
a2145df7c4 run make after that breadcrumbs tweak 2013-03-31 11:58:25 -07:00
Mark Otto
42b6934930 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-03-31 11:58:08 -07:00
Mark Otto
b018513aa5 lingering nav-list use 2013-03-31 11:58:00 -07:00
Mark Otto
e62f2901d0 Merge pull request #7431 from burnsra/3.0.0-wip-fixes
Cleanup items for 3.0.0
2013-03-31 11:55:48 -07:00