Commit Graph

6898 Commits

Author SHA1 Message Date
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
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
Mark Otto
22d308b2c1 Merge pull request #10724 from ZDroid/patch-1
white → #fff
2013-09-19 17:20:47 -07:00
Chris Rebert
607b802d2f fix #10732 2013-09-19 15:49:53 -07:00
Zlatan Vasović
73403b78cc white → #fff 2013-09-19 16:41:06 +02:00
Chris Rebert
abad169f4b Merge pull request #10710 from XhmikosR/patch-2
Patch 2
2013-09-18 23:44:56 -07:00
XhmikosR
0379c2056d Update jszip.js to the latest git. 2013-09-19 09:27:09 +03:00
XhmikosR
b741608964 Show minification report for uglify-js. 2013-09-19 08:33:52 +03:00
Chris Rebert
5deee652f9 Merge pull request #10703 from XhmikosR/sort
Sort by name.
2013-09-18 13:15:18 -07:00
XhmikosR
3c0489102e Sort by name. 2013-09-18 20:36:17 +03:00
Chris Rebert
68099ec275 Merge pull request #10682 from gordonwoodhull/master
Suggest documenting changes to plugin classes
2013-09-18 09:54:41 -07:00
Chris Rebert
1882d15db8 Merge pull request #10680 from XhmikosR/master
Update normalize to v2.1.3.
2013-09-18 09:38:14 -07:00
Gordon Woodhull
40d3e4c48b merge plugin changes into main table 2013-09-18 07:44:56 -04:00
XhmikosR
45b6c6de46 Run grunt dist. 2013-09-18 08:14:39 +03:00
XhmikosR
60afea85b4 less/mixins.less: tabs to spaces. 2013-09-18 08:14:19 +03:00
XhmikosR
0cd6d35058 Update normalize to v2.1.3. 2013-09-18 08:05:34 +03:00
Frederico Carvalho
29f24f746c corrected caret colour when a nav dropdown is open 2013-09-18 14:45:56 +10:00
Frederico Carvalho
b1208f380a fixed issue where caret wouldn't inherit "active" li style on nav-pills, which caused the caret to stay blue 2013-09-18 14:31:52 +10:00
Chris Rebert
0de96b8f35 include a copy of the CC-BY 3.0 License that the docs are under
downloaded from http://creativecommons.org/licenses/by/3.0/legalcode.txt
2013-09-17 18:58:15 -07:00
Chris Rebert
4e962c572e fix #10692 2013-09-17 17:41:58 -07:00