Skip to content
GitLab
Commit aae9c2d1 authored by Mark Otto's avatar Mark Otto
Browse files

merge, compile

parent dbe95f02
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 8086 additions and 2903 deletions
+8086 -2903
.csscomb.json
+ 315
- 319
View file @ aae9c2d1
{ {
"exclude": [
".git/**", "always-semicolon": true,
"node_modules/**" "block-indent": true,
], "colon-space": true,
"always-semicolon": true, "color-case": "lower",
"block-indent": true, "color-shorthand": true,
"colon-space": true, "combinator-space": true,
"color-case": "lower", "element-case": "lower",
"color-shorthand": true, "eof-newline": true,
"combinator-space": true, "leading-zero": false,
"element-case": "lower", "remove-empty-rulesets": true,
"eof-newline": true, "rule-indent": 2,
"leading-zero": false, "unitless-zero": true,
"remove-empty-rulesets": true, "vendor-prefix-align": true,
"rule-indent": true,
"stick-brace": "\n", "sort-order": [
"strip-spaces": true, [
"unitless-zero": true, "font",
"vendor-prefix-align": true, "font-family",
"sort-order": [ "font-size",
[ "font-weight",
"font", "font-style",
"font-family", "font-variant",
"font-size", "font-size-adjust",
"font-weight", "font-stretch",
"font-style", "font-effect",
"font-variant", "font-emphasize",
"font-size-adjust", "font-emphasize-position",
"font-stretch", "font-emphasize-style",
"font-effect", "font-smooth",
"font-emphasize", "line-height"
"font-emphasize-position", ],
"font-emphasize-style", [
"font-smooth", "position",
"line-height" "z-index",
], "top",
[ "right",
"position", "bottom",
"z-index", "left"
"top", ],
"right", [
"bottom", "display",
"left" "visibility",
], "float",
[ "clear",
"display", "overflow",
"visibility", "overflow-x",
"float", "overflow-y",
"clear", "-ms-overflow-x",
"overflow", "-ms-overflow-y",
"overflow-x", "clip",
"overflow-y", "zoom",
"-ms-overflow-x", "flex-direction",
"-ms-overflow-y", "flex-order",
"clip", "flex-pack",
"zoom", "flex-align"
"flex-direction", ],
"flex-order", [
"flex-pack", "-webkit-box-sizing",
"flex-align" "-moz-box-sizing",
], "box-sizing",
[ "width",
"-webkit-box-sizing", "min-width",
"-moz-box-sizing", "max-width",
"box-sizing", "height",
"width", "min-height",
"min-width", "max-height",
"max-width", "margin",
"height", "margin-top",
"min-height", "margin-right",
"max-height", "margin-bottom",
"margin", "margin-left",
"margin-top", "padding",
"margin-right", "padding-top",
"margin-bottom", "padding-right",
"margin-left", "padding-bottom",
"padding", "padding-left"
"padding-top", ],
"padding-right", [
"padding-bottom", "table-layout",
"padding-left" "empty-cells",
], "caption-side",
[ "border-spacing",
"table-layout", "border-collapse",
"empty-cells", "list-style",
"caption-side", "list-style-position",
"border-spacing", "list-style-type",
"border-collapse", "list-style-image"
"list-style", ],
"list-style-position", [
"list-style-type", "content",
"list-style-image" "quotes",
], "counter-reset",
[ "counter-increment",
"content", "resize",
"quotes", "cursor",
"counter-reset", "-webkit-user-select",
"counter-increment", "-moz-user-select",
"resize", "-ms-user-select",
"cursor", "user-select",
"-webkit-user-select", "nav-index",
"-moz-user-select", "nav-up",
"-ms-user-select", "nav-right",
"user-select", "nav-down",
"nav-index", "nav-left",
"nav-up", "-webkit-transition",
"nav-right", "-moz-transition",
"nav-down", "-ms-transition",
"nav-left", "-o-transition",
"-webkit-transition", "transition",
"-moz-transition", "-webkit-transition-delay",
"-ms-transition", "-moz-transition-delay",
"-o-transition", "-ms-transition-delay",
"transition", "-o-transition-delay",
"-webkit-transition-delay", "transition-delay",
"-moz-transition-delay", "-webkit-transition-timing-function",
"-ms-transition-delay", "-moz-transition-timing-function",
"-o-transition-delay", "-ms-transition-timing-function",
"transition-delay", "-o-transition-timing-function",
"-webkit-transition-timing-function", "transition-timing-function",
"-moz-transition-timing-function", "-webkit-transition-duration",
"-ms-transition-timing-function", "-moz-transition-duration",
"-o-transition-timing-function", "-ms-transition-duration",
"transition-timing-function", "-o-transition-duration",
"-webkit-transition-duration", "transition-duration",
"-moz-transition-duration", "-webkit-transition-property",
"-ms-transition-duration", "-moz-transition-property",
"-o-transition-duration", "-ms-transition-property",
"transition-duration", "-o-transition-property",
"-webkit-transition-property", "transition-property",
"-moz-transition-property", "-webkit-transform",
"-ms-transition-property", "-moz-transform",
"-o-transition-property", "-ms-transform",
"transition-property", "-o-transform",
"-webkit-transform", "transform",
"-moz-transform", "-webkit-transform-origin",
"-ms-transform", "-moz-transform-origin",
"-o-transform", "-ms-transform-origin",
"transform", "-o-transform-origin",
"-webkit-transform-origin", "transform-origin",
"-moz-transform-origin", "-webkit-animation",
"-ms-transform-origin", "-moz-animation",
"-o-transform-origin", "-ms-animation",
"transform-origin", "-o-animation",
"-webkit-animation", "animation",
"-moz-animation", "-webkit-animation-name",
"-ms-animation", "-moz-animation-name",
"-o-animation", "-ms-animation-name",
"animation", "-o-animation-name",
"-webkit-animation-name", "animation-name",
"-moz-animation-name", "-webkit-animation-duration",
"-ms-animation-name", "-moz-animation-duration",
"-o-animation-name", "-ms-animation-duration",
"animation-name", "-o-animation-duration",
"-webkit-animation-duration", "animation-duration",
"-moz-animation-duration", "-webkit-animation-play-state",
"-ms-animation-duration", "-moz-animation-play-state",
"-o-animation-duration", "-ms-animation-play-state",
"animation-duration", "-o-animation-play-state",
"-webkit-animation-play-state", "animation-play-state",
"-moz-animation-play-state", "-webkit-animation-timing-function",
"-ms-animation-play-state", "-moz-animation-timing-function",
"-o-animation-play-state", "-ms-animation-timing-function",
"animation-play-state", "-o-animation-timing-function",
"-webkit-animation-timing-function", "animation-timing-function",
"-moz-animation-timing-function", "-webkit-animation-delay",
"-ms-animation-timing-function", "-moz-animation-delay",
"-o-animation-timing-function", "-ms-animation-delay",
"animation-timing-function", "-o-animation-delay",
"-webkit-animation-delay", "animation-delay",
"-moz-animation-delay", "-webkit-animation-iteration-count",
"-ms-animation-delay", "-moz-animation-iteration-count",
"-o-animation-delay", "-ms-animation-iteration-count",
"animation-delay", "-o-animation-iteration-count",
"-webkit-animation-iteration-count", "animation-iteration-count",
"-moz-animation-iteration-count", "-webkit-animation-direction",
"-ms-animation-iteration-count", "-moz-animation-direction",
"-o-animation-iteration-count", "-ms-animation-direction",
"animation-iteration-count", "-o-animation-direction",
"-webkit-animation-direction", "animation-direction",
"-moz-animation-direction", "text-align",
"-ms-animation-direction", "-webkit-text-align-last",
"-o-animation-direction", "-moz-text-align-last",
"animation-direction", "-ms-text-align-last",
"text-align", "text-align-last",
"-webkit-text-align-last", "vertical-align",
"-moz-text-align-last", "white-space",
"-ms-text-align-last", "text-decoration",
"text-align-last", "text-emphasis",
"vertical-align", "text-emphasis-color",
"white-space", "text-emphasis-style",
"text-decoration", "text-emphasis-position",
"text-emphasis", "text-indent",
"text-emphasis-color", "-ms-text-justify",
"text-emphasis-style", "text-justify",
"text-emphasis-position", "letter-spacing",
"text-indent", "word-spacing",
"-ms-text-justify", "-ms-writing-mode",
"text-justify", "text-outline",
"letter-spacing", "text-transform",
"word-spacing", "text-wrap",
"-ms-writing-mode", "text-overflow",
"text-outline", "-ms-text-overflow",
"text-transform", "text-overflow-ellipsis",
"text-wrap", "text-overflow-mode",
"text-overflow", "-ms-word-wrap",
"-ms-text-overflow", "word-wrap",
"text-overflow-ellipsis", "word-break",
"text-overflow-mode", "-ms-word-break",
"-ms-word-wrap", "-moz-tab-size",
"word-wrap", "-o-tab-size",
"word-break", "tab-size",
"-ms-word-break", "-webkit-hyphens",
"-moz-tab-size", "-moz-hyphens",
"-o-tab-size", "hyphens",
"tab-size", "pointer-events"
"-webkit-hyphens", ],
"-moz-hyphens", [
"hyphens", "opacity",
"pointer-events" "filter:progid:DXImageTransform.Microsoft.Alpha(Opacity",
], "-ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha",
[ "-ms-interpolation-mode",
"opacity", "color",
"filter:progid:DXImageTransform.Microsoft.Alpha(Opacity", "border",
"-ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha", "border-width",
"-ms-interpolation-mode", "border-style",
"color", "border-color",
"border", "border-top",
"border-width", "border-top-width",
"border-style", "border-top-style",
"border-color", "border-top-color",
"border-top", "border-right",
"border-top-width", "border-right-width",
"border-top-style", "border-right-style",
"border-top-color", "border-right-color",
"border-right", "border-bottom",
"border-right-width", "border-bottom-width",
"border-right-style", "border-bottom-style",
"border-right-color", "border-bottom-color",
"border-bottom", "border-left",
"border-bottom-width", "border-left-width",
"border-bottom-style", "border-left-style",
"border-bottom-color", "border-left-color",
"border-left", "-webkit-border-radius",
"border-left-width", "-moz-border-radius",
"border-left-style", "border-radius",
"border-left-color", "-webkit-border-top-left-radius",
"-webkit-border-radius", "-moz-border-radius-topleft",
"-moz-border-radius", "border-top-left-radius",
"border-radius", "-webkit-border-top-right-radius",
"-webkit-border-top-left-radius", "-moz-border-radius-topright",
"-moz-border-radius-topleft", "border-top-right-radius",
"border-top-left-radius", "-webkit-border-bottom-right-radius",
"-webkit-border-top-right-radius", "-moz-border-radius-bottomright",
"-moz-border-radius-topright", "border-bottom-right-radius",
"border-top-right-radius", "-webkit-border-bottom-left-radius",
"-webkit-border-bottom-right-radius", "-moz-border-radius-bottomleft",
"-moz-border-radius-bottomright", "border-bottom-left-radius",
"border-bottom-right-radius", "-webkit-border-image",
"-webkit-border-bottom-left-radius", "-moz-border-image",
"-moz-border-radius-bottomleft", "-o-border-image",
"border-bottom-left-radius", "border-image",
"-webkit-border-image", "-webkit-border-image-source",
"-moz-border-image", "-moz-border-image-source",
"-o-border-image", "-o-border-image-source",
"border-image", "border-image-source",
"-webkit-border-image-source", "-webkit-border-image-slice",
"-moz-border-image-source", "-moz-border-image-slice",
"-o-border-image-source", "-o-border-image-slice",
"border-image-source", "border-image-slice",
"-webkit-border-image-slice", "-webkit-border-image-width",
"-moz-border-image-slice", "-moz-border-image-width",
"-o-border-image-slice", "-o-border-image-width",
"border-image-slice", "border-image-width",
"-webkit-border-image-width", "-webkit-border-image-outset",
"-moz-border-image-width", "-moz-border-image-outset",
"-o-border-image-width", "-o-border-image-outset",
"border-image-width", "border-image-outset",
"-webkit-border-image-outset", "-webkit-border-image-repeat",
"-moz-border-image-outset", "-moz-border-image-repeat",
"-o-border-image-outset", "-o-border-image-repeat",
"border-image-outset", "border-image-repeat",
"-webkit-border-image-repeat", "outline",
"-moz-border-image-repeat", "outline-width",
"-o-border-image-repeat", "outline-style",
"border-image-repeat", "outline-color",
"outline", "outline-offset",
"outline-width", "background",
"outline-style", "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader",
"outline-color", "background-color",
"outline-offset", "background-image",
"background", "background-repeat",
"filter:progid:DXImageTransform.Microsoft.AlphaImageLoader", "background-attachment",
"background-color", "background-position",
"background-image", "background-position-x",
"background-repeat", "-ms-background-position-x",
"background-attachment", "background-position-y",
"background-position", "-ms-background-position-y",
"background-position-x", "-webkit-background-clip",
"-ms-background-position-x", "-moz-background-clip",
"background-position-y", "background-clip",
"-ms-background-position-y", "background-origin",
"-webkit-background-clip", "-webkit-background-size",
"-moz-background-clip", "-moz-background-size",
"background-clip", "-o-background-size",
"background-origin", "background-size",
"-webkit-background-size", "box-decoration-break",
"-moz-background-size", "-webkit-box-shadow",
"-o-background-size", "-moz-box-shadow",
"background-size", "box-shadow",
"box-decoration-break", "filter:progid:DXImageTransform.Microsoft.gradient",
"-webkit-box-shadow", "-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient",
"-moz-box-shadow", "text-shadow"
"box-shadow", ]
"filter:progid:DXImageTransform.Microsoft.gradient",
"-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient",
"text-shadow"
] ]
] }
}
\ No newline at end of file
Gruntfile.js
+ 7
- 6
View file @ aae9c2d1
...@@ -112,7 +112,8 @@ module.exports = function (grunt) { ...@@ -112,7 +112,8 @@ module.exports = function (grunt) {
}, },
minify: { minify: {
options: { options: {
compress: true compress: true,
report: 'min'
}, },
files: { files: {
'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css', 'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css',
...@@ -124,13 +125,13 @@ module.exports = function (grunt) { ...@@ -124,13 +125,13 @@ module.exports = function (grunt) {
csscomb: { csscomb: {
sort: { sort: {
options: { options: {
sortOrder: '.csscomb.json', sortOrder: '.csscomb.json'
}, },
files: { files: {
'dist/css/<%= pkg.name %>.sorted.css': ['dist/css/<%= pkg.name %>.css'], 'dist/css/<%= pkg.name %>.css': ['dist/css/<%= pkg.name %>.css'],
'dist/css/<%= pkg.name %>.min.sorted.css': ['dist/css/<%= pkg.name %>.min.css'], 'dist/css/<%= pkg.name %>.min.css': ['dist/css/<%= pkg.name %>.min.css'],
'dist/css/<%= pkg.name %>-theme.sorted.css': ['dist/css/<%= pkg.name %>-theme.css'], 'dist/css/<%= pkg.name %>-theme.css': ['dist/css/<%= pkg.name %>-theme.css'],
'dist/css/<%= pkg.name %>-theme.min.sorted.css': ['dist/css/<%= pkg.name %>-theme.min.css'] 'dist/css/<%= pkg.name %>-theme.min.css': ['dist/css/<%= pkg.name %>-theme.min.css']
} }
} }
}, },
......
dist/css/bootstrap-theme.css
+ 103
- 153
View file @ aae9c2d1
This diff is collapsed.
dist/css/bootstrap-theme.min.css
+ 264
- 1
View file @ aae9c2d1
This diff is collapsed.
dist/css/bootstrap.css
+ 1650
- 2423
View file @ aae9c2d1
This diff is collapsed.
dist/css/bootstrap.min.css
+ 5747
- 1
View file @ aae9c2d1
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment