0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

12868 Commits

Author SHA1 Message Date
Mark Otto
c8ab0a56c2 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-08-23 23:16:18 -07:00
Mark Otto
7d194a9bd3 wrap box-shadows in mixin in custom forms. fixes #17242 2015-08-23 23:13:14 -07:00
Mark Otto
e27e9d863b Merge pull request #17253 from wangsai/jekyll-redirect-from
Add jekyll-redirect-from plugin in Gemfile
2015-08-23 23:08:24 -07:00
Mark Otto
2dddf997a9 my bad, fix those values
/cc @cvrebert
2015-08-23 23:03:58 -07:00
Mark Otto
80435ee656 Merge pull request #17187 from kkirsche/patch-31
v4 - Document migration from panels to cards
2015-08-23 23:03:05 -07:00
Mark Otto
19deadda95 shorter 2015-08-23 23:00:47 -07:00
Mark Otto
02069152a2 Merge pull request #17147 from kkirsche/patch-14
v4 - Dropup caret direction incorrect
2015-08-23 22:59:43 -07:00
Chris Rebert
096ed52e06 Merge pull request #17255 from wangsai/translation-zh-new-url
New URL for Chinese translation of Bootstrap 4.x
2015-08-23 20:09:42 -07:00
wangsai
d72fdc8093 New URL for Chinese translation of Bootstrap 4.x :
http://v4.bootcss.com
2015-08-24 07:55:25 +08:00
wangsai
134c1ba467 Add jekyll-redirect-from plugin in Gemfile, ohterwise report ".../jekyll/plugin_mannager.rb:29:in require: cannot load such file -- jekyll-redirect-from (LoadError)" when jekyll build 2015-08-24 07:45:12 +08:00
Mark Otto
c37ae146d4 Merge pull request #17252 from zalog/patch-5
Apply !default to SCSS variables
2015-08-23 15:51:54 -07:00
Catalin Zalog
793db36640 Apply !default to SCSS variables
!default to all variables.
2015-08-24 01:44:16 +03:00
Mark Otto
e75504366d Merge pull request #17120 from kkirsche/patch-5
Add white background to cards by default
2015-08-23 14:44:53 -07:00
Kevin Kirsche
e707a45b1f v4 - Dropup caret direction incorrect
Fix #17144
2015-08-23 08:12:56 -04:00
Kevin Kirsche
44acff459b Add white background to cards
Fix #17117
2015-08-23 08:10:55 -04:00
Mark Otto
4b63173a41 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-08-23 01:12:12 -07:00
Mark Otto
e7ed4ff283 grunt 2015-08-23 01:12:06 -07:00
Mark Otto
a5bfbe0fca fix remaining scss lint errors 2015-08-23 01:12:00 -07:00
Mark Otto
6f8f4cc92c there is no standard appearance property 2015-08-23 01:03:51 -07:00
Mark Otto
3453f55ec5 grunt 2015-08-23 01:00:29 -07:00
Mark Otto
b2dccb15d7 fix majority of scss linter errors 2015-08-23 01:00:22 -07:00
Chris Rebert
fd72dfe6cf Rephrase/copyedit IE [hidden] compatibility docs
Fixes grammatical erratum from cf7819d8d5
2015-08-23 00:44:54 -07:00
Mark Otto
47d5168dc8 grunt 2015-08-23 00:28:58 -07:00
Mark Otto
27e4e97840 there is no navbar default for this 2015-08-23 00:28:02 -07:00
Mark Otto
95292fd0e7 grunt 2015-08-23 00:26:03 -07:00
Mark Otto
24fee99e0e remove another margin-top: 0 2015-08-23 00:25:58 -07:00
Mark Otto
683472d6e2 remove a margin-top: 0 reset since we nuke headings' top margins now in reboot 2015-08-23 00:24:59 -07:00
Mark Otto
d4e7252a83 grunt 2015-08-23 00:18:35 -07:00
Mark Otto
27f97e328b shorter clearfix 2015-08-23 00:18:28 -07:00
Mark Otto
b857ff45e5 slightly better dashboard example 2015-08-22 23:49:46 -07:00
Mark Otto
cf7819d8d5 mention the IE compatability for hidden attr per #17169 2015-08-22 23:17:46 -07:00
Mark Otto
db87ffb0db grunt 2015-08-22 21:46:49 -07:00
Mark Otto
54a5fbe0c1 fix #17149: correct syntax in list-group variant mixin; nullifies #17154 2015-08-22 21:46:46 -07:00
Mark Otto
018eef9894 Merge pull request #17140 from kkirsche/patch-12
v4 - Rendered example bin in grid docs should use sass
2015-08-22 20:28:01 -07:00
Heinrich Fenkart
44f2e73421 Docs: fix typo from 9c52e03 2015-08-23 04:56:09 +02:00
Mark Otto
f22b1b6736 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-08-22 19:12:51 -07:00
Mark Otto
0644ce3703 grunt 2015-08-22 19:12:40 -07:00
Mark Otto
b3c4ea52cd Merge pull request #17221 from maxbeatty/docs-preprocessor
Update Preprocessor section of homepage
2015-08-22 19:07:05 -07:00
Mark Otto
2638b10d28 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-08-22 19:06:03 -07:00
Mark Otto
1f153b640d re-fix #16154 in v4-dev /cc #17101 2015-08-22 19:05:43 -07:00
Mark Otto
421a1393bc grunt 2015-08-22 19:01:14 -07:00
Mark Otto
990d646bcd fix shadows on btns to use mixin 2015-08-22 19:01:11 -07:00
Mark Otto
5bb03b794d Merge pull request #17220 from cornedor/fix-17066
Removed mixin from focus outline box-shadow fixes #17066
2015-08-22 18:59:16 -07:00
Mark Otto
16075cc068 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-08-22 18:58:07 -07:00
Mark Otto
9c52e03d31 avoid mentioning css block level in cards docs /cc #17158 #17103 2015-08-22 18:58:02 -07:00
Mark Otto
818e1243cf add responsive typography note /cc #17095 2015-08-22 18:56:28 -07:00
Mark Otto
37c84f144b nuke that page since it's now unused 2015-08-22 18:51:06 -07:00
Mark Otto
d65486270c Merge pull request #17059 from kkirsche/patch-7
State Edge support instead of IE 11 as latest
2015-08-22 18:47:36 -07:00
Mark Otto
a93c42bbbe grunt 2015-08-22 18:36:48 -07:00
Mark Otto
1e7c42d2c0 fixes #17035 2015-08-22 18:36:43 -07:00