rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity
6,572 Commits 108 Branches 89 Tags 549 MiB
6fb81f155b
Commit Graph

6572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
7f6210cea4 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-01 10:04:54 +02:00
Mark Otto
3a4ea1a7be better layout 2013-09-01 10:04:44 +02:00
Mark Otto
e10bf3aa7f finishes #10245 by adding it the new var to the customizer 2013-09-01 10:04:03 +02:00
Mark Otto
daa8330b41 Merge branch 'master' into dancek-breadcrumb-separator 2013-09-01 10:01:57 +02:00
Mark Otto
1e68143b39 Merge pull request #10232 from twbs/table-nesting 
use direct-child selector more in table styles to better support nested tables
 2013-09-01 00:59:55 -07:00
Mark Otto
560753da96 Merge branch 'master' into table-nesting 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-01 09:59:27 +02:00
Mark Otto
4b53ea52e9 fixes #10223: adds color to input addon 2013-09-01 09:53:41 +02:00
Mark Otto
794d784519 fixes #10153: restore headings-color variable 2013-09-01 09:49:28 +02:00
Mark Otto
9e541fc717 fixes #10136 2013-09-01 09:46:33 +02:00
Mark Otto
f29ec45715 Merge branch 'master' into deprecate_screen_containers 2013-09-01 09:33:11 +02:00
Mark Otto
e47ebf3686 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-01 08:18:46 +02:00
Mark Otto
8f80a76bf3 Merge pull request #10299 from StevenBlack/GettingStartedEdits1 
'Getting started' section: refactoring for succinctness, active voice, and consistency with button and link captions.
 2013-08-31 23:17:54 -07:00
Mark Otto
5c3614d97c Merge pull request #10323 from StevenBlack/GSEdits3 
Getting started docs: tweaks to the _Basic template_ section
 2013-08-31 23:15:47 -07:00
Mark Otto
9ba64cc1a9 Merge branch 'patch-1' of https://github.com/tagliala/bootstrap into tagliala-patch-1 2013-09-01 08:13:51 +02:00
Mark Otto
eb95574d80 Merge branch 'breadcrumb-separator' of https://github.com/dancek/bootstrap into dancek-breadcrumb-separator 2013-09-01 08:12:56 +02:00
Kevin Granger
f849e65d56 Replace invalid US-ASCII character "\xE2") 
Replace invalid US-ASCII character "\xE2") '—' => '-'
 2013-08-31 17:50:14 +02:00
Mark Otto
3e62905f9d Merge branch 'master' of github.com:twbs/bootstrap 2013-08-31 09:04:17 +02:00
Mark Otto
644c227ae1 Merge pull request #10265 from twbs/fix-10252 
fix #10252 by restricting Android Firefox reset to only .form-control & .btn
 2013-08-30 23:31:30 -07:00
Steven Black
a18fefe9bc Getting started docs: tweaks to the _Basic template_ section 2013-08-31 00:03:14 -04:00
Chris Rebert
216df5bb46 Merge pull request #10315 from mokkabonna/phantom-cleanup 
deleted files not used anymore after transition to grunt-contrib-qunit
 2013-08-30 12:58:24 -07:00
Martin Hansen
6d3ad5ed7f deleted files not used anymore after transition to grunt-contrib-qunit 2013-08-30 21:39:48 +02:00
Chris Rebert
e08f4ff762 Merge pull request #10312 from jleight/master 
Fix broken link to alerts section of JS page.
 2013-08-30 12:26:11 -07:00
Jonathon Leight
ccb630e60f Fix broken link to alerts section of JS page. 
Link was pointing to #js-alerts, but that section of the page does not exist. Changed to #alerts instead.
 2013-08-30 15:01:07 -04:00
jhr007
0aa4eecee1 Moved "Major class changes" section; Added progress-bar-* 2013-08-30 00:14:21 -05:00
Steven Black
2e2fffe8f8 more refactoring of the 'Getting started' section towards more succinct and active wording. 2013-08-30 01:07:09 -04:00
Steven Black
36044b3a11 More concise 'fastest way' statement, and consistency with the text of the Download button 2013-08-30 00:38:48 -04:00
jhr007
f567646738 Add a change to the progress bar. 
In v3 the inner progress bar should have .progress-bar not .bar
 2013-08-29 23:21:07 -05:00
Chris Rebert
5b21768c05 fix #10292 2013-08-29 16:12:39 -07:00
Julian Thilo
0ce3d67f35 Merge pull request #10276 from javiereguiluz/patch-3 
Correct comment in grid mixin example
 2013-08-29 08:30:17 -07:00
Javier Eguiluz
83354ab156 [doc] minor fix in the LESS mixins example 2013-08-29 11:51:39 +02:00
Chris Rebert
2ef147b16b fix #10252 by restricting Android Firefox reset to only .form-control & .btn 2013-08-28 15:37:34 -07:00
Chris Rebert
5c7d339752 Revert "fix styling of alert-dismissable example" 
This reverts commit b3a23fa33a.
 2013-08-28 14:57:41 -07:00
Geremia Taglialatela
86632a242b Base the navbar default brand hover color on default brand color 
IMHO this default is better
 2013-08-28 18:18:44 +02: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
Hannu Hartikainen
a19ff2f50f Parameterize @breadcrumb-separator 2013-08-28 12:17:46 +03:00
Chris Rebert
901da1b2b4 use direct-child selector more in table styles to better support nested tables; fixes #10231 2013-08-27 17:13:34 -07:00
Chris Rebert
73f10843a4 components.html: fix grammar 2013-08-27 11:18:10 -07:00
Chris Rebert
b3a23fa33a fix styling of alert-dismissable example 2013-08-27 11:15:14 -07:00
Mark Otto
58408b0232 Fixes #10154: add .small 2013-08-27 09:21:09 -07:00
Mark Otto
32c03994ee Merge pull request #10222 from jodytate/upstream 
a few wording tweaks
 2013-08-27 09:15:30 -07:00
jody tate
1786aed71d a few wording tweaks 
- Changed some existential constructions (yes, they're really called
existential http://en.wikipedia.org/wiki/Existential_clause). These
aren't innately evil, but rewordings of existential clauses often sound
more direct.
- Changed a "which" to a "that."
 2013-08-27 09:11:33 -07: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
2f2ce15e58 Fixes #10082: document .navbar-form 
* Adds new section to navbar docs with example
* Updates example classes for all collapsing navbars so their numbers
increment as you scroll
 2013-08-27 08:34:17 -07:00
Mark Otto
19c0d2ad94 Merge pull request #10131 from andyen/master 
correct enable selector for button usage in docs
 2013-08-27 08:23:40 -07:00
Mark Otto
e4a2c35b84 Fixes #10088: Simpler nested headings section in accessibility docs 
* Headings, not headers
* Simplifies content compared to #10088 which adds quite a lot
* Uses proper heading elements (`h1` - `h6`) and not `header`
* Collects links at bottom instead of mid-paragraph
 2013-08-27 08:19:51 -07:00
Mark Otto
4b68858f90 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-27 08:05:54 -07:00
Mark Otto
1445e09b5f Fixes #9991: Better docs for tabbable tabs and fade classes 
* Adds full code snippets
* Adds snippet for `.fade`
* Adds callout for `.in` requirement on first fade-able tab
 2013-08-27 08:05:26 -07:00
Mark Otto
b2b91a0a34 Merge pull request #10215 from XhmikosR/master 
Various
 2013-08-27 07:58:49 -07:00
Mark Otto
e97b8be2c4 Merge pull request #10208 from javiereguiluz/patch-2 
[doc] tweaked the appearance of the last item of the file listings
 2013-08-27 07:50:23 -07:00