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

5076 Commits

Author SHA1 Message Date
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
Chris Rebert
90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00
Mark Otto
bc93a429a8 update docs to use buttons for tooltips 2013-07-25 11:55:12 -07:00
Mark Otto
c7995cf964 move some thing around 2013-07-25 10:50:59 -07:00
Mark Otto
0d2d65c8f1 run make on prev commits 2013-07-25 10:12:51 -07:00
Mark Otto
f94d9ce096 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into 3.0.0-wip 2013-07-25 10:11:30 -07:00
Mark Otto
768e7edabf fixes #8571 completely: add better th support for table classes 2013-07-25 10:01:42 -07:00
Mark Otto
d4cd7efce6 make on prev commits 2013-07-25 09:58:28 -07:00
Mark Otto
4d42100a3e Merge branch '3.0.0-wip' of https://github.com/tagliala/bootstrap into tagliala-3.0.0-wip 2013-07-25 09:57:49 -07:00
Mark Otto
f3aaba0be2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 09:57:40 -07:00
Mark Otto
72237acf52 fix #8584: add readme callout for npm and node 2013-07-25 09:57:33 -07:00
Geremia Taglialatela
0017f7fca4 Navbar toggle is not vertically aligned (3.0.0-wip) with custom navbar height
When using navbar heights higher that default, the navbar-toggle button is not centered.

Fiddle demonstrating this issue (compiled with `@navbar-height: 60px;`): http://jsfiddle.net/tagliala/mRVMe/2/


Another fiddle with the proposed fix: http://jsfiddle.net/tagliala/mRVMe/3/
2013-07-25 17:09:12 +02:00
syed
a06afd8320 Moved navs inline properties to variables.less and customize.html & nav-customize.html 2013-07-25 12:43:14 +05:00
syed
f8d5a974bc Moving navbar inline properties to variables.less and customize.html 2013-07-25 11:58:25 +05:00
Jacob Thornton
e9c83647af fixes #8568 -- account for margins in offset 2013-07-24 20:57:26 -07:00
Jacob Thornton
aad910465c fixes #8569 2013-07-24 20:21:23 -07:00
Jacob Thornton
a282dba58f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-24 20:10:51 -07:00
Jacob Thornton
eaefed517a fixes #8399 w/ tests 2013-07-24 20:10:16 -07:00
Mark Otto
1f40da9676 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-24 16:53:34 -07:00
Mark Otto
51de38e5b9 make again 2013-07-24 16:52:47 -07:00
Mark Otto
61ac20ebb5 Merge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap into salman-javed-confiz-3.0.0-wip 2013-07-24 16:42:13 -07:00
Mark Otto
a36f444c25 Merge pull request #8583 from liuyl/disabled
set cursor to not-allowed for disabled elements
2013-07-24 16:32:25 -07:00
Mark Otto
3080104642 make footer border color use header border color in modals 2013-07-24 16:31:17 -07:00
Mark Otto
c63489def3 run make on prev commits 2013-07-24 16:28:34 -07:00
syed
2e6fcefc5c Moved modals inline properties to variables.less
In this commit I moved modals.less inline properties to variables.less
and also added those variables to customize.html.
2013-07-24 18:43:21 +05:00
liuyl
7e9532dabe set cursor to not-allowed for disabled elements 2013-07-24 17:10:27 +08:00
Salman Javed
0caab585f5 issues fixed for nav-justified on pills on android default browser. 2013-07-24 13:39:16 +05:00
Jacob Thornton
930c75e5dd Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 23:51:18 -07:00
Jacob Thornton
217eb988b8 add placement auto for tooltips + tests… kinda sad about this doe 2013-07-23 23:50:23 -07:00
Mark Otto
8540515eeb Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 23:48:32 -07:00
Mark Otto
18157e9f39 Run make on prev commits 2013-07-23 23:48:17 -07:00
Mark Otto
9029b4c06c Update forms vars
* Reorganize layout
* Add input group var
* Add legend border var
2013-07-23 23:25:46 -07:00
Mark Otto
a049cdd46e Reorganize dropdown vars section 2013-07-23 23:22:13 -07:00
Mark Otto
398038c798 Update dropdown vars
* Update `.nav-divider` mixin to simplify to a 1px line (one value
instead of two in parametric mixin)
* Rename and consolidate dropdown caret vars
* Add vars to Customizer
2013-07-23 23:18:53 -07:00
Mark Otto
cdf6019e11 Update code vars
* Drop the `rgba()` border and fallback because fuck that noise
* Add vars to customizer
* Remove rogue `:`
2013-07-23 23:13:15 -07:00
Mark Otto
ba954db159 Update close vars
* Remove dupe hover color var (again, it's not necessary to have it's
own var here since we're controlling it via `opacity`)
* Add to customizer
2013-07-23 23:09:06 -07:00
Mark Otto
a5cc1300f6 Update carousel vars
* Remove `@carousel-control-hover-color` since that's just the same as
the default control color and all we change is `opacity` (it's required
for specificity).
* Add vars to customizer
* Update customizer nav to include new section
* Remove the `li` from the var names
* Consolidate and simplify `text-shadow` vars
2013-07-23 23:03:57 -07:00