0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Commit Graph

8599 Commits

Author SHA1 Message Date
Mark Otto
026e2f8d30 Grunt after merging #12863 2014-03-04 14:24:09 -08:00
Mark Otto
56c6525f23 Merge pull request #12863 from Sojaner/master
Fix for issue #12854 on push and pull resets
2014-03-04 14:21:28 -08:00
Mark Otto
8f2a787c36 grunt 2014-03-04 14:20:48 -08:00
Mark Otto
7733f24373 Fixes #12868: Enables icon feedback on validation states for large/small inputs.
Also reorders the CSS to place Glyhpicons as a dependency before other components for fewer overrides and less specific CSS.
2014-03-04 14:12:57 -08:00
Mark Otto
1c66f30b6a Fixes #12913: Remove scoped media queries from custom xs grid mixins 2014-03-04 13:54:56 -08:00
Mark Otto
f45df64670 Fixes #12914: Darken immediate children hr elements in jumbotrons 2014-03-04 13:54:09 -08:00
Mark Otto
64579505d2 Fixes #12916: Don't let .lead resize on viewport change 2014-03-04 13:52:13 -08:00
Mark Otto
5193f9f607 add svg logos to brand guidelines 2014-03-04 13:32:02 -08:00
Mark Otto
caf332080e Merge pull request #12897 from avindra/patch-1
Fix for stray 1px line under top navigation in Dashboard example
2014-03-04 11:35:32 -08:00
Mark Otto
0e6db62082 Merge pull request #12840 from twbs/rtl_via_css_flip
Add RTL via CSS Flip
2014-03-04 11:32:40 -08:00
Mark Otto
d6e07f045c Merge branch 'master' into rtl_via_css_flip
Conflicts:
	docs/assets/js/raw-files.min.js
2014-03-04 00:41:57 -08:00
Mark Otto
1399497a02 grunt 2014-03-04 00:30:40 -08:00
Mark Otto
0c269c9639 Merge pull request #12745 from ronnyhaase/panel-vars
Defined and use variables for .panel-heading & .panel-footer padding
2014-03-04 00:27:08 -08:00
Mark Otto
477dc99ffa fix nav 2014-03-03 23:50:28 -08:00
Mark Otto
559b90f944 Rename RTL files and add some basic docs 2014-03-03 23:50:04 -08:00
Mark Otto
587814f16e Simplify gruntfile more to remove theme RTL 2014-03-03 22:49:43 -08:00
Mark Otto
7e764a29fa grunt 2014-03-03 21:56:40 -08:00
Mark Otto
4dd7b4bd87 Don't RTL the theme file--no need 2014-03-03 21:54:07 -08:00
Mark Otto
af39290a9d Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip
Conflicts:
	Gruntfile.js
	package.json
	test-infra/npm-shrinkwrap.canonical.json
2014-03-03 21:52:56 -08:00
Mark Otto
2ece8dd336 Merge branch 'master' into rtl_via_css_flip 2014-03-03 21:50:03 -08:00
Mark Otto
e381635b1f Fixes #12593: Add support for table bodies and table rows to the collapse plugin 2014-03-03 21:39:53 -08:00
Mark Otto
cb3cc42315 Merge pull request #12904 from twbs/keywords
add (more) keywords to package definition files
2014-03-03 21:27:20 -08:00
Mark Otto
32f7901f99 Merge pull request #12905 from twbs/buttons-migration
add data-toggle button.js change to migration docs
2014-03-03 19:41:02 -08:00
Chris Rebert
bd37ea3076 add data-toggle button.js change to migration docs 2014-03-03 14:42:39 -08:00
Chris Rebert
6f1cc694fe add more keywords to package.json & composer.json 2014-03-03 14:22:19 -08:00
Chris Rebert
cddf14b32d add 'keywords' field to bower.json 2014-03-03 14:21:46 -08:00
Mark Otto
1c3a3b7593 Match docs description 2014-03-03 14:18:22 -08:00
Mark Otto
745111ba52 Match docs for description 2014-03-03 14:18:03 -08:00
avindra
80ce694b24 Fix for stray 1px line under top navigation
If you add an "active" class to one of the <li> elements in the top navigation, and style it so that active tabs have a different color, it becomes clear that there is a 1 pixel stray line under the navigation. This style fixes that.
2014-03-02 16:19:44 -05:00
XhmikosR
cd134f1ed6 Merge pull request #12864 from twbs/csslint-fix
Csslint fix
2014-03-02 09:50:21 +02:00
XhmikosR
cd65e512a2 Update dependencies. 2014-03-02 09:27:01 +02:00
XhmikosR
106af45831 Merge pull request #12875 from twbs/less.js
Update Less.js
2014-03-02 09:10:21 +02:00
Chris Rebert
d0bf4f4b63 Merge pull request #12890 from ZDroid/bower-json-keywords
Add bower.json keywords
2014-03-01 12:44:41 -08:00
Zlatan Vasović
db4b7553f0 Add bower.json keywords 2014-03-01 21:42:31 +01:00
Chris Rebert
e7aa911f9b Merge pull request #12889 from ZDroid/composer-json-keywor
Remove "bootstrap" keyword from composer.json
2014-03-01 12:32:05 -08:00
Zlatan Vasović
6f09a8883c Remove "bootstrap" keyword 2014-03-01 21:27:07 +01:00
XhmikosR
e5affbfa0a Run grunt. 2014-03-01 20:58:53 +02:00
XhmikosR
256baf8026 Update grunt-contib-less. 2014-03-01 20:58:26 +02:00
XhmikosR
dfb4917493 Update less.js to v1.7.0. 2014-03-01 20:14:49 +02:00
Chris Rebert
b3e3025f8f Merge pull request #12880 from hnrch02/patch-1
Fix small typo in JavaScript docs
2014-02-28 11:42:11 -08:00
Heinrich Fenkart
7d1fd44b9a Fix small typo in JavaScript docs 2014-02-28 20:11:02 +01:00
XhmikosR
299f985e5d Gruntfile.js: Remove extra comma. 2014-02-28 17:29:36 +02:00
Mark Otto
6bd54ef14b 100% less tumah 2014-02-27 12:17:08 -08:00
Mark Otto
ce4175b65e Merge pull request #12855 from lipis/patch-1
Added the very useful .animation-fill-mode() mixin
2014-02-27 12:12:44 -08:00
Mark Otto
7aa813db5d Merge pull request #12866 from twbs/sitemap
Add sitemap.xml and robots.txt files.
2014-02-27 11:13:18 -08:00
Mark Otto
2e02ed4e0c Fixes #12851: it's not a tumah 2014-02-27 11:08:24 -08:00
XhmikosR
17722e5ef2 Add sitemap.xml and robots.txt files. 2014-02-27 17:05:52 +02:00
XhmikosR
a7339a0f4c Move csslint overrides in Gruntfile.js.
This works around https://github.com/gruntjs/grunt-contrib-csslint/issues/26
2014-02-27 11:39:30 +02:00
XhmikosR
ef49635ae2 Fix csslint errors. 2014-02-27 11:15:53 +02:00
XhmikosR
05ccc185d9 Break csslint targets. 2014-02-27 11:15:32 +02:00