rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Code Issues Actions Packages Releases Activity
7,382 Commits 108 Branches 89 Tags 547 MiB
107b334d34
Commit Graph

7382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Kalicki
e21c744a57 Added abridged form of 'What's included' docs to README 2013-09-29 18:17:46 -04:00
Dean Taylor
429e92fd58 Update Gruntfile.js fixing undefined jQuery check 
The check to see if jQuery was defined as incorrect causing the "Bootstrap requires jQuery" message to only be displayed if jQuery is defined and has a value which equates to `false`.
 2013-09-29 21:14:24 +01:00
Alex Kalicki
e34e73714a Better documentation and optimized examples for grid classes 2013-09-28 22:51:30 -04:00
Chris Rebert
1809894e8a Merge pull request #10855 from dan-silver/master 
Spelling mistakes in documentation.
 2013-09-28 14:42:59 -07:00
Dan Silver
708dbe58f6 Spelling mistakes in documentation. 2013-09-28 16:21:23 -05:00
Chris Rebert
fc2cde0230 Merge pull request #10841 from DeanMarkTaylor/patch-1 
Update Gruntfile.js removing pointless reading of customize.html.
 2013-09-27 10:23:28 -07:00
Dean Taylor
f39db19306 Update Gruntfile.js removing pointless reading of customize.html. 
I couldn't see a reason to read "customize.html", removed line.
 2013-09-27 18:17:02 +01:00
Rodrigo Willrich
f32abbb6e1 bower.json: Modify assets directory on ignore to docs-assets 2013-09-27 09:04:33 -03:00
Chris Rebert
eb3807609a Merge pull request #10827 from akalicki/issue_10726 
Resolves #10726 - clarifies javascript tab markup in docs
 2013-09-26 15:04:23 -07:00
Alex Kalicki
5d6e1d742d Resolves #10726 - clarifies javascript tab markup in docs 2013-09-26 17:49:03 -04:00
Chris Rebert
1cf8fcda65 add iOS and versions to Safari percent rounding warning; fixes #10723 2013-09-25 17:25:50 -07:00
Mark Otto
1a476b623e don't include . in link 2013-09-24 21:27:49 -05:00
Mark Otto
827fbc0a11 Merge pull request #10797 from twbs/input-groups-xref 
add cross-reference to Input Groups in CSS Form docs; fixes #10792
 2013-09-24 19:26:58 -07:00
Chris Rebert
2fa03734a3 add cross-reference to Input Groups in CSS Form docs; fixes #10792 2013-09-24 18:48:38 -07:00
Mark Otto
76e9d393ba Merge pull request #10796 from twbs/skip-to-main-content 
Use "Skip to main content" phrasing consistently; further #10786 fixes
 2013-09-24 18:37:13 -07:00
Chris Rebert
af4d102767 Use "Skip to main content" phrasing consistently; further #10786 fixes 2013-09-24 18:02:18 -07:00
Mark Otto
63206a17e8 Merge pull request #10786 from acspike/skip-nav-link-wording 
Alter wording of example Skip Nav link to improve pronunciation
 2013-09-24 17:24:00 -07:00
Mark Otto
cf915f9c64 Merge pull request #10790 from twbs/disable-compatibility-mode 
Disable IE Compatibility Mode in docs, examples
 2013-09-24 17:16:06 -07:00
Julian Thilo
735105ae72 Add note about IE mode tag being included in docs 2013-09-24 22:49:47 +02:00
Chris Rebert
f19126ed08 Merge pull request #10778 from twbs/old-android-glyphicons-fix 
Use updated Glyphicons to workaround old Android WebKit bug
 2013-09-24 10:39:03 -07:00
Aaron Spike
dcfd9f27ff Alter wording of example Skip Nav link to improve pronunciation 
Screen reading applications, including Apple's VoiceOver, improperly pronounce the word "content" in "Skip to content" as an adjective rather than a noun because of insufficient context. "Skip to main content" is pronounced correctly. 

See #6 and Guideline #10 at the following site for more information:
http://redish.net/content/papers/interactions.htmlAlter wording of example Skip Nav link to improve pronunciation
 2013-09-24 11:52:06 -05:00
Julian Thilo
33e0877d21 Disable IE Compatibility Mode in docs, examples 
...because we don't support it and it may cause problems for people
trying to view the docs in IE.
 2013-09-24 18:43:16 +02:00
Ross Allen
3663e37005 Use bootstrap.less file order in Customizer 
Appending stylesheets by iterating the `__less` Hash creates an order
that is not the same as 'bootstrap.less'.

Some stylesheets like 'component-animations.less' and 'modals.less' have
selectors with matching specificity, and so file order decides which
style wins. This causes issue #10030 by putting `.fade.in` after
`.modal-backdrop.in` and gives the backdrop a higher opacity than
intended.

This change uses the Less ordering in 'bootstrap.less' to generate the
final stylesheets in the Customizer to make sure customized file
ordering matches the distribution file order.

Fixes #10030
 2013-09-23 23:33:20 -07:00
Chris Rebert
48f15faa5d run grunt dist 2013-09-23 22:43:48 -07:00
Chris Rebert
2d0f5565ab re-sort affected .glyphicon-* classes by new codepoints 2013-09-23 22:43:48 -07:00
Chris Rebert
b160e61451 Update affected .glyphicon-* CSS classes to use new codepoints 
.glyphicon-briefcase: U+1F4BC -> U+E139
.glyphicon-calendar:  U+1F4C5 -> U+E109
.glyphicon-pushpin:   U+1F4CC -> U+E146
.glyphicon-paperclip: U+1F4CE -> U+E142
.glyphicon-camera:    U+1F4F7 -> U+E046
.glyphicon-lock:      U+1F512 -> U+E033
.glyphicon-bell:      U+1F514 -> U+E123
.glyphicon-bookmark:  U+1F516 -> U+E044
.glyphicon-fire:      U+1F525 -> U+E104
.glyphicon-wrench:    U+1F527 -> U+E136
 2013-09-23 22:43:48 -07:00
Chris Rebert
dca7be6b67 Update Glyphicons font to resolve #10106 
Workaround an old Android WebKit bug by switching to codepoints within the BMP.
Details: http://stackoverflow.com/questions/9241519/webkit-css-content-unicode-bug
Extra special thanks to @jankovarik for doing this update. <3
Source: https://www.dropbox.com/s/clh9y6lqtmj01l8/halflings_updated_for_android.zip
(As posted in https://github.com/twbs/bootstrap/issues/10106#issuecomment-24539909 )
 2013-09-23 22:41:43 -07:00
Chris Rebert
b80f58b336 run grunt dist 2013-09-23 22:34:36 -07:00
Mark Otto
9ce142ca12 Merge pull request #10768 from twbs/polaroid-thumbnail-docs 
fix #10767; current .img-thumbnail is equivalent to old .img-polaroid
 2013-09-23 19:10:38 -07:00
Mark Otto
62c9199dc5 Merge pull request #10770 from twbs/rename-assets 
move /assets/ to /docs-assets/ ; fixes #10715
 2013-09-23 19:08:50 -07:00
Mark Otto
5911d95d69 Merge pull request #10769 from twbs/deprecate-hide 
deprecate .hide; fixes #10446
 2013-09-23 19:08:01 -07:00
Chris Rebert
f503efc490 avoid using the term "assets" due to potential confusion 2013-09-23 13:02:33 -07:00
Chris Rebert
8aa5181126 move /assets/ to /docs-assets/ ; fixes #10715 2013-09-23 13:02:26 -07:00
Chris Rebert
c4e7e3c933 deprecate .hide; fixes #10446 2013-09-23 12:46:57 -07:00
Chris Rebert
29935e4e26 fix #10767; current .img-thumbnail is equivalent to old .img-polaroid 2013-09-23 12:06:33 -07:00
Chris Rebert
229469e059 Merge pull request #10763 from XhmikosR/html5shiv 
Update html5shiv to v3.7.0.
 2013-09-23 09:03:16 -07:00
XhmikosR
d675e82e50 Update html5shiv to v3.7.0. 2013-09-23 16:51:49 +03:00
Mark Otto
8a181a1388 Merge pull request #10695 from FredericoC/fix-nav-active-caret 
Fixed issue where caret wouldn't inherit "active" li style on nav-pills
 2013-09-22 16:53:01 -07:00
Mark Otto
5b12736fb7 Merge pull request #10741 from ZDroid/patch-1 
Avoid LESS nesting if isn't needed
 2013-09-22 07:25:33 -07:00
Mark Otto
ed44a3255c Merge branch 'master' of github.com:twbs/bootstrap 2013-09-22 09:20:15 -05:00
Mark Otto
000b445a04 Fixes #10755: Don't remove quotes around q element by default 2013-09-22 09:19:37 -05:00
Chris Rebert
88854a83d1 Merge pull request #10749 from ZDroid/patch-2 
@headingsColor → @headings-color
 2013-09-21 14:19:21 -07:00
Zlatan Vasović
dc3d16648c @headingsColor → @headings-color 2013-09-21 14:19:11 +02:00
Mark Otto
86ec05793a Merge pull request #10693 from twbs/include-docs-license 
include a copy of the CC-BY 3.0 License that the docs are under
 2013-09-20 22:14:57 -07:00
Chris Rebert
68c6deebda fix #10737 2013-09-20 11:49:32 -07:00
Chris Rebert
d8ba5989cd Merge pull request #10743 from hnrch02/patch-1 
Fix a silly typo
 2013-09-20 10:49:13 -07:00
Heinrich Fenkart
c938c4438f Fix a silly typo 2013-09-20 19:43:47 +02:00
Zlatan Vasović
2304ba6a25 Avoid LESS nesting if isn't needed 2013-09-20 18:06:48 +02:00
Mark Otto
e148923f27 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-19 22:57:11 -05:00
Mark Otto
ef636bd62d Fixes #10694: Remove unnecessary content property from .caret 2013-09-19 22:56:17 -05:00