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

356 Commits

Author SHA1 Message Date
Mark Otto
c8ab0a56c2 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-08-23 23:16:18 -07:00
Mark Otto
7d194a9bd3 wrap box-shadows in mixin in custom forms. fixes #17242 2015-08-23 23:13:14 -07:00
Mark Otto
19deadda95 shorter 2015-08-23 23:00:47 -07:00
Mark Otto
02069152a2 Merge pull request #17147 from kkirsche/patch-14
v4 - Dropup caret direction incorrect
2015-08-23 22:59:43 -07:00
Mark Otto
7633d4c603 Make predefined grid classes conditional
- Add explicit -grid-classes variable and set to true by default
- Wrap .row and .col generation in the boolean var
2015-08-23 22:13:58 -07:00
Catalin Zalog
793db36640 Apply !default to SCSS variables
!default to all variables.
2015-08-24 01:44:16 +03:00
Mark Otto
e75504366d Merge pull request #17120 from kkirsche/patch-5
Add white background to cards by default
2015-08-23 14:44:53 -07:00
Kevin Kirsche
e707a45b1f v4 - Dropup caret direction incorrect
Fix #17144
2015-08-23 08:12:56 -04:00
Kevin Kirsche
44acff459b Add white background to cards
Fix #17117
2015-08-23 08:10:55 -04:00
Mark Otto
a5bfbe0fca fix remaining scss lint errors 2015-08-23 01:12:00 -07:00
Mark Otto
6f8f4cc92c there is no standard appearance property 2015-08-23 01:03:51 -07:00
Mark Otto
b2dccb15d7 fix majority of scss linter errors 2015-08-23 01:00:22 -07:00
Mark Otto
27e4e97840 there is no navbar default for this 2015-08-23 00:28:02 -07:00
Mark Otto
24fee99e0e remove another margin-top: 0 2015-08-23 00:25:58 -07:00
Mark Otto
683472d6e2 remove a margin-top: 0 reset since we nuke headings' top margins now in reboot 2015-08-23 00:24:59 -07:00
Mark Otto
27f97e328b shorter clearfix 2015-08-23 00:18:28 -07:00
Mark Otto
54a5fbe0c1 fix #17149: correct syntax in list-group variant mixin; nullifies #17154 2015-08-22 21:46:46 -07:00
Mark Otto
2638b10d28 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-08-22 19:06:03 -07:00
Mark Otto
1f153b640d re-fix #16154 in v4-dev /cc #17101 2015-08-22 19:05:43 -07:00
Mark Otto
990d646bcd fix shadows on btns to use mixin 2015-08-22 19:01:11 -07:00
Mark Otto
5bb03b794d Merge pull request #17220 from cornedor/fix-17066
Removed mixin from focus outline box-shadow fixes #17066
2015-08-22 18:59:16 -07:00
Mark Otto
1e7c42d2c0 fixes #17035 2015-08-22 18:36:43 -07:00
Corné Dorrestijn
c49503165a Added comment explaining why there is no mixin here 2015-08-22 01:04:16 +02:00
Corné Dorrestijn
ac3fbdad36 Removed mixin from focus ouline box-shadow fixes #17066 2015-08-21 22:21:20 +02:00
Mark Otto
ba6cf4839b Merge pull request #17069 from kkirsche/patch-9
Card variables should be in _variables.scss
2015-08-20 22:02:35 -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
Jan Stevens
b7b8f98c86 Fixes the _image mixing by prefixing the parameters with $ 2015-08-20 11:35:00 +02:00
Gleb Mazovetskiy
f88cbe7ee4 Fix -flex compile on Sass Ruby #17046 2015-08-20 08:38:02 +01:00
Heinrich Fenkart
136461b5b6 Merge pull request #17064 from paulirish/patch-1
reboot.scss typo  (shttp --> http)
2015-08-20 01:06:41 +02:00
Paul Irish
291910402b reboot.scss: typo 2015-08-19 16:02:57 -07:00
Sid Roberts
6cc6f201af Fixed a typo (disaabled). 2015-08-19 23:09:17 +01:00
Kevin Kirsche
9e8bd818b2 Card variables should be in _variables.scss
Fixes #17061
2015-08-19 17:35:34 -04:00
Paul Irish
604dba1803 reboot.scss typo 2015-08-19 14:16:09 -07:00
Chris Bell
333be22824 Update _variables.scss
Fixed spelling mistake. Changed table of "ontents" to "Contents".
2015-08-19 22:06:39 +01:00
Mark Otto
9ccf308fd1 remove commented out nav styles 2015-08-18 20:28:41 -07:00
Mark Otto
c8306d2f70 rewrite active and disabled styles for navs 2015-08-18 20:25:31 -07:00
Mark Otto
58d1297fcb overhaul custom selects with latest from primer, shoutout 2015-08-18 19:26:18 -07:00
Mark Otto
b96f2b4c5b tweak navbar nav spacing 2015-08-18 01:06:14 -07:00
Mark Otto
47d334b28f shoutout navbar-divider 2015-08-18 00:59:44 -07:00
Mark Otto
d6b6a20a0d rewrite navbar once more for lower key styles and a new take on modifiers for improved customization 2015-08-18 00:46:29 -07:00
Mark Otto
d073a3beaa rename .inverse to .bg-inverse, add .bg-faded 2015-08-18 00:45:32 -07:00
Mark Otto
f1e10c37fd rewrite navbar bits some more 2015-08-17 23:43:59 -07:00
Mark Otto
82615e9919 no bg-color to start on outline buttons so they're easier to use on light and dark color schemes 2015-08-17 23:43:25 -07:00
Mark Otto
dcc92778d5 really temporarily disable those heights 2015-08-17 23:42:58 -07:00
Mark Otto
609c1ac2ff tighten up padding on inputs and buttons, disable fixed heights for now 2015-08-17 23:42:39 -07:00
Mark Otto
f0a8e56f80 tweak heading sizes 2015-08-17 21:13:52 -07:00
Mark Otto
c3373df95f clean out comments that aren't all that helpful 2015-08-17 18:33:34 -07:00
Mark Otto
29b4031db5 allow <button> elements as .dropdown-item's 2015-08-17 18:18:37 -07:00
Mark Otto
1d222a596e un-nest .dropdown-divider 2015-08-17 11:21:10 -07:00
Mark Otto
e558f490dd Rewrite dropdowns
- Remove nested > selectors for dropdown items
- Update docs examples to use all the new markup
2015-08-17 11:19:14 -07:00
Mark Otto
c064eef67b Massive cleanup
- Simpler main nav on all pages
- Back to purple masthead on homepage instead of dark graphite
- Active link styles on the main nav
- Cleaned up sidebar nav
- New docs layout name
- Homepage copy edits
- Updated bright purple docs color
2015-08-14 22:45:55 -07:00
Mark Otto
43e1678bf3 update utils, use important 2015-08-14 00:36:26 -07:00
Mark Otto
6a75d07e0c Use -* vars for .bg-* and .text-* utilities
- Simplifies variables usage
- Makes components and brand variable usage more consistent (dark bg and white text throughout instead of some mixed light and dark bgs)
- Very likely means lower contrast and thus no more AA compliance (we'll want to fix that eventually obviously)
2015-08-13 23:47:47 -07:00
Mark Otto
1da01e68ba variables cleanup
- new vars for .lead size and weight (previously had none)
- new var for default margin-bottom on h1-h6 elements (previously had none)
- rearranged vars to combine two typography sections into one in variables.scss
- reassigned border-width var to hr-border-width
- made hr-border more specific as hr-border-color
2015-08-13 23:18:32 -07:00
Mark Otto
d734653c3d use conditional mixin for transitions on buttons 2015-08-13 23:13:54 -07:00
Mark Otto
27fbc77ecb add note about variable structure 2015-08-13 23:13:38 -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
879114a808 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-12 22:56:56 -07:00
Mark Otto
6af9412674 move form validation icon vars to variables file 2015-08-12 22:39:46 -07:00
Thomas McDonald
d8acb36777 fix breadcrumbs libsass content 2015-08-12 22:14:58 -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
5e928c7c2b Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-12 21:16:56 -07:00
Mark Otto
699f307112 fix fat's broke js... jk it was my shitty css 2015-08-12 21:14:59 -07:00
Thomas McDonald
1d631e6ca3 remove .badge class from buttons 2015-08-12 21:07:41 -07:00
Mark Otto
b1a74195c8 simpler type, docs callout for reproducing the v3 style headings and small text 2015-08-12 20:45:21 -07:00
Mark Otto
314161cb17 remove hella vars from the jumbotron 2015-08-12 20:28:46 -07:00
Mark Otto
786b1682a5 small vars change 2015-08-12 18:22:02 -07:00
Mark Otto
a90f6c7093 reorder variables, rename -color to -color 2015-08-10 23:38:41 -07:00
Mark Otto
67765587d9 no more use for that 2015-08-10 23:30:13 -07:00
Mark Otto
8c173cd4f8 remove unused badge vars 2015-08-10 23:29:54 -07:00
Mark Otto
c871e4c130 clarify comment 2015-08-10 23:29:36 -07:00
Mark Otto
8e0324362e remove unused variable 2015-08-10 23:29:04 -07:00
Mark Otto
d7f4985639 addresses #14217, add responsive text alignment classes 2015-08-10 22:47:08 -07:00
Mark Otto
121615ceba dropdown fixes and dropdown docs tweaks 2015-08-10 16:31:28 -07:00
Mark Otto
743717fbce really fix those outline buttons 2015-08-09 23:45:36 -07:00
Mark Otto
eaeee93fa3 docs rearrange 2015-08-09 23:38:16 -07:00
Mark Otto
e7b1123310 update button borders to match bgs for easier outline button styling 2015-08-09 22:49:21 -07:00
Mark Otto
68e4d897ba shoutout to outline buttons 2015-08-09 22:48:48 -07:00
Mark Otto
08d6dc5b71 add basic figure support 2015-08-09 21:42:47 -07:00
Mark Otto
7a50a2cbe8 introduce display heading classes 2015-08-09 21:17:27 -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
cdb06e544c fix list group button variation by including text-align inherit and a width 100% 2015-08-05 23:49:39 -07:00
Mark Otto
f534cabc7e wider horizontal padding 2015-08-05 23:14:41 -07:00
Mark Otto
97bcfb9e7f rip badges 2015-08-05 00:48:42 -07:00
Mark Otto
9330c4a947 Run just as fast as I can
To the middle of nowhere
To the middle of my frustrated fears
And I swear you're just like a pill
Instead of makin' me better,
You keep makin' me ill
You keep makin' me ill

adds .label-pill to replace .badge
2015-08-05 00:45:41 -07:00
Mark Otto
d80f26fe49 unaffix sidebar and simplify styles of docs side nav to be more like v3 2015-08-05 00:38:36 -07:00
Mark Otto
0156fc1c9d mathematical! 2015-08-05 00:16:00 -07:00
Mark Otto
1ddc3f5e21 Merge branch 'master' into v4m 2015-08-04 22:29:45 -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
932ac79611 remove -darker 2015-07-03 18:33:31 -07:00
Mark Otto
18da568b8b rewrite some navbar stuff, clean out some commented out code 2015-06-22 23:24:55 -07:00
Mark Otto
ed42fc9b76 line-height-base to line-height var 2015-06-22 23:24:32 -07:00
Mark Otto
03a5ff6b82 remove commented out var 2015-06-22 22:52:14 -07:00
Mark Otto
057f82f8c3 indentation 2015-06-22 22:52:09 -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
d703396bce comment 2015-06-22 17:37:52 -07:00
Mark Otto
4565281df3 rename -horizontal and -vertical vars to -x and -y for consistency 2015-06-22 16:33:17 -07:00