2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Commit Graph

21773 Commits

Author SHA1 Message Date
Chris Rebert 1bcf9f126d Merge pull request #10011 from nschonni/patch-1
Update Grunt instruction links and wording
2013-08-21 15:42:58 -07:00
Mark Otto bc2e97756f Always wrap form examples in .bs-example; add some missing role='form' 2013-08-21 15:12:55 -07:00
Chris Rebert 31641d3d6d add David (david-dm.org) badge to monitor currentness of dependencies 2013-08-21 15:11:56 -07:00
Nick Schonning b32cfa2cf2 Update Grunt instruction links and wording 2013-08-21 18:11:33 -04:00
Mark Otto 6fc988613a Merge branch 'master' of github.com:twbs/bootstrap 2013-08-21 14:30:27 -07:00
Mark Otto aea1d8839f Merge pull request #10006 from jodytate/master
remove .btn-group
2013-08-21 14:25:49 -07:00
jody tate e4bf27b223 remove .btn-group
Removing this class--it's not used in the example and using it causes "bad things to happen." 

http://jsfiddle.net/josephtate/Jn6H4/
2013-08-21 13:31:17 -07:00
jody tate cb2e11ece4 remove .btn-group
The example doesn't use .btn-group and adding the class causes "bad things to happen," as the saying goes.

http://jsfiddle.net/josephtate/g6AWF
2013-08-21 13:06:46 -07:00
Chris Rebert 22ce649910 deprecate @screen-{phone,tablet,desktop} vars 2013-08-21 12:26:20 -07:00
Chris Rebert c429fd1a3c Merge pull request #9999 from sqrt4/fix-9974
Fixes #9974
2013-08-21 11:36:02 -07:00
James Lawrence 2cb1626907 Fixes #9974
Added th selector in .table-row-variant mixin
2013-08-21 17:56:36 +01:00
Chris Rebert fee05d1f3e Merge pull request #9987 from wangsai/fix-typo
change `else if` to `else`
2013-08-21 09:23:31 -07:00
jody tate 68b7998c05 removed extraneous space 2013-08-21 08:46:13 -07:00
jody tate 3d366038d7 removed reference to button color and gradient
Changed the wording to reflect the default button's new look since it's no longer grey and doesn't have a gradient. I'd say this new wording isn't ideal and needs something a bit more, well, descriptive.
2013-08-21 08:44:54 -07:00
Max F. Albrecht 27d92f45a5 code.less: also set default monospace font for <kbd> and <samp> 2013-08-21 14:08:43 +02:00
wangsai 004f2a2b2f change else if to else 2013-08-21 19:36:33 +08:00
Denis Gonchar 4284fc0a5e fix #9941 2013-08-21 15:57:48 +06:00
Chris Rebert e143c35472 Merge pull request #9973 from coliff/patch-6
Update justified-nav.css (Removed unnecessary ms-linear-gradient prefix)
2013-08-21 00:35:15 -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
Thomas Welton 56f1ff6ca7 Added fonts to "main" files
When using bower the "main" property is used to specify the files that should be consumed by applications including the package as a dependency.
Without including the fonts in this array the glyphicons do not work correctly as the relative font paths do not work after the "main" files are copied into my projects public dir using tools like https://github.com/yatskevich/grunt-bower-task

For now I have manually copied the fonts dir in the location needed for my project. But by accepting this pull request this will not be necessary for me or for other people that use bower.
2013-08-21 08:08:56 +01:00
Chris Rebert a3a02f9e6e rename @screen-XX to @screen-XX-min for clarity+unambiguity 2013-08-20 23:25:13 -07:00
Luke McDonald c8402e6e2a Remove progress bar striped @color parameters; use default transparent white.
* If the @color parameter is not removed, the stripes are the same color as the element background color. In this case, the stripes do not appear.
2013-08-20 22:46:01 -05:00
Luke McDonald e965ef0df3 Apply @color argument to striped gradient
The @color argument is currently not being used for the striped gradient.
2013-08-20 22:13:03 -05:00
Chris Rebert bbc32f7e79 add header font size vars to customizer page 2013-08-20 18:47:04 -07:00
Chris Rebert 631e200da3 regenerate customizer's raw-files.js 2013-08-20 18:46:20 -07:00
Chris Rebert 9a4fbde461 add variables for heading font sizes; fixes #9921 2013-08-20 17:49:23 -07:00
Chris Rebert 924e9e7450 update copyright year 2013-08-20 16:34:57 -07:00
Chris Rebert d666a89621 fix #9915 2013-08-20 16:21:18 -07:00
Chris Rebert 7c88db5c42 master branch is no longer stationary, so don't imply otherwise 2013-08-20 14:18:30 -07:00
Chris Rebert 295fef252e links to a release instead of master, so rephrase description accordingly 2013-08-20 14:16:31 -07:00
Chris Rebert 55088bbff8 point release download link to an actual release instead of master 2013-08-20 14:00:48 -07:00
Chris Rebert 63f8c8caab CONTRIBUTING: reflect move away from *-wip branch style of development
Per http://blog.getbootstrap.com/2012/12/10/bootstrap-3-plans/ :
> * Drop the `*-wip` branch style of development.
2013-08-20 13:45:52 -07:00
Chris Rebert 6735dc8c16 fix #9917 2013-08-20 13:36:22 -07:00
Chris Rebert d924bca6f6 fix #9924 2013-08-20 12:41:41 -07:00
Chris Rebert 0759dc4119 Merge pull request #9930 from tagliala/whitespaces-fix
Removed trailing whitespaces in responsive-utilities.less
2013-08-20 10:35:00 -07:00
Chris Rebert 94599259e1 Merge pull request #9918 from lamby/master
Correct "Aligninment" -> "Alignment" typo.
2013-08-20 09:36:00 -07:00
Rouven Weßling a9d1f901c5 Add role="toolbar" to elements with .btn-toolbar. 2013-08-20 15:07:43 +02:00
Geremia Taglialatela db7cce42f2 Removing whitespaces 2013-08-20 14:56:10 +02:00
Chris Lamb 3515964578 Correct "Aligninment" -> "Alignment" typo.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2013-08-20 11:18:23 +01:00
Mark Otto 0886fee103 quick fix for docs mention 2013-08-19 15:12:25 -07:00
Chris Rebert af75dca908 update grunt-html-validation output file ignores 2013-08-19 14:23:07 -07:00
fat e8a1df5f06 remove dumb validation reports v3.0.0 2013-08-19 14:18:20 -07:00
fat b6ddaf63d6 fix customizer 2013-08-19 14:16:52 -07:00
Mark Otto f95ab89fb1 really do the raw liquid tag 2013-08-19 13:58:29 -07:00
Mark Otto fadf016043 wrap generated customizer code in raw liquid tag for proper jekyll serve 2013-08-19 13:49:58 -07:00
Mark Otto 1a8f1e68ef fix broken panels in js example 2013-08-19 13:27:45 -07:00
Mark Otto ee5f030770 run grunt to generate customizer 2013-08-19 13:17:16 -07:00
Mark Otto 6248b71183 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-19 13:16:39 -07:00
Mark Otto 3f87bf46e4 fixes #9855: account for modal overflow on body hiding scrollbar 2013-08-19 13:16:32 -07:00
fat c2d5861232 update gruntfile not to run validation + remove validation status 2013-08-19 12:22:42 -07:00