2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Commit Graph

1694 Commits

Author SHA1 Message Date
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