0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

273 Commits

Author SHA1 Message Date
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
Mark Otto
ce9c0f0125 tweak small forms, small inputs; trying to equalize their rendered dimensions 2015-06-22 16:30:31 -07:00
Mark Otto
bc29c016b7 Merge branch 'v4' into v4_builds 2015-06-19 16:26:33 -07:00
Mark Otto
eaa67a82d3 fix scss linting 2015-06-19 00:14:36 -07:00
Mark Otto
930ed8df32 nuke unused .csslintrc 2015-06-19 00:05:40 -07:00
Mark Otto
e4d72c914d fix vars, grunt that shit 2015-06-19 00:01:57 -07:00
Mark Otto
ecc7d9ba26 fix placement of mixin 2015-06-19 00:00:21 -07:00
Mark Otto
169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
Mark Otto
df2ca92d77 Use percentages in responsive embed modifiers
- Credit: @adammacias
- Originally proposed in #16499 with previous commit
2015-06-18 16:03:48 -07:00
Mark Otto
331b8d2250 Add 21x9 responsive embed modifier
- Credit: @adammacias
- Fixes #16499
2015-06-18 16:01:52 -07:00
Mark Otto
8410afe0e1 Create new stylesheets for optional builds and add them to Gruntfile tasks 2015-06-18 10:19:50 -07:00
Mark Otto
840938f09d tweak code styles 2015-06-09 16:28:17 -07:00
Mark Otto
9863eb75d2 move spacing utils to separate file, document them a bit 2015-06-01 01:19:02 -07:00
Mark Otto
97a6275e54 add updated scss lint yml file 2015-05-31 20:17:57 -07:00
Mark Otto
7783ef8fab remove utils from media alignment 2015-05-29 16:05:42 -07:00
Mark Otto
933639729f enforce line-height on badges at all times 2015-05-29 14:05:02 -07:00
Mark Otto
8e6df4325e cards update 2015-05-29 13:09:54 -07:00
Mark Otto
587f5f8efd clean up card styles. add new vars 2015-05-29 01:59:54 -07:00
Mark Otto
74d17ab7a0 rewrite much of cards and the docs 2015-05-28 14:07:34 -07:00
Mark Otto
e07cebc90e add flexbox variation for .card-group 2015-05-28 10:37:12 -07:00
Mark Otto
6e3d4331db new card sizing maybe 2015-05-27 19:00:11 -07:00
Mark Otto
4bc58b9a5a when using flexbox, don't add a clearfix
doing so fubars the grid column rounding (in safari at least) and causes layout problems
2015-05-27 17:37:22 -07:00
Mark Otto
663576a7ae Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css
2015-05-27 15:49:55 -07:00
Mark Otto
ddafee6ece disable flex to start 2015-05-22 22:33:45 -07:00
Chris Rebert
82c9038f20 Unquote to avoid NUL chars in the output CSS 2015-05-15 12:17:13 -07:00
Chris Rebert
62da5947a8 Permanent proper fix for dist-css
Bump mq4-hover-shim to ^0.2.0

Revert "fix dist css"
This reverts commit b12d4bfa9a.
2015-05-15 12:12:29 -07:00
fat
b12d4bfa9a fix dist css 2015-05-14 13:13:33 -07:00
fat
dbaffd43c0 Merge pull request #116 from twbs/fat-es6Alert
es6 - wip
2015-05-13 15:01:39 -07:00
fat
a58febf71a popover passing as well 2015-05-12 14:35:00 -07:00
fat
3452e8dc83 rewritten tooltip + tether integration and death to our positioner jank 2015-05-11 23:32:37 -07:00
Chris Rebert
ee33891e42 Merge pull request #60 from twbs/libsass-185
Remove libsass @media nesting bug workaround
2015-05-06 13:29:02 -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
7db7e59682 spacing 2015-04-29 11:49:41 -07:00
Mark Otto
b849be2edc rename media query var to match /cc @cvrebert 2015-04-29 11:49:25 -07:00
Mark Otto
95771f9658 clean up vars file a smidge 2015-04-29 11:48:58 -07:00
Mark Otto
47dfdc2880 darker secondary button border color 2015-04-29 11:42:38 -07:00
Mark Otto
a399d19dd3 add comments 2015-04-29 11:32:49 -07:00
Mark Otto
35f45bafed Merge pull request #113 from twbs/at-root-group
Wrap `@viewport` with `@at-root` for nested import support
2015-04-29 11:30:09 -07:00
Mark Otto
d9d351e2fe more flex grid stuff 2015-04-27 14:11:07 -07:00
Gleb Mazovetskiy
b832c3cb97 Wrap @viewport with @at-root for nested import
See https://github.com/twbs/bootstrap-sass/pull/805
2015-04-27 20:15:17 +01:00
Mark Otto
15692d5e5b flex variation for media 2015-04-27 01:50:38 -07:00
Mark Otto
391b62f968 stub out flexbox variation for input group 2015-04-27 01:43:30 -07:00
Mark Otto
9d4d6ef3a2 stub out flexbox grid variation via -flex 2015-04-27 01:43:14 -07:00
Mark Otto
28d8849216 remove some un-used grid class resets in input groups 2015-04-26 00:18:13 -07:00
Mark Otto
efd28a5e78 unnecessary comment 2015-04-26 00:14:27 -07:00
Mark Otto
219c4cbf87 remove another extend 2015-04-26 00:08:40 -07:00
Mark Otto
6489e19530 remove more old navbar styles 2015-04-26 00:07:37 -07:00
Mark Otto
b688fe822c remove the old navbar-form class 2015-04-26 00:06:45 -07:00
Mark Otto
7853a675f6 remove extends: navs and unstyled lists 2015-04-26 00:02:25 -07:00
Chris Rebert
78c18954a8 _reboot.scss: fix typo in comment 2015-04-23 16:27:03 -07:00
Mark Otto
1770df724e update input groups to use new form control size classes 2015-04-23 01:14:43 -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
Mark Otto
490294e68b Fix up some form docs styles, sizing, etc 2015-04-23 01:10:14 -07:00
Mark Otto
dc3abb5f12 Update labels and form grid examples 2015-04-23 00:51:39 -07:00
Mark Otto
209cdf33f9 update navbar and nav link values 2015-04-18 18:15:24 -07:00
Mark Otto
8f94078da8 New form control sizing, new navbar condensed variation, update nav and navbar spacing 2015-04-18 18:12:10 -07:00
Mark Otto
250c2200bf no more dl-horizontal offset or page-header vars 2015-04-18 11:53:10 -07:00
Mark Otto
35be16cffa remove legend vars as we no longer use them 2015-04-18 11:39:13 -07:00
Mark Otto
ac1ed746ef more comments and formatting clean up 2015-04-18 11:38:47 -07:00
Mark Otto
2237572e8b clean up commented out code in forms 2015-04-18 11:30:29 -07:00
Mark Otto
09886480e0 remove commented out code for auto aligning navbar dropdown menus 2015-04-18 11:17:42 -07:00
Mark Otto
ddf4867a5e comments and spacing 2015-04-18 11:17:32 -07:00
Mark Otto
49f874468b comments and spacing 2015-04-18 11:17:28 -07:00
Mark Otto
b88c05d564 clean up comments and spacing 2015-04-18 11:15:40 -07:00
Mark Otto
88a92e433d move abbr stuff for tooltip to reboot, clean up type scss 2015-04-18 11:13:45 -07:00
Mark Otto
bf085b1a02 delete the .page-header and its docs 2015-04-17 20:00:38 -07:00
Mark Otto
611a127a1e change the type scale a bit again 2015-04-17 16:49:48 -07:00
Mark Otto
bf5931b5ee massive rewrite of forms docs and some css 2015-04-17 16:02:41 -07:00
Mark Otto
7c1635cdb8 narrower borders to get closer to 1px everywhere 2015-04-17 00:44:36 -07:00
Mark Otto
7049a07444 More reboot work, commenting out things that have been moved over 2015-04-17 00:22:35 -07:00
Mark Otto
af9ab7b1a7 tweak the font-sizes for headings 2015-04-17 00:21:57 -07:00
Mark Otto
0ab1576ae2 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-04-16 18:54:17 -07:00
Mark Otto
605990400e collapsing navbar tools 2015-04-16 18:50:32 -07:00
Mark Otto
06c2862d25 start stubbing out a new reboot section and file 2015-04-16 18:39:45 -07:00
Mark Otto
7001dece8a edit comments a bit 2015-04-16 17:15:29 -07:00
Mark Otto
585f857e71 rename scaffolding to reboot 2015-04-16 17:12:19 -07:00
Mark Otto
36e4cd0287 Move .img- classes to new _images.scss; move hr to _type.scss 2015-04-16 17:10:47 -07:00
Mark Otto
cd3bc6a089 Merge pull request #101 from twbs/institutional-memory
Revert "Images are responsive by default"
2015-04-16 17:03:58 -07:00
Mark Otto
236a86502e fix spacer vars 2015-04-15 15:30:26 -07:00
Mark Otto
038d6f8061 more utilities 2015-04-14 01:01:30 -07:00
Mark Otto
8303b7b8c9 nuke shadows for now 2015-04-14 01:01:15 -07:00
Mark Otto
53a3ff74ca redo sidenav 2015-04-13 19:00:59 -07:00