Mark Otto
caa5b4b718
Merge pull request #8624 from jholl/patch-2
...
Update typo css.html move double class .form-control from label in examp...
2013-07-26 10:31:20 -07:00
Mark Otto
099e970953
Merge pull request #8625 from liuyl/fixbtnbg
...
Fix #8623
2013-07-26 10:30:41 -07:00
Chris Rebert
2d91e91b85
Merge pull request #8626 from cowboy/3.0.0-wip
...
It's Grunt, not GruntJS :)
2013-07-26 09:17:59 -07:00
Ben Alman
102fad4ebd
It's Grunt, not GruntJS :)
2013-07-26 12:00:45 -04:00
Yulong Liu
e4300fa1bf
fix background of btn-link
2013-07-26 22:27:55 +08:00
Yulong Liu
a2f120a7aa
remove background:none
2013-07-26 21:59:50 +08:00
James Holland
0e7aad8b8d
Update typo css.html move double class .form-control from label in example mark up to input
...
missed the double class in label in recent commit #8621
2013-07-26 09:43:05 -04:00
James Holland
2e7593a40d
Update forms.less to remove .form-horizontal .row + .row
...
use .form-group to apply consistent vertical spacing on form rows
2013-07-26 09:04:39 -04:00
James Holland
6115f01adb
Update css.html in .form-horizontal
...
to use .row.form-group for horizontal spacing instead of .form-horizontal .row + .row
2013-07-26 08:58:47 -04:00
syed
1b8ba0d159
move things around :)
...
Moved pager, pagination, popovers, tooltip, progress bars & type
properties to variables.less
2013-07-26 17:04:15 +05:00
James Holland
f7a376569a
align dropdown menu with .pull-right for .input-group-btn when btn on right of input
2013-07-26 07:52:40 -04:00
Jordan Hess
cd23ae00dd
Added windows hint to jekyll documentation instructions.
2013-07-26 03:25:12 -06:00
Jordan Hess
fe095d17a2
Changed old reference to "grunt bootstrap" to "grunt dist"
2013-07-26 03:16:27 -06:00
Mark Otto
2a51ebf671
readme /cc @zdroid
2013-07-26 01:46:30 -07:00
Mark Otto
5b2b46fe28
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 01:43:53 -07:00
Mark Otto
5d766d9e2f
Mo betta placement of old docs callouts
2013-07-26 01:43:43 -07:00
Chris Rebert
2910e3cb5a
Merge pull request #8614 from cvrebert/grunt
...
Switch from `make` to `grunt`
Rebase of #7786 against soon-to-be 3.0.0-rc.1
2013-07-26 01:34:58 -07:00
Chris Rebert
2d58534519
Merge pull request #8616 from caouecs/patch-1
...
Small typo in less/mixins.less
2013-07-26 01:20:10 -07:00
Chris Rebert
a317f67c1c
re-integrate #8560 using @fat's code from the comment on #8614
2013-07-26 01:15:41 -07:00
Fred Delrieu
06980ae5a1
Small typo
2013-07-26 10:10:35 +02:00
Chris Rebert
292d8d6819
specify explicit ordering for grunt concat step
2013-07-26 01:07:56 -07:00
John-Philip Johansson
0d33455ef4
Replace Makefile with GruntJS
...
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess
Rebased by @cvrebert
2013-07-26 00:39:14 -07:00
fat
995add132e
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 00:22:48 -07:00
fat
91b6a43ed9
fix makefile error thing
2013-07-26 00:22:20 -07:00
Mark Otto
210ee63693
Fixes #8586 : add addional color text classes to apply all of branch colors easily
2013-07-26 00:18:18 -07:00
Mark Otto
d604052aa5
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 00:04:24 -07:00
Mark Otto
c23ba4d50b
Fuck a color purple
2013-07-26 00:04:15 -07:00
Mark Otto
b4f023f809
Make it so back to top link ain't broked no mo
2013-07-26 00:02:20 -07:00
fat
5588e14867
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-25 23:57:37 -07:00
fat
778f3a3df7
update docs a bit more for affix
2013-07-25 23:57:21 -07:00
fat
7ae8db8b7e
update the affix docs a bit
2013-07-25 23:53:34 -07:00
Mark Otto
1659ac6473
Fix up navbar forms
2013-07-25 23:32:12 -07:00
fat
f58827f24d
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-25 23:30:29 -07:00
fat
f5f04ae4a0
fix affix…
2013-07-25 23:30:13 -07:00
Mark Otto
ed4674a09a
Disable the customizer for rc1 for now
2013-07-25 23:29:43 -07:00
Mark Otto
8a7553aeda
Bump version of old docs in callout
2013-07-25 21:52:21 -07:00
Mark Otto
94202b2b29
Update docs to better indicate v3 RC1
2013-07-25 21:51:45 -07:00
Mark Otto
f79740b48a
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-25 21:49:50 -07:00
fat
124d7e6279
fixes #8560
2013-07-25 21:49:19 -07:00
fat
0190128ebc
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-25 21:34:02 -07:00
fat
15d9c82fc5
fix collapse event #8596
2013-07-25 21:33:26 -07:00
Jacob
f1ddf7681c
Merge pull request #8419 from hollensteiner/3.0.0-wip
...
Replace position() with offset() in scrollspy.js
2013-07-25 21:19:57 -07:00
Mark Otto
56404bc89b
Add .panel-title to panel component to mirror modals
...
/cc @leeaston
2013-07-25 21:16:43 -07:00
Mark Otto
ac4e7db17f
single include for old ads callout
2013-07-25 20:56:44 -07:00
Mark Otto
2a4a6fe0f0
Merge pull request #8611 from twitter/bs3_form_classes
...
Updated BS3 form classes
2013-07-25 20:31:11 -07:00
Mark Otto
35aad07456
Add comment about opacity mixin not being used
2013-07-25 19:56:04 -07:00
Mark Otto
27cedf71d5
Update form validation states
...
* Once again no longer applies to single inputs (this is a bit simpler,
but I'm open to new ideas) but the entire set of inputs, labels, and
help text within a particular element. However, the styles are not too
dependent on markup or layout, so they're super flexible.
* Simplified the markup in the validation docs examples to match latest
changes.
* Renamed `.form-state-validation` mixin to `.form-control-validation`
to match naming of prev commit.
2013-07-25 19:45:14 -07:00
Mark Otto
71d3d2c3f6
Spacing
2013-07-25 18:55:00 -07:00
Mark Otto
13bc74b636
Refactor forms styles
...
* Reorganize forms.less
* Change from attribute selectors to `.form-control`. Few lines, less
specific (meaning easier overrides as `element[type=""]` is more
specific than a class), less intrusive, and more performant.
* Add `.form-group` for basic spacing in vertical forms.
* Remove (unnecessary?) `margin: 0;` from `form` element (as far as I
can tell no browser sets that anyway).
2013-07-25 18:29:51 -07:00
Mark Otto
d242d536c4
Merge pull request #8603 from cvrebert/twbs
...
twbs ALL the links
2013-07-25 13:42:51 -07:00
