Mark Otto
89ccbdf8d1
Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 15:01:25 -08:00
Mark Otto
5f2d2893d2
Merge branch 'opera-radial' of https://github.com/jacobrask/bootstrap into jacobrask-opera-radial
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 14:59:42 -08:00
Mark Otto
8482cc4cb3
commit leftover from make
2012-02-19 14:55:07 -08:00
Mark Otto
adbbf17ee4
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 14:54:53 -08:00
Mark Otto
16d12396d0
simplify text color in navbar by placing the color on global .navbar component
2012-02-19 14:53:07 -08:00
Mark Otto
532242e626
Merge pull request #2089 from jacobrask/ie6hack
...
Remove IE6 hacks
2012-02-19 14:52:06 -08:00
Jacob Rask
e145619f6d
Remove underscore hack for IE6
...
IE6 does not seem to be supported by Bootstrap, and reducing the number
of unused and invalid properties is always nice.
2012-02-19 21:54:38 +01:00
Jacob Rask
82457603b6
Separate span12 and container classes
...
If you have less than 12 columns, container is too wide. Instead
generate container width using the @gridColumns variable.
Also remove duplicate container width property.
2012-02-19 21:49:17 +01:00
Jacob Rask
ad546c9631
Add Opera-prefixed radial gradient
...
Tested and works in Opera 11.61
2012-02-19 21:42:12 +01:00
Jacob Thornton
ac6e667ad9
Merge branch 'master' into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-18 23:31:37 -08:00
Jacob Thornton
3d58b46226
fix bootstrap-button toggle regression + tests
2012-02-18 23:29:58 -08:00
Mark Otto
1948e985a3
merge in and remake for responsive navbar dropdown fix
2012-02-18 20:09:34 -08:00
Mark Otto
ba97f56912
Merge branch 'tagliala-collapse-dropdown-fix' into 2.0.2-wip
2012-02-18 20:08:11 -08:00
Mark Otto
bbb2fb3395
fix right aligned dropdowns
2012-02-18 20:06:38 -08:00
Mark Otto
fed3b59e46
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
2012-02-18 15:31:44 -08:00
Mark Otto
dc4a864aaa
Merge pull request #2063 from DominikTo/master
...
fixed syntax error in sprites.less and typo in comments
2012-02-18 15:31:16 -08:00
Mark Otto
29e6ef7c70
clarify forms in navbar per #2072
2012-02-18 15:23:38 -08:00
Mark Otto
db940b3d8f
Merge pull request #2066 from artstorm/2.0.2-wip
...
Fixed compile problem with LESS 1.2.1.
2012-02-18 15:17:41 -08:00
Mark Otto
1a1816b5bd
clarify misc components subhead
2012-02-18 15:17:25 -08:00
Johan Steen
c900d72857
Fixed compile problem with LESS 1.2.1.
...
The sprite path variables introduced in v2.0.1 prevents bootstrap.less to
compile wiht LESS v1.2.1. Updated the variables to use the @{name}
construct when inserted in sprites.less, as outlined in the LESS
documentation. This change makes the CSS compile with LESS v1.2.1.
2012-02-18 14:28:44 +01:00
Geremia Taglialatela
2068b74ea8
Fixed a wrong behaviour when using collapse and dropdown in responsive layout
2012-02-18 13:08:49 +01:00
Dominik Tobschall
7609fd4dc6
fixed syntax error
2012-02-18 09:40:28 +01:00
Dominik Tobschall
f5bd4b3c8f
fixed typo (whitespace)
2012-02-18 09:40:18 +01:00
Mark Otto
b776cae902
add mention of js compilation to single file in customize page per #2003
2012-02-17 21:18:08 -08:00
Mark Otto
ec05ebc5ed
add small section to navbar docs on text in the component, per #2035
2012-02-17 20:53:12 -08:00
Mark Otto
1455bc9f8f
removing duplicate reset filter since we changed the main button to use buttonBackground mixin, per #2024
2012-02-17 20:47:02 -08:00
Mark Otto
b559f2b8d0
fix duplicate input prepend/append css selectors per #2026
2012-02-17 20:40:56 -08:00
Mark Otto
e7d45184f1
swap last .btn-dark reference
2012-02-17 20:25:49 -08:00
Mark Otto
5d02b8c3c6
fix grid typo in subnav
2012-02-17 14:41:41 -08:00
Mark Otto
7fa1578c49
fix page header example and docs per #2048
2012-02-17 14:39:30 -08:00
Jacob Thornton
7ec09d0db9
2.0.1
2012-02-16 22:42:38 -08:00
Jacob Thornton
03e6dc66c2
Merge branch '2.0.1-wip'
2012-02-16 22:41:02 -08:00
Mark Otto
091622644a
bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE
2012-02-16 22:34:30 -08:00
Mark Otto
6f6adfb52f
change clearfix mixin to drop parens that prevent it from being a class, too
2012-02-16 22:04:11 -08:00
Mark Otto
268e7d67ab
add mini buttons per #1971
2012-02-16 21:28:16 -08:00
Mark Otto
61e2201c64
fix buttons focus state and swap a buttons for button buttons
2012-02-16 21:25:40 -08:00
Mark Otto
489276f5be
fix responsive media queries to use 979 and 980 where appropro
2012-02-16 21:08:52 -08:00
Mark Otto
0369c1fcfc
add mention of navbar vertical divider in docs
2012-02-16 21:04:16 -08:00
Jacob Thornton
c3d3cf7262
add note about popover placement
2012-02-16 20:46:35 -08:00
Jacob Thornton
9d12b2d601
don't try next if not next
2012-02-16 20:43:57 -08:00
Jacob Thornton
b3e4e5ae22
add idea to modal markup exmaple
2012-02-16 20:33:15 -08:00
Jacob Thornton
1520ec446c
rebuild bro
2012-02-16 20:30:18 -08:00
Jacob Thornton
6da16a6def
fix dropdown links
2012-02-16 20:30:00 -08:00
Jacob Thornton
e730f8adb5
null out interval so that pause doesn't resume on next or prev
2012-02-16 20:22:01 -08:00
Jacob Thornton
f9b578260f
rebuild alerts
2012-02-16 20:05:09 -08:00
Jacob Thornton
792059b7ad
fix alerts
2012-02-16 20:04:26 -08:00
Jacob Thornton
a8c478e051
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-13 18:42:57 -08:00
Jacob Thornton
6e77c9d123
add semicolons to the end of js files
2012-02-13 18:41:02 -08:00
Jacob Thornton
9143d8e449
update irc spacing in readme
2012-02-13 18:11:41 -08:00
Jacob Thornton
28cfa8be03
add irc note
2012-02-13 18:10:36 -08:00