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

175 Commits

Author SHA1 Message Date
Mark Otto
296c99020c Revamp button and input vars while fixing #21587 (#22287) 2017-03-28 09:28:27 -07:00
naicko
890c6041f3 Update scss mixins to comply with scss-linting rules (#22151)
* Fixed some linting issues

* Run npm tasks after scss cleanup

* Revert "Run npm tasks after scss cleanup"

This reverts commit 1103a0da68.

* Property sort order for grid

* Let's respest the property order in the mixins

* Respect property sort order in reboot file

* ::-ms-expand is a vendor-prefix, add it to the scss-lint disable

* Revert hover mixin comment

* Fixed missing mixin hover-focus
2017-03-18 13:06:05 -07:00
Mark Otto
02e0fdbd52 Remove cursor: pointer; (#21812)
* Remove most of custom cursor: pointer; implementations

* turns out that's not so much of a thing
2017-01-23 22:15:28 -08:00
Mark Otto
b350e60e82 use align-items on .form-inline to keep items from growing too much (#21461) 2016-12-28 19:08:33 -08:00
Mark Otto
8a3d0d344b use var 2016-12-27 14:17:11 -08:00
Mark Otto
8721ff8d6b fix inline checks 2016-12-27 14:17:11 -08:00
Mark Otto
4ba5bfb7cb add some vars 2016-12-27 14:17:11 -08:00
Mark Otto
96986bb4a3 Use calc() on .col-form-label padding calculations
Fixes #21135.

There's a height mismatch here because we're setting padding on the labels, while inputs get padding *and* a top+bottom border. This now uses calc to determine the exact height needed to match labels to inputs.
2016-12-25 15:48:44 -08:00
Mark Otto
04d48ba504 Replaces #21270 with proper fix
Rather than overriding this just on inline form examples, this should be for all static form controls to match inputs.
2016-12-25 15:48:44 -08:00
Mark Otto
4cd426963b vertically center .form-group contents in inline forms
fixes broken inline form example mentioned in #21407
2016-12-25 15:48:44 -08:00
Mark Otto
eb2e1102be Flexbox all the time (Drop IE9 support and remove $enable-flex option) (#21389)
* remove the $enable-flex variable option

* remove bootstrap-flex.css dist file and it's grunt task

* remove the separate flex css file for docs; it's all the same now

* remove flexbox docs (porting some to the main grid docs in next commit)

* clean up few grid docs bits to simplify copy, start to mention flexbox

* port relevant flexbox-grid.md content to grid.md

- clean up mixins
- update how it works section
- bring over sizing and alignment sections

* remove the $enable-flex from the options.md page

* update lead paragraph to mention flexbox

* update migration to mention loss of ie9 support

* remove mention of flexbox dist file

* clarify IE support

* making a note

* remove flexbox variant mentions from component docs

- updates docs for media object, navs, list group, and cards to consolidate docs
- no more need to callout flexbox variants since it's now the default

* remove $enable-flex if/else from sass files

* remove flex dist files

* update scss lint property order to account for flex properties

* linting

* change to numberless classes for autosizing, wrap in highlighting div

* bump gruntfile and postcss to ie10

* redo intro sections

* rearrange

* phew, redo hella grid docs

- rearrange all the things
- consolidate some bits

* remove reference to flexbox mode

* more border action for demo

* Make some changes to the .card's in .card-deck's to ensure footers align to the bottom
2016-12-21 20:26:17 -08:00
Gijs Boddeus
1c2f372aad Overwrite margin-bottom on form-control-static (#21270)
* Overwrite margin-bottom on form-control-static

In the documentation the form-control-static class has been used on a p element.
On the regular vertical form the margin bottom of the p element gets overwritten by a mb-0 class.
In the inline form example this class hasn't been applied, therefore the p element gets a margin-bottom.

To prevent this behavior we can add a margin-bottom of 0.

* Update _forms.scss
2016-12-20 14:45:08 -08:00
Tom Lutzenberger
e1653edb95 Add variables for transitions (#21345)
* Add variables for transitions

* Add variables for transitions
2016-12-19 20:33:17 -08:00
Brad Kent
8250bd1b21 Fix #20936 make inline checkbox/radio markup same as stacked (#20995)
* #20936 make inline checkbox/radio markup same as stacked

* tweak language and remove extra blank line in snippet
2016-11-28 20:56:49 -08:00
Florian Schlittenbauer
959c4e527c Fix incorrect select height calculation (#21171) 2016-11-28 13:33:11 -08:00
Mark Otto
e17e75b757 Update inline forms (updated docs and new flexbox styles) (#21212)
* fix form-inline with flex enabled
* grunt
* fix alignment of labels
* shorter if syntax
* add new form example to docs for now
* update inline form docs usage guidelines
* responsive margins
* better margin utils
* fix sizing of .form-check
* flexbox alignment of .form-check
* no need to change direction
* support custom controls in inline form, for default and flex modes
* add example of custom select and checks to docs
* remove hidden and visible label variants since we cover that in the usage guidelines at the start and include hidden labels everywhere
* use property value instead of layout name
* apply to all labels
* add a visible label, space it out
* add id
2016-11-26 16:55:18 -08:00
Mark Otto
0c467e7b29 Match the height of select.form-control with input.form-control
Uses a local variable and some calc love to counteract the border-width (times 2) from the height of the select. Fixes #17194 and nullifies #19967.
2016-10-09 18:04:30 -07:00
Mark Otto
9ac7e868df remove un-needed comment 2016-10-09 16:18:12 -07:00
Mark Otto
53ce4da835 add transparent border to match .form-control height 2016-10-09 16:17:48 -07:00
Mark Otto
55e130f88f Update static form control
- Remove margin-bottom override in favor of .mb-0 utility class
- Apply the input line-height styles to match
- Remove the min-height to match the input
2016-10-09 16:16:13 -07:00
Mark Otto
cab2d5951d Ensure input groups behavior appropriately in inline forms
Overrides the default width: 100% with an auto. Fixes #20752.
2016-10-09 16:00:30 -07:00
Mark Otto
59d0679250 Only override input border-radius as part of .form-control to avoid bug with iOS Safari (alt fix for #20247) (#20695) 2016-10-02 18:28:37 -07:00
Mark Otto
bb4af05d22 Fixes #20799: Apply same color change to disabled inline radios/checkboxes (#20826) 2016-10-02 18:15:55 -07:00
Mark Otto
425e3d407e Bring back some 'help text' love for forms with .form-text
- Includes new class
- New docs to support it
- Rearranged older docs
2016-05-10 08:24:38 -07:00
Mark Otto
73d9815343 Merge branch 'v4-forms-cleanup' of https://github.com/twbs/bootstrap into v4-forms-cleanup 2016-05-09 19:25:42 -07:00
Mark Otto
35c11b69df Update checkboxes and radios docs
- Add lighter gray text to disabled state for .form-check
- Separate radios and checkboxes example
- Clarify docs
2016-05-09 11:00:36 -07:00
Mark Otto
f5d889c385 update classes for inline form to new checkbox options 2016-05-08 23:14:48 -07:00
Mark Otto
546149f004 Fixes #19771: Enable .form-control-sm/lg on select.form-control 2016-05-08 17:31:02 -07:00
Mark Otto
d8c898b172 linting 2016-05-08 17:11:17 -07:00
Mark Otto
dde85e9888 Redo checkboxes and radios
- Move disabled radio and checkbox styles to Reboot
- Collapse .radio and .checkbox into single class, .form-check
- Collapse .radio-inline and .checkbox-inline into single class, .form-check-inline
- Require classes for sub-elements in both new classes
2016-05-08 16:05:27 -07:00
Mark Otto
8b8f5d0ca6 nuke commented out css 2016-04-23 15:03:18 -07:00
Mark Otto
6764171404 Avoid hacking around the temporal input bug in iOS
- Rather than use CSS hacks, let's avoid needing to hack anything
- Creates a new Reboot entry to simply reset the appear of the temporal inputs, thereby avoiding the problem entirely
- Less than ideal for conveying affordance on iOS, but given bugginess of the input itself, seems a decent tradeoff
2016-04-23 14:56:36 -07:00
Mark Otto
9f2ab98026 Merge branch 'v4-dev' into v4-forms-cleanup 2016-04-23 14:24:08 -07:00
Patrick H. Lauke
d239fbb5f2 Suppress IE/Edge additional white/blue colors for focused <select> 2016-04-12 08:06:10 +01:00
Mark Otto
0a4d3155ab Fixes #18573: Change name of .form-control-label to .col-form-label (and .form-control-legend to .col-form-legend) to reiterate use for only grid layouts 2016-04-08 21:05:23 -05:00
Mark Otto
91627de4de fix up broke forms styles and docs example for the grid 2016-04-08 20:58:36 -05:00
Mark Otto
80144d74d7 Merge branch 'v4-dev' into v4-forms-cleanup 2016-04-08 20:55:19 -05:00
Patrick H. Lauke
727722da59 Add form-control-legend 2016-02-19 15:51:59 +00:00
Mark Otto
371fbdb0e8 .text-help is dead, long live .form-control-feedback
Uses a new more specific class, adds some basic spacing, and clarifies
that this class is only for validation feedback.

Clears up the help text class question in
https://github.com/twbs/bootstrap/pull/18704#issuecomment-168241731 and
addresses the vertical spacing in #18703.
2016-02-09 01:10:05 -08:00
Mark Otto
04f145b9d5 fix #18515: add .form-control-label-* classes to match large/small inputs 2016-02-09 00:35:14 -08:00
Mark Otto
51d3267ea9 don't set horizontal padding on .form-control-label /cc #18130 #17498 2016-02-09 00:34:41 -08:00
Mark Otto
c3e4cbdfb0 Move to a translucent input border with background-clip: padding-box for improved blending across different background-colors 2016-02-08 22:28:11 -08:00
Chris Rebert
8141835682 _forms.scss: Use division instead of fractional multiplication
[skip sauce]
[skip validator]
2016-02-08 03:34:24 -08:00
Chris Rebert
8ffcb5f055 _forms.scss: Remove extra trailing 0 in fractional number
[skip sauce]
[skip validator]
2016-02-08 03:31:54 -08:00
Mark Otto
e455b6b8d2 Merge branch 'v4-dev' into v4-form-sizing 2016-02-07 22:48:26 -08:00
Mark Otto
38c93371c1 updated button/form-control padding and line-height
- Moves from no set line-height (inherited of 1.5) to declared 1.25 for
all inputs and buttons (regardless of size modifier).

- Updates padding to be `.5rem` instead of `.375rem` so that padding is
more likely to be whole numbers based on the root font-size.

- Whole numbers will be beneficial in avoiding odd fractional pixels
that can lead to misalignment as shown in #18607.

- Large buttons and inputs are now a tad wider, and smaller
buttons/inputs a tad shorter and narrower, too.
2016-02-07 22:46:50 -08:00
Mark Otto
ab451e5dc0 Remove commented out height on large/small inputs 2016-02-07 22:43:24 -08:00
Mark Otto
8fcdbd38f8 Remove specific line-heights from large/small inputs as well 2016-02-07 22:43:10 -08:00
Chris Rebert
da848536ce _forms.scss: Remove extra url()s in commented-out code
[skip sauce]
[skip validator]
2016-02-07 20:20:14 -08:00
vsn4ik
e7b0ccff63 Fix CSS3 :not() selector 2016-02-07 19:21:26 +03:00
Mark Otto
caa36b8dd7 Fixes #17194: Ensure proper height on default select.form-control instances 2016-02-06 18:20:27 -08:00
Mark Otto
697466badf tweak sizing 2016-02-06 18:05:34 -08:00
Mark Otto
dee1979683 move the url to the variable value 2016-02-06 18:05:24 -08:00
Mark Otto
03ec195974 linter overhaul 2016-02-06 12:28:18 -08:00
Mark Otto
ba37c37615 Redo line-height globally
- Rename -height to -height-base to match other vars
- Drop use of -height across the board and rely on it to be inherited
- Adjust padding of .dropdown-header to account for different line-height of h6 heading element (this needs refactoring for variables and rems also)
2016-02-03 19:45:13 -08:00
Chris Rebert
7e2e31e964 scss/_forms.scss: Remove now-unnecessary SCSS-Lint exemption
[skip sauce]
2016-01-23 03:06:21 -08:00
Chris Rebert
350ce2f707 Switch to actually-Safari-specific CSS hack when fixing vertical alignment of temporal input text in iOS Safari
See http://browserbu.gs/css-hacks/webkit-full-page-media/
Fixes #17308

[skip sauce]
[skip validator]
2016-01-10 18:22:10 -08:00
Chris Rebert
8adc9d771f Remove remaining reference to <input type="datetime"> in SCSS comment
Erratum of #18778

[skip sauce]
[skip validator]
2016-01-08 23:55:23 -08:00
Mark Otto
6a7577d3c6 remove instances of font-weight: normal since we no longer specify bold labels (as of v4) 2016-01-05 00:14:58 -08:00
Mark Otto
30aad997d0 tweak comment 2015-12-07 23:52:10 -08:00
Chris Rebert
9dacdce42c Use $input-btn-border-width for both .form-control and .btn borders; fixes #18424
Both widgets need to use the same border width because of input groups.
Thus:
$btn-border-width   => $input-btn-border-width
$input-border-width => $input-btn-border-width

[skip sauce]
2015-12-07 20:41:51 -08:00
Mark Otto
21b15d450d fixes #18087: .navbar-form is no more 2015-12-06 16:59:33 -08:00
Chris Rebert
85c9cc806b .form-control: Use $input-border-width instead of $border-width
[skip sauce]
2015-11-15 01:18:40 -08:00
Chris Rebert
2d02910e01 $input-border => $input-border-color 2015-11-14 22:40:43 -08:00
Mark Otto
925f0ca018 fix error to danger 2015-11-14 19:45:48 -08:00
Mark Otto
9f66e7309c fix broke shit, ugh my bad 2015-11-12 23:15:31 -08:00
Mark Otto
6fd1c80d37 Merge pull request #17153 from kkirsche/patch-17
v4 — Change .has-error to .has-danger for uniformity.
2015-11-12 22:20:07 -08:00
Chris Rebert
364925f951 Fix typos in comments 2015-10-28 14:33:48 -07:00
Chris Rebert
25d724b279 _forms.scss: Copy over iOS <input> type compatibility note from v3
Refs b6e6a05b95
We ought to re-check this for iOS 9.1 at some point...

[skip sauce]
[skip validator]
2015-10-23 23:05:13 -07:00
Chris Rebert
a180a3362a Move border-radius mixin from scss/_mixins.scss to scss/mixins/_border-radius.scss
Reunites the family.
Closes #17791
2015-10-08 08:56:13 -04:00
Mark Otto
85f08df3b0 fixes border-width issues when customizing font-size by using 1px instead of .0625rem as default -width 2015-09-15 21:11:15 -07:00
Gleb Mazovetskiy
79aebf6c1d Merge pull request #17364 from twbs/avoid-parent-selector-suffix2
Remove all uses of `selector &` to support nested import
2015-09-05 10:14:59 +01:00
Andrew Smith
b424626e97 Update all usages of 'control-label' with 'form-control-label' in docs 2015-09-02 15:01:02 +10:00
Chris Rebert
8ad1f8ddbe Merge pull request #17331 from twbs/fix-17323
rm unused $state param from form-control-validation mixin
2015-08-29 15:55:45 -07:00
Gleb Mazovetskiy
f7b27a02ce Remove all uses of selector &
If we want to support namespaced import:

```scss
.twbs {
  @import 'bootstrap';
}
```

We cannot use `selector &`, see sass/sass#1817.

`fieldset[disabled] &` is not needed as we no longer support IE8.
2015-08-27 13:11:14 +01:00
XhmikosR
3e66427127 Less to Sass typos.
[ci skip]
2015-08-27 08:14:39 +03:00
Chris Rebert
5c239aae7d rm unused $state param from form-control-validation mixin; fixes #17323
[skip sauce]
[skip validator]
2015-08-26 01:32:26 -07:00
Mark Otto
b2dccb15d7 fix majority of scss linter errors 2015-08-23 01:00:22 -07:00
Kevin Kirsche
477790c672 Use border-radius mixing in form-control-sm and form-control-lg
Fix #17160
2015-08-20 15:53:41 -04:00
Mark Otto
dcc92778d5 really temporarily disable those heights 2015-08-17 23:42:58 -07:00
Mark Otto
c3373df95f clean out comments that aren't all that helpful 2015-08-17 18:33:34 -07:00
Mark Otto
9b1ee31567 nuke the shared padding vars and assign to individual components
- no real need for everything to be 100% shared
- padding looked and felt too large for inputs but not for buttons
- tying forms and buttons seems fine, but throwing in pagination feels wrong
2015-08-13 23:04:16 -07:00
Mark Otto
6af9412674 move form validation icon vars to variables file 2015-08-12 22:39:46 -07:00
Mark Otto
faacbdb49f Remove .help-block entirely
- Fixes #13267 somewhat.
- Instead of a single, block-level class, let's use a combination of existing elements and classes.
- For block-level help text, use p.text-muted.
- For inline-level help text, use span.text-muted or small.text-muted.
2015-08-12 22:14:31 -07:00
Mark Otto
a90f6c7093 reorder variables, rename -color to -color 2015-08-10 23:38:41 -07:00
Mark Otto
7c3f5b6d59 rewrite some forms docs, use new validation styles and icons 2015-08-08 14:15:09 -07:00
Mark Otto
b451104bcd use mixin on input transition 2015-07-03 18:35:53 -07:00
Mark Otto
4665b9dd6f Add new variable for -box-shadow 2015-07-03 18:35:46 -07:00
Mark Otto
ed42fc9b76 line-height-base to line-height var 2015-06-22 23:24:32 -07:00
Mark Otto
acca337ced Remove var 2015-06-22 19:02:30 -07:00
Mark Otto
75cf69a1ab drop more -base, clean up var spacing 2015-06-22 18:57:56 -07:00
Mark Otto
0ca9b21c34 drop the base (hahaha), no but seriously drop the -base from our vars since it's cleaner 2015-06-22 18:53:04 -07:00
Mark Otto
4565281df3 rename -horizontal and -vertical vars to -x and -y for consistency 2015-06-22 16:33:17 -07:00
Mark Otto
ce9c0f0125 tweak small forms, small inputs; trying to equalize their rendered dimensions 2015-06-22 16:30:31 -07:00
Mark Otto
eaa67a82d3 fix scss linting 2015-06-19 00:14:36 -07:00
Mark Otto
169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
Mark Otto
d31ec33908 Fix no-label checkboxes/radios
Because we use `position: absolute` on our inputs, when there’s no
label the `.checkbox` ends up having no computed height. To avoid
rendering errors when there’s no label text, we reset the `position` to
`static` for normal rendering.
2015-04-29 12:01:57 -07:00
Mark Otto
ed89be1f44 Remove $line-height-computed
We have it set to `1` right now just to avoid compilation errors, but
it’s been replaced everywhere with our new spacer classes anywho. We’ll
likely want to remap that var to custom component vars though (e.g.,
`$pagination-margin` instead of `$spacer-y`).
2015-04-29 12:00:11 -07:00
Mark Otto
cc7c27dd71 drop .form-horizontal 2015-04-23 01:11:10 -07:00
Mark Otto
2cf5213c15 remove commented out code 2015-04-23 01:10:57 -07:00