Mark Otto
e60c07327b
Merge branch 'reversefold-master' into 3.0.0-wip
...
Conflicts:
README.md
2013-04-20 12:13:05 -07:00
Mark Otto
ba7d928c37
Merge pull request #7645 from burnsra/3.0.0-wip-docs
...
Fix carousel examples within docs
2013-04-20 12:11:35 -07:00
Mark Otto
afdab35aca
Fixes #7640 : only reset margin on last-child p within blockquotes
2013-04-20 12:09:08 -07:00
Mark Otto
90b195872e
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-20 12:02:43 -07:00
Robert Burns
ce719925af
Fix carousel examples within docs
2013-04-20 13:26:18 -04:00
Artur Kwiatkowski
3861e3f5d5
replaced parametric .is() mixin with non-parametric .a() to simplify usage
2013-04-20 15:54:48 +02:00
Stephen Edgar
322fc9a6c4
Include .editorconfig
...
http://editorconfig.org/
2013-04-20 14:28:50 +10:00
Artur Kwiatkowski
39bb8146f8
more nested labels component
2013-04-19 21:31:55 +02:00
Mark Otto
61ea1ae909
Merge pull request #7598 from wangshishuo/3.0.0-wip
...
change nav's #tables-hover to #tables-hover-rows
2013-04-18 19:48:17 -07:00
Mark Otto
5c9bd1a221
Merge pull request #7608 from Fowowski/3.0.0-wip
...
more nested less rules - pager component
2013-04-18 19:47:26 -07:00
Mark Otto
f47aa08bad
Merge pull request #7629 from Boulox/dupe-table-rule
...
Remove dupe css rule of table element
2013-04-18 19:45:56 -07:00
Fabien
7b5fcc2c9a
Remove dupe css rule of table element
...
This are already declare in normalize
2013-04-19 02:48:08 +02:00
Mark Otto
a8391da414
Update mixins to remove Opera prefixes on gradients; reorder rules for consistency
2013-04-18 12:46:31 -07:00
Artur Kwiatkowski
4bd6abaff2
applied @pagination-bg for .disabled state instead of hardcoded color in hex
2013-04-17 19:47:23 +02:00
Artur Kwiatkowski
67a5d8ce74
more nested pager.less
2013-04-17 17:32:48 +02:00
wangshishuo
5892cea207
change nav's #tables-hover to #tables-hover-rows
2013-04-17 12:27:30 +08:00
Justin Patrin
496f1933bb
watchr should be lower-case
2013-04-16 13:07:05 -07:00
Mark Otto
da35a6b437
Merge pull request #7590 from Fowowski/3.0.0-wip
...
more nested less rules - navs component
2013-04-16 11:32:53 -07:00
Artur Kwiatkowski
dc97a1967b
more nested navs
2013-04-16 16:45:51 +02:00
Mark Otto
5b38a1a357
Merge branch 'bs3_homepage' into 3.0.0-wip
2013-04-15 00:16:40 -07:00
Mark Otto
5471ce8ea3
Fixes #5256 : Use > selector for better nesting of tables
2013-04-14 20:33:54 -07:00
Mark Otto
ab7070bb49
change var from @table-border to @table-border-color
2013-04-14 19:45:32 -07:00
Mark Otto
02eba5e5fc
center
2013-04-14 16:31:52 -07:00
Mark Otto
7dca242b5e
nuke all the assets
2013-04-14 15:33:48 -07:00
Mark Otto
8d9106f2c5
nuke hidden homepage content
2013-04-14 15:32:52 -07:00
Mark Otto
0b3e9ced54
Merge branch '3.0.0-wip' into bs3_homepage
2013-04-14 13:45:10 -07:00
Mark Otto
526534f337
more copy edits to sidenotes
2013-04-14 13:01:00 -07:00
Mark Otto
ccb6ac570f
lighter .highlight in sidenotes as well
2013-04-14 13:00:53 -07:00
Mark Otto
0a84a7c43d
shorter copy
2013-04-14 12:56:21 -07:00
Mark Otto
32761b3303
use spaces for indenting, not tabs /cc @juthilo
2013-04-14 12:54:56 -07:00
Mark Otto
f78945ccc9
More contrast with code snippets in sidenotes
2013-04-14 12:54:02 -07:00
Mark Otto
5f88887c7e
redo all the things
2013-04-14 12:49:35 -07:00
Julian Thilo
2b228bae60
More work on the sidenotes
...
* Convert more inline advices (compatibility, dependencies, ...) to
sidenotes
* Add sidenotes for:
** Note on plugin dependencies in general
** Required padding for navbar-fixed- (incl. code snippet)
* Fixed text for the small tag
2013-04-14 18:36:11 +02:00
Mark Otto
f226463b05
Restore on links in dropdowns as they are randomly breaking onto new lines
2013-04-13 23:54:51 -07:00
Mark Otto
86bb3b8126
IE8 doesn't need help with responsive images, they work just dandy apparently (see http://jsbin.com/idesit/1 )
2013-04-13 23:17:39 -07:00
Mark Otto
eefddb1eab
more indenting
2013-04-13 22:49:21 -07:00
Mark Otto
20259e2350
fixes #7191 and cleans up indenting some
2013-04-13 22:48:44 -07:00
Mark Otto
fc8b9fb07d
swap all bold p tags in sidenotes for h4s
2013-04-13 22:10:34 -07:00
Mark Otto
382a86f46e
Merge branch '3.0.0-docs1' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs1
2013-04-13 21:50:17 -07:00
Mark Otto
5fbe66307f
more specific comment, better placement of code
2013-04-13 21:45:21 -07:00
Julian Thilo
d7bc89b433
Sidenotes instead of alerts
...
* I propose: make the docs rely more heavily on the new design language,
replace alerts (not the .alert examples) by sidenotes.
* Remove alert-heading class, which no longer exists in CSS.
2013-04-14 04:04:01 +02:00
Paul Tyng
bec5679264
update docs bootstrap.css
2013-04-13 17:13:14 -03:00
Paul Tyng
811a79e16c
override normalize.css override
2013-04-13 16:46:17 -03:00
Mark Otto
ae98f1803f
add modal variables and tweak padding for min-height on modal title
2013-04-12 20:56:19 -07:00
Mark Otto
a96dd1bd28
Merge branch '3.0.0-wip' of https://github.com/garvincasimir/bootstrap into garvincasimir-3.0.0-wip
2013-04-12 20:45:10 -07:00
Mark Otto
96f332578c
ignore local ruby version files
2013-04-12 20:43:41 -07:00
Mark Otto
58c8c770d8
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-11 20:18:22 -07:00
Mark Otto
b3bb89520d
add comma; more accurate code snippet
2013-04-11 20:16:20 -07:00
Mark Otto
5b7596a5b3
Merge branch '3.0.0-wip' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-wip
2013-04-11 20:12:53 -07:00
Mark Otto
991a353a26
Merge pull request #7539 from lucaflisi/3.0.0-wip
...
Remove BOOTSTRAP_RESPONSIVE_LESS in css compile
2013-04-11 20:10:00 -07:00