rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity
5,499 Commits 108 Branches 89 Tags 549 MiB
03258683ed
Commit Graph

1731 Commits

Author SHA1 Message Date
Maurice Fonk
bf0f3c7c1c using @line-height-computed in .navbar-nav link 
When a user changed the @line-height-base/@line-height-computed var, the
nav-bar items would not scale appropriately.
 2013-08-03 15:09:56 -04:00
James Holland
744b79a666 Update .navbar-toggle to match other navbar el 
In place of commit #9040, fix #8844
And sizing .navbar-toggle more like .btn elem
+ change `position:absolute` to `position:relative`
+ remove `right: 10px` in favor of `float:right`
+ change to `height: 34px`
+ remove `top:` in favor of `.navbar-vertical-align` basis new height
+ change `padding:` to match `.btn` el
 2013-08-03 10:28:17 -04:00
Elvis Ratzlaff
777ae911b6 Change value for padding on pagination to variables 2013-08-03 03:59:37 -04:00
Elvis Ratzlaff
2fd8689b08 Change line-height value with variable for btn-large and btn-small 2013-08-03 03:56:06 -04:00
Mark Otto
4bac2c567a Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-02 20:19:20 -07:00
Mark Otto
a3be713f8f Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-02 19:30:03 -07:00
Mark Otto
9435991ff0 move form layouts from input groups back to forms (messed this up in b281ad6409) 2013-08-02 18:48:44 -07:00
Mark Otto
6b850132d0 Remove requirement of .list-group-flush when list groups are in panels 
Fixes #8900
 2013-08-02 17:57:19 -07:00
Chris Rebert
0fefbbe659 fix typo in comment 2013-08-02 16:36:54 -07:00
Mark Otto
173dac4e54 Tighten up buttons and form controls 
* Smaller padding on buttons and large buttons
* Same with inputs and large inputs
* Remove about 10px from height of large inputs/buttons and 4px from
regular ones

Fixes #8707 and #8700.

(Also relevant: #8711)
 2013-08-02 15:09:48 -07:00
Mark Otto
d46e645a0f fixes #9015: bold links not semibold in alerts 2013-08-02 14:07:26 -07:00
Mark Otto
83eea13e63 Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jtickle/fp-bootstrap into jtickle-3.0.0-wip-fixed-grid-push-pull-offset 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-02 13:58:06 -07:00
Jon Schlinkert
c017e19ed2 Resolves https://github.com/twbs/bootstrap/issues/9014. updates mixins to consistently use semicolons as argument separator. Rebuild to confirm, no diff in compiled CSS. 2013-08-02 15:33:03 -04:00
Mark Otto
dfd6c23527 Merge pull request #8967 from bassjobsen/patch-2 
Update input-groups.less
 2013-08-02 10:11:06 -07:00
Mark Otto
e4b113934d Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-02 10:02:46 -07:00
Mark Otto
048e19b892 Fixes #8996: shift placement of justified CSS for nav component 2013-08-02 09:42:50 -07:00
Mark Otto
d0b94ead9a Fix #9008: consolidate .alert-block styles into .alert 2013-08-02 09:32:58 -07:00
Guillermo González de Agüero
824d5d5de4 Fix #8944 2013-08-01 20:07:34 +02:00
Jeff Tickle
1583dd55e9 Added classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push, sm-offset 2013-08-01 12:16:20 -04:00
Bass Jobsen
a5641b0cca Update input-groups.less 
align inline radio and checkbox groups with their label for horizontal forms, see http://stackoverflow.com/q/17990310/1596547 (Question 2)
 2013-08-01 16:05:07 +02:00
leonardovcid
15b98a0bb1 Correct comment which is showing a wrong mixin call example (mixins.less) 
I was copy-pasting the example and it wasn't working. Then I found that the example in the comment was a typo.
Thanks
 2013-08-01 14:39:28 +01:00
liuyl
56aedcb713 add table-layout 2013-08-01 11:26:12 +08:00
Mark Otto
e9413315b5 fixes #8937: align the dropdown menus in input groups 2013-07-31 18:06:20 -07:00
Cesidio Di Landa
3696530aaf Removed trailing whitespaces 
Changed hard tabs to soft tabs
 2013-07-31 18:11:11 +02:00
Archan Luhar
b9f59428f9 Removed background color from #gradient mixins to support transparent gradients 2013-07-30 19:30:24 -07:00
Mark Otto
e6ac348bfc Merge pull request #8726 from andreypopp/3.0.0-wip 
Fix out of order variable declaration order
 2013-07-30 14:14:51 -07:00
Mark Otto
96eef43dee Merge pull request #8852 from briannelsondesign/label_baselines 
Adjusts vertical alignment of labels and badges
 2013-07-30 14:07:00 -07:00
Chris Rebert
da98c5c2c3 trivial spacing fix 2013-07-30 12:35:39 -07:00
Brian Nelson
220fee80bf Improves label and badge alignment so text aligns with baseline 2013-07-30 11:23:25 -04:00
liuyl
7cfcfdfe64 make navbar-text float left 2013-07-30 09:30:21 +08:00
Mark Otto
8b5e41d900 Refactor .input-* sizing a bit by not chaining to .form-control (fixes #8672) 2013-07-29 17:30:36 -07:00
Mark Otto
09edfcf8c2 fixes #8670: move list group bg color to individual items for mo betta rendering 2013-07-29 17:23:08 -07:00
Mark Otto
5716355cda Restore mini button (fixes #8644) 2013-07-29 17:08:04 -07:00
Andrey Popp
e0395b425d reorder nav-justified classes 2013-07-30 03:27:32 +04:00
Mark Otto
d9c9afa6d1 add focus to button group active button behavior 2013-07-29 14:53:55 -07:00
liuyl
e77d134481 buttons 2013-07-29 14:09:41 +08:00
Nicholas Westlake
8858ef4dae Format multiple badges in list-group-item 2013-07-28 21:25:16 -05:00
Andrey Popp
0d7940d950 get rid of out of order variable declaration 2013-07-29 03:04:12 +04:00
Mark Otto
111dc1492f fixes #8714: correct stacked pills nav 2013-07-28 09:37:10 -07:00
syed
1aedb7862c move things around 
Moved alerts, badges, button groups, buttons, carousel, close to
variables.less and customize.html
 2013-07-28 17:32:08 +05:00
liuyl
efac0bf8d6 make pull-right !important 2013-07-28 14:05:47 +08:00
Mark Otto
ce57378705 fixes #8665: have modals use auto margin on sides and widen it instead of positioning and negative margin 2013-07-27 19:38:05 -07:00
Mark Otto
b281ad6409 Input groups overhaul 
* Moves input groups CSS into separate file
* Moves input groups docs into the Components page
* Add support for radios and checkboxes in input groups to fix #8679
 2013-07-27 18:56:31 -07:00
Mark Otto
e953c23019 fixes #8659: remove lingering .nav-header 2013-07-27 16:51:04 -07:00
Mark Otto
14f688c7fc fixes #8675: align horizontal form label and input 2013-07-27 16:37:45 -07:00
fat
d0cafdd3a8 rebuild + use serif arrows 2013-07-26 22:59:21 -07:00
Mark Otto
88dd20e6ac Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	dist/css/bootstrap.min.css
 2013-07-26 22:18:16 -07:00
Mark Otto
bf5434dbec Fix up dropdowns being incorrectly positioned on nav pills 2013-07-26 22:11:58 -07:00
fat
2cf1851d9f use transforms to make the dialog smooooth 2013-07-26 22:09:31 -07:00
Mark Otto
88887f8c00 Undo changes from #8582 because it made links uneven on desktop 
/cc @salman-javed-confiz
 2013-07-26 21:49:35 -07:00
Mark Otto
8349236f8c Twerk lead font-size for mobile devices 2013-07-26 21:12:48 -07:00
fat
38044e55ae rebuild + fix #2539 2013-07-26 20:44:35 -07:00
fat
e2d4cf5f68 change how collapse works - collapse, collapsing, and in 2013-07-26 20:34:39 -07:00
Mark Otto
01c6617f79 Update inline and horizontal forms 
* No more need for `.row.form-group`--only need `.form-group`
* Change tag selectors for inline form to use `.form-control`
* Docs improved to explain what's happening
 2013-07-26 15:51:25 -07:00
Mark Otto
68827689e8 Use .form-control in input sizing CSS 2013-07-26 15:41:16 -07:00
Mark Otto
1cf0a07f17 Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3 
Conflicts:
	css.html
 2013-07-26 15:08:45 -07:00
Mark Otto
444973e54d Fixes #8605: use .form-control in .input-group instead of HTML tags 2013-07-26 14:31:24 -07:00
Mark Otto
9e98b733f1 Vars update 
* Drop progress bar text-shadow
* Reorganize popover and tooltip vars and fix complier error due to
missing `;`
* Run `grunt`
 2013-07-26 11:08:27 -07:00
Mark Otto
e62e992b88 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-26 10:44:46 -07: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
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
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
Fred Delrieu
06980ae5a1 Small typo 2013-07-26 10:10:35 +02: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
56404bc89b Add .panel-title to panel component to mirror modals 
/cc @leeaston
 2013-07-25 21:16:43 -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
Chris Rebert
90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00
Mark Otto
c7995cf964 move some thing around 2013-07-25 10:50:59 -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
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
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
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
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
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
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
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
Francis Brunelle
4b9cacae91 @badge-bg should be @gray-light not #f5f5f5 2013-07-23 00:05:45 -04:00
Mark Otto
12468c6103 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	dist/css/bootstrap.min.css
 2013-07-21 08:52:25 -07:00