diff --git a/docs/docs.scss b/docs/docs.scss index 83ab505f..e5dd9762 100644 --- a/docs/docs.scss +++ b/docs/docs.scss @@ -149,9 +149,9 @@ section:last-child { } .docs-logo { - @include display(flex); - @include align-items(center); - @include justify-content(center); + display: flex; + align-items: center; + justify-content: center; position: relative; box-sizing: border-box; height: 100%; @@ -178,9 +178,9 @@ section:last-child { height: 100%; .footer-logo-box { - @include display(flex); - @include align-items(center); - @include justify-content(center); + display: flex; + align-items: center; + justify-content: center; } .powered-by, @@ -307,8 +307,8 @@ table { /* -- -- -- -- -- -- -- -- -- -- -- -- -- */ /* example styling */ .example { - @include display(flex); - @include flex-direction(column); + display: flex; + flex-direction: column; @include justify-content(flex-start); box-sizing: border-box; padding: 1.25em; @@ -351,10 +351,10 @@ table { /* -- -- -- -- -- -- -- -- -- -- -- -- -- */ /* intro specific styling */ .hp-header { - @include display(flex); - @include align-items(center); - @include justify-content(space-between); - @include flex-direction(row); + display: flex; + align-items: center; + justify-content: space-between; + flex-direction: row; width: 100%; background: $mainNavBg; @@ -394,9 +394,9 @@ table { } .intro-content.top { - @include display(flex); - @include align-items(center); - @include flex-direction(row); + display: flex; + align-items: center; + flex-direction: row; box-sizing: border-box; .hero-image { @@ -418,8 +418,8 @@ table { } .intro-content.bottom { - @include display(flex); - @include flex-direction(row); + display: flex; + flex-direction: row; box-sizing: border-box; .hero-block { @@ -494,8 +494,8 @@ table { .intro-block { .intro-content.top { - @include align-items(flex-start); - @include flex-direction(column); + align-items: flex-start; + flex-direction: column; .hero-image { width: 50%; @@ -521,7 +521,7 @@ table { } .intro-content.bottom { - @include flex-direction(column); + flex-direction: column; .hero-block { width: 100%; @@ -541,7 +541,7 @@ table { .docs-footer { .footer-logo-box { - @include flex-direction(row); + flex-direction: row; } } } @@ -557,9 +557,9 @@ table { } .hp-header { - @include align-items(flex-start); - @include justify-content(center); - @include flex-direction(column); + align-items: flex-start; + justify-content: center; + flex-direction: column; .docs-logo { display: none; @@ -568,7 +568,7 @@ table { .docs-footer { .footer-logo-box { - @include flex-direction(column); + flex-direction: column; } .powered-by, diff --git a/grunt/tasks/build.js b/grunt/tasks/build.js index 05b9e817..179b8566 100644 --- a/grunt/tasks/build.js +++ b/grunt/tasks/build.js @@ -68,6 +68,17 @@ module.exports = function(grunt) { } }, + postcss: { + options: { + processors: [ + require('autoprefixer')({browsers: 'last 2 versions'}) + ] + }, + dist: { + src: '<%= build_dir %>/**/*.css' + } + }, + uglify: { dist: { files: [{ @@ -324,6 +335,7 @@ module.exports = function(grunt) { 'clean:build', 'copy:build', 'sass:dist', + 'postcss', 'cssUrlEmbed', 'style:imports', 'hogan_static:fonts', @@ -339,6 +351,7 @@ module.exports = function(grunt) { 'clean:build', 'copy:build', 'sass:dev', + 'postcss', 'style:imports', 'hogan_static:fonts', 'hogan_static:index' diff --git a/package.json b/package.json index eb6165d3..c8795bb0 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ ], "license": "BSD", "devDependencies": { + "autoprefixer": "^6.0.3", "grunt": "*", "grunt-banner": "^0.3.1", "grunt-bump": "^0.3.0", @@ -27,6 +28,7 @@ "grunt-github-changes": "0.0.6", "grunt-hogan-static": "0.3.0", "grunt-jsonlint": "^1.0.4", + "grunt-postcss": "^0.7.0", "grunt-sass": "*", "grunt-shell": "^1.1.2", "grunt-text-replace": "^0.4.0", diff --git a/src/mm-action/mm-action.scss b/src/mm-action/mm-action.scss index 1e4e0351..ee65dcd9 100644 --- a/src/mm-action/mm-action.scss +++ b/src/mm-action/mm-action.scss @@ -24,8 +24,8 @@ } .action { - @include display(inline-flex); - @include align-items(center); + display: inline-flex; + align-items: center; color: inherit; cursor: pointer; diff --git a/src/mm-button/mm-button.scss b/src/mm-button/mm-button.scss index 1f235fa5..77c45a83 100644 --- a/src/mm-button/mm-button.scss +++ b/src/mm-button/mm-button.scss @@ -35,5 +35,5 @@ .button.fit { @include fitContent(); - @include justify-content(center); + justify-content: center; } \ No newline at end of file diff --git a/src/mm-calendar/mm-calendar.scss b/src/mm-calendar/mm-calendar.scss index 70c1267f..c86b9aa6 100644 --- a/src/mm-calendar/mm-calendar.scss +++ b/src/mm-calendar/mm-calendar.scss @@ -45,9 +45,9 @@ } .month-year { - @include display(flex); - @include align-items(center); - @include justify-content(space-between); + display: flex; + align-items: center; + justify-content: space-between; margin-bottom: 4px; .left-arrow, .right-arrow { @@ -55,7 +55,7 @@ } .left-arrow { - @include transform(scaleX(-1)); + transform: scaleX(-1); } } @@ -128,7 +128,7 @@ &.last.selected { &::before { @include pointerBg($color-D15); - @include transform(scaleX(-1)); + transform: scaleX(-1); left: -3px; } } @@ -164,7 +164,7 @@ &.last.selected:hover { &::before { @include pointerBg($color-D21); - @include transform(scaleX(-1)); + transform: scaleX(-1); left: -3px; } } diff --git a/src/mm-checkbox/mm-checkbox.scss b/src/mm-checkbox/mm-checkbox.scss index cbafc882..b14c09c8 100644 --- a/src/mm-checkbox/mm-checkbox.scss +++ b/src/mm-checkbox/mm-checkbox.scss @@ -17,7 +17,7 @@ margin-right: 7px; cursor: pointer; white-space: nowrap; - @include user-select(none); + user-select: none; .icon { color: inherit; @@ -40,13 +40,13 @@ :host(:active) .checkbox { border-color: $color-A17; box-shadow: inset 1px 1px 0 $color-A18; - @include background-image(linear-gradient(bottom, $color-A15 0%, $color-A16 100%)); + background-image: linear-gradient(to top, $color-A15 0%, $color-A16 100%); &.partial, &.selected { border-color: $color-D18; box-shadow: inset 1px 1px 0 $color-D19; - @include background-image(linear-gradient(bottom, $color-D16 0%, $color-D17 100%)); + background-image: linear-gradient(to top, $color-D16 0%, $color-D17 100%); } } @@ -63,7 +63,7 @@ border-radius: 3px; background-color: $color-A14; box-shadow: inset 0 1px 0 rgba(255,255,255,.27); - @include background-image(linear-gradient(bottom, $color-A9 0%, $color-F0 100%)); + background-image: linear-gradient(to top, $color-A9 0%, $color-F0 100%); width:16px; height: 16px; position: relative; @@ -96,7 +96,7 @@ &.selected { border-color: $color-D13; box-shadow: inset 1px 1px 0 rgba(255,255,255,.2); - @include background-image(linear-gradient(bottom, $color-D14 0%, $color-D15 100%)); + background-image: linear-gradient(to top, $color-D14 0%, $color-D15 100%); } } diff --git a/src/mm-docs-nav/mm-docs-nav.scss b/src/mm-docs-nav/mm-docs-nav.scss index f989134b..4be51ec5 100644 --- a/src/mm-docs-nav/mm-docs-nav.scss +++ b/src/mm-docs-nav/mm-docs-nav.scss @@ -20,19 +20,19 @@ } #labelArea { - @include display(flex); - @include align-items(center); - @include justify-content(space-between); + display: flex; + align-items: center; + justify-content: space-between; box-sizing: border-box; padding: 10px 20px; & > ::content mm-header, mm-icon { pointer-events: none; - @include user-select(none); + user-select: none; } mm-icon.opened { - @include transform(scaleY(-1)); + transform: scaleY(-1); } } diff --git a/src/mm-docs-shell/mm-docs-shell.scss b/src/mm-docs-shell/mm-docs-shell.scss index 0ea7cfe2..a5d61a20 100644 --- a/src/mm-docs-shell/mm-docs-shell.scss +++ b/src/mm-docs-shell/mm-docs-shell.scss @@ -44,8 +44,8 @@ } .mobile-header-box { - @include display(flex); - @include align-items(center); + display: flex; + align-items: center; position: absolute; left: 0; diff --git a/src/mm-drawer/mm-drawer.scss b/src/mm-drawer/mm-drawer.scss index bd2e98d0..d36e3e67 100644 --- a/src/mm-drawer/mm-drawer.scss +++ b/src/mm-drawer/mm-drawer.scss @@ -31,7 +31,7 @@ #container { overflow: hidden; - @include transition(height 0.3s ease-in-out); + transition: height 0.3s ease-in-out; } #content { @@ -40,10 +40,10 @@ #toggle { @include fontSmoothing(); - @include user-select(none); + user-select: none; position: absolute; left: 50%; - @include transform(translateX(-50%)); + transform: translateX(-50%); padding: 5px 7px; background: inherit; border: inherit; @@ -56,12 +56,12 @@ mm-icon { color: #525252; vertical-align: inherit; - @include transform(scaleY(-1)); + transform: scaleY(-1); } &.expanded { mm-icon { - @include transform(scaleY(1)); + transform: scaleY(1); } } } diff --git a/src/mm-footer/mm-footer.scss b/src/mm-footer/mm-footer.scss index eb6c3e7e..e55cad92 100644 --- a/src/mm-footer/mm-footer.scss +++ b/src/mm-footer/mm-footer.scss @@ -18,9 +18,9 @@ @include fit(); ._mm_footer { - @include display(flex); - @include align-items(center); - @include justify-content(space-between); + display: flex; + align-items: center; + justify-content: space-between; box-sizing: border-box; border-top: $color-A9 solid 1px; background-color: $color-A12; diff --git a/src/mm-grid-column/mm-grid-column.scss b/src/mm-grid-column/mm-grid-column.scss index 40ead56d..265f6ff5 100644 --- a/src/mm-grid-column/mm-grid-column.scss +++ b/src/mm-grid-column/mm-grid-column.scss @@ -9,7 +9,7 @@ @import "_mixins"; :host { - @include display(flex); + display: flex; vertical-align: middle; position: relative; padding: 6px 10px; @@ -24,10 +24,10 @@ polyfill-next-selector { content: ':host > ._mm_container'; } ._mm_container { - @include user-select(none); - @include display(flex); - @include align-items(center); - @include justify-content(space-between); + user-select: none; + display: flex; + align-items: center; + justify-content: space-between; font-family: "Arimo", sans-serif; font-weight: bold; font-size: 11px; @@ -35,12 +35,12 @@ polyfill-next-selector { content: ':host > ._mm_container'; } width: 100%; &.right { - @include justify-content(end); + justify-content: end; } .left-items { - @include display(flex); - @include align-items(center); + display: flex; + align-items: center; } } @@ -54,16 +54,16 @@ polyfill-next-selector { content: ':host > ._mm_container'; } #info, #sort { margin-left: 5px; - @include flex-shrink(0); + flex-shrink: 0; } #sort { &.asc { - @include transform(scaleY(1)); + transform: scaleY(1); } &.des{ - @include transform(scaleY(-1)); + transform: scaleY(-1); } } diff --git a/src/mm-grid-item/mm-grid-item.scss b/src/mm-grid-item/mm-grid-item.scss index 9f2b42f4..265dd335 100644 --- a/src/mm-grid-item/mm-grid-item.scss +++ b/src/mm-grid-item/mm-grid-item.scss @@ -59,11 +59,11 @@ polyfill-next-selector { content: ':host ._mm_item'; } ::content .expansion-row { border-bottom: 1px solid $color-A9; padding: 10px 10px 10px 40px; - @include display(flex); + display: flex; } ::content .expansion-col { margin-right: 20px; - @include flex-grow(1); + flex-grow: 1; } diff --git a/src/mm-grid/mm-grid.scss b/src/mm-grid/mm-grid.scss index b98e30b1..b5a31d4b 100644 --- a/src/mm-grid/mm-grid.scss +++ b/src/mm-grid/mm-grid.scss @@ -26,10 +26,10 @@ #header, #footer { /*position: fixed;*/ - @include display(flex); + display: flex; min-width: 100%; background: $color-A16; - @include user-select(none); + user-select: none; box-shadow: 0px 0px 5px 0px $color-A5; } @@ -52,7 +52,7 @@ #separator { display: none; - @include transform(translateZ(0)); + transform: translateZ(0); position: absolute; top: 0; height: 100%; @@ -84,7 +84,7 @@ } #columnContainer { - @include display(flex); - @include flex(1); + display: flex; + flex: 1; width: 100%; } \ No newline at end of file diff --git a/src/mm-group/mm-group.scss b/src/mm-group/mm-group.scss index 59046ecf..b7df9ae9 100644 --- a/src/mm-group/mm-group.scss +++ b/src/mm-group/mm-group.scss @@ -26,13 +26,13 @@ :host([align=horizontal]), :host([align=vertical]) { - @include display(inline-flex); + display: inline-flex; } :host([align=vertical]) { - @include flex-direction(column); + flex-direction: column; } :host([align=horizontal][fitparent]) { - @include justify-content(space-between); + justify-content: space-between; } diff --git a/src/mm-input-mask/mm-input-mask.html b/src/mm-input-mask/mm-input-mask.html index cba5116d..cd845a22 100644 --- a/src/mm-input-mask/mm-input-mask.html +++ b/src/mm-input-mask/mm-input-mask.html @@ -22,7 +22,7 @@