rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
10,886 Commits 108 Branches 89 Tags 552 MiB
e444c2c58f
Commit Graph

34 Commits

Author SHA1 Message Date
Mark Otto
3737cb1d46 Use grid classes or mixins on .dl-horizontal, update docs to include it, removes auto truncate and makes .text-overflow mixin into a .text-truncate class and mixin combo for better granularity 2014-12-11 14:12:10 -08:00
Mark Otto
826aeec6e8 Merge pull request #13 from twbs/default-vars 
Apply !default to SCSS variables
 2014-12-11 12:20:05 -08:00
Mark Otto
2edc779391 Merge branch 'v4' into scss-lint 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	scss/_card.scss
 2014-12-11 12:07:09 -08:00
Mark Otto
f7e103a6ac Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2014-12-11 12:06:16 -08:00
Mark Otto
fef873a840 fix all validation, turn off some settings, add sort order 2014-12-11 12:05:29 -08:00
Gleb Mazovetskiy
76d6b17f4f Merge pull request #6 from twbs/grid-framework-refactor 
Refactor grid_framework
 2014-12-11 15:16:42 +00:00
Mark Otto
0e371ddf87 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css.map
 2014-12-10 20:51:17 -08:00
Chris Rebert
23aa0340df Apply !default to SCSS variables 
Per @thomas-mcdonald
 2014-12-09 16:24:05 -08:00
Mark Otto
63639f9913 Merge pull request #9 from twbs/less-vendor-prefixing 
_progress.scss: remove unnecessary @-webkit-keyframes
 2014-12-08 22:48:03 -08:00
Mark Otto
70855a7d29 Merge pull request #10 from twbs/bye-gradient-vendors 
remove explicit vendor prefixes from _gradients.scss
 2014-12-08 22:47:42 -08:00
Chris Rebert
86f834e356 remove explicit vendor prefixing from _card.scss 2014-12-08 22:05:50 -08:00
Chris Rebert
b59abb40f7 remove explicit vendor prefixes from _gradients.scss 2014-12-08 22:00:05 -08:00
Chris Rebert
94eecb84bf _progress.scss: remove unnecessary @-webkit-keyframes 
Autoprefixer already takes care of this for us.
 2014-12-08 20:36:33 -08:00
Chris Rebert
16bd4a2787 SCSS-Lint: StringQuotes: double_quotes , to match current style 2014-12-08 20:00:13 -08:00
Chris Rebert
2e91a3d6a7 temporarily disable PropertySortOrder since it defaults to alphabetical 2014-12-08 19:59:23 -08:00
Chris Rebert
1e4f280b19 SCSS-Lint: disable arbitrary selector/nesting depth limits 2014-12-08 19:58:25 -08:00
Chris Rebert
895be6efb0 SCSS-Lint: SpaceBeforeBrace: allow_single_line_padding: true 2014-12-08 19:57:05 -08:00
Chris Rebert
2d244d118b add default SCSS-Lint config 2014-12-08 19:00:05 -08:00
Gleb Mazovetskiy
5fefe06c3d Refactor grid-framework followup 
* Split up calc-grid-column, generate selectors in make-grid
* Iterate over $grid-breakpoints and (pull, push, offset)
 2014-12-07 16:22:39 +00:00
Gleb Mazovetskiy
795a584561 Refactor grid_framework 
A more idiomatic refactoring of the grid framework

* Use %-placeholder instead of generating a class name list
* Use if expression
* Remove loop-grid-columns
 2014-12-07 13:44:24 +00:00
Mark Otto
2ade44a9ca inline-block on labels now instead of inline 2014-12-06 00:33:36 -08:00
Mark Otto
ebfe358495 tweak label component padding 2014-12-06 00:18:11 -08:00
Mark Otto
bc3a2f669d fix vars order, remove rando grid class from mixin 2014-12-04 22:32:39 -08:00
Mark Otto
a1a3a007b6 tweak grid docs, add new tier 2014-12-04 21:02:04 -08:00
Mark Otto
32878bca7f fix margin on tables 2014-12-04 15:25:57 -08:00
Mark Otto
854dc065e4 fix blockquote margins, remify values 2014-12-04 15:19:23 -08:00
Mark Otto
8e454b6f1d fix hr margins, remify border width 2014-12-04 15:18:16 -08:00
Mark Otto
b811553147 new look for carousel example, convert to rems 2014-12-04 14:18:13 -08:00
Mark Otto
6fe75ead07 no need for .container's max-width: 100% since we use max-width now on all containers 2014-12-04 01:03:41 -08:00
Mark Otto
248e0e4059 fix heading margins 2014-12-04 01:03:23 -08:00
Mark Otto
4474630d77 restore px to base font size var 2014-12-04 00:10:24 -08:00
Mark Otto
c213ff820a fix the variables i broke, temporarily disabling line-height-computed 2014-12-04 00:09:37 -08:00
Mark Otto
bafd0b057e fix broken textarea.form-control reported by @thomas-mcdonald 2014-12-03 11:23:53 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00