rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity
5,045 Commits 108 Branches 89 Tags 547 MiB
72237acf52
Commit Graph

5045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
72237acf52 fix #8584: add readme callout for npm and node 2013-07-25 09:57:33 -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
Jacob Thornton
3cfa1c8a30 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	dist/js/bootstrap.min.js
 2013-07-23 22:59:33 -07:00
Jacob Thornton
6841c50968 fixes #7814 2013-07-23 22:59:09 -07:00
Mark Otto
b0dd2f902d Update and add @btn-hover-color to Customize page 2013-07-23 22:53:30 -07:00
Mark Otto
1803b2f09e Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-23 22:49:13 -07:00
Mark Otto
1d1bd62598 Fixes #8571: allow table classes in thead and tfoot 2013-07-23 22:27:49 -07:00
Mark Otto
a346ea2a1a make on prev commit 2013-07-23 21:23:13 -07:00
Mark Otto
2447f03758 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 21:22:52 -07:00
Jacob Thornton
faba6808b7 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 20:53:32 -07:00
Jacob Thornton
72d2661ff0 fixes #8232 2013-07-23 20:53:12 -07:00
Mark Otto
00976ff09a Merge pull request #8576 from sfaxon/3.0.0-wip 
update carousel js docs to reflect leading .glyphicon
 2013-07-23 20:17:40 -07:00
Mark Otto
ced204c774 Clear up license FAQs by using "Bootstrap" as noun instead of "Twitter open source software" 2013-07-23 20:16:02 -07:00
Mark Otto
984a0d1c78 Update link to blog 2013-07-23 19:52:44 -07:00
Seth Faxon
13f2a68a23 update carousel js docs to reflect leading .glyphicon 
https://github.com/twitter/bootstrap/pull/6342 icons section
  mentions the change to using glyphicon base class
  this adds it to the docs
 2013-07-23 19:38:23 -07:00
Jacob Thornton
faa00629c4 add additional carousel test 2013-07-23 18:56:00 -07:00
Jacob Thornton
68e87183a0 fixes #8134 2013-07-23 18:54:00 -07:00
Jacob Thornton
f1009c19b3 revert collapse change + add emulateTransitionEvent to catch dead css transitions 2013-07-23 18:44:08 -07:00
Jacob Thornton
43e5e90a6d shown.bs.modal fix 2013-07-23 17:32:20 -07:00
Jacob Thornton
7b12a0dcbc fixes #7970 2013-07-23 17:23:02 -07:00
Mark Otto
e87508854e Merge pull request #8572 from mohnish/patch-1 
Use input type `password` for the password field in the CSS documentatio...
 2013-07-23 14:23:17 -07:00
Mark Otto
29b4caf1d5 Merge pull request #8573 from cvrebert/patch-2 
getting-started.html: add <code> around mention of `placeholder`
 2013-07-23 14:22:59 -07:00
Chris Rebert
d8583a1064 getting-started.html: add <code> around mention of placeholder 2013-07-23 13:00:28 -07:00
Mohnish Thallavajhula
4629bed2c4 Use input type password for the password field in the CSS documentation. 2013-07-23 11:50:01 -07:00
Mark Otto
4cec956e0c Drop rounded corners on .table-bordered 
* Cuts  close to 100 lines of CSS from the table CSS
* File size aside, this drastically simplifies CSS for folks looking to
build on top of the `.table-bordered` option as a starting point
 2013-07-23 10:48:30 -07:00
Mark Otto
b5f2482a58 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	dist/css/bootstrap.min.css
 2013-07-23 10:19:04 -07:00
Mark Otto
8aa3c375f0 No more left margin on dd elements, fixes #8567 2013-07-23 10:18:34 -07:00
Mark Otto
e7b0f4e81f Merge pull request #8564 from frabrunelle/3.0.0-wip 
@badge-bg should be @gray-light not #f5f5f5
 2013-07-23 10:05:49 -07:00
Francis Brunelle
4b9cacae91 @badge-bg should be @gray-light not #f5f5f5 2013-07-23 00:05:45 -04:00
Mark Otto
0b1ddeb353 fixes #8559 2013-07-22 14:44:36 -07:00
Mark Otto
98ce40d0f6 Merge pull request #8549 from ggam/patch-2 
Updated readme.md to reflect the latest changes in directory structure
 2013-07-21 16:07:55 -07:00
Guillermo González de Agüero
abb1013f25 Updated readme.md to reflect the latest changes in directory structure 2013-07-21 21:57:41 +02:00