Commit a13ea6d2 authored by Nick Stenning's avatar Nick Stenning

Merge pull request #2534 from robertknight/autoprefix_css

Use autoprefixer to add vendor prefixes to CSS
parents f022ed02 f9417006
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
} }
.annotator-bucket-indicator { .annotator-bucket-indicator {
@include box-sizing(border-box); box-sizing: border-box;
background: $white; background: $white;
border: solid 1px $gray-lighter; border: solid 1px $gray-lighter;
border-radius: 2px 4px 4px 2px; border-radius: 2px 4px 4px 2px;
......
...@@ -5,7 +5,7 @@ $base-font-size: 14px; ...@@ -5,7 +5,7 @@ $base-font-size: 14px;
//ADDER//////////////////////////////// //ADDER////////////////////////////////
.annotator-adder { .annotator-adder {
@include box-sizing(border-box); box-sizing: border-box;
direction: ltr; direction: ltr;
height: 35px; height: 35px;
margin-left: -20px; margin-left: -20px;
...@@ -151,7 +151,7 @@ $base-font-size: 14px; ...@@ -151,7 +151,7 @@ $base-font-size: 14px;
} }
ul, li { ul, li {
@include box-sizing(border-box); box-sizing: border-box;
@include reset-box-model; @include reset-box-model;
@include reset-list-style; @include reset-list-style;
} }
......
@import 'compass'; @import 'compass';
@import 'compass/css3/flexbox';
$base-font-size: 12px; $base-font-size: 12px;
$base-line-height: 20px; $base-line-height: 20px;
...@@ -101,12 +100,8 @@ $group-list-width: 270px; ...@@ -101,12 +100,8 @@ $group-list-width: 270px;
} }
.group-item { .group-item {
@include display-flex; display: flex;
@include flex-direction(row); flex-direction: row;
// IE 10 support
display: -ms-flexbox;
-ms-flex-direction: row;
padding: 10px; padding: 10px;
cursor: pointer; cursor: pointer;
...@@ -133,6 +128,7 @@ $group-list-width: 270px; ...@@ -133,6 +128,7 @@ $group-list-width: 270px;
.group-details { .group-details {
margin-right: 20px; margin-right: 20px;
flex-shrink: 1;
} }
.share-link-container { .share-link-container {
......
@import "compass/css3"; @import 'compass/css3';
@import 'compass/reset/utilities'; @import 'compass/reset/utilities';
@import "./variables"; @import "./variables";
...@@ -6,15 +6,13 @@ ...@@ -6,15 +6,13 @@
/* Style input placeholders */ /* Style input placeholders */
@mixin placeholder { @mixin placeholder {
&.placeholder { @content; } &.placeholder { @content; }
&:-moz-placeholder { @content; } &:placeholder { @content; }
&::-moz-placeholder { @content; } &::placeholder { @content; }
&:-ms-input-placeholder { @content; }
&::-webkit-input-placeholder { @content; }
} }
/* Shadow mixins */ /* Shadow mixins */
@mixin smallshadow($a: 0, $b: 1px, $c: .1) { @mixin smallshadow($a: 0, $b: 1px, $c: .1) {
@include box-shadow($a $b 1px hsla(0, 0%, 0%, $c)); box-shadow: $a $b 1px hsla(0, 0%, 0%, $c);
} }
@mixin quote { @mixin quote {
......
...@@ -29,8 +29,6 @@ body { ...@@ -29,8 +29,6 @@ body {
} }
p { p {
-webkit-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto; hyphens: auto;
& + p { & + p {
......
@import 'compass/css3/user-interface';
//MARKDOWN EDITOR ////////////////////////// //MARKDOWN EDITOR //////////////////////////
.markdown-preview { .markdown-preview {
overflow: auto; overflow: auto;
...@@ -18,7 +16,7 @@ ...@@ -18,7 +16,7 @@
width: 100%; width: 100%;
margin-bottom: -.1em; margin-bottom: -.1em;
padding: .7em .7em .7em .5em; padding: .7em .7em .7em .5em;
@include user-select(none); user-select: none;
&.disable { &.disable {
.markdown-tools-button { .markdown-tools-button {
......
@import 'compass/css3/box-sizing';
@import 'compass/reset'; @import 'compass/reset';
/* /*
...@@ -6,12 +5,13 @@ ...@@ -6,12 +5,13 @@
adopted from http://necolas.github.com/normalize.css/ adopted from http://necolas.github.com/normalize.css/
*/ */
* { @include box-sizing(border-box); } * {
box-sizing: border-box;
}
html { html {
height: 100%; height: 100%;
-webkit-text-size-adjust: 100%; text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
} }
body { min-height: 100%; font-size: 100%; } body { min-height: 100%; font-size: 100%; }
......
@import 'compass/css3/flexbox';
@import "base.scss"; @import "base.scss";
@import "mixins/icons"; @import "mixins/icons";
.simple-search-form { .simple-search-form {
@include display-flex; display: flex;
@include flex-flow(row nowrap); flex-flow: row nowrap;
/* IE10 support */
display: -ms-flexbox;
-ms-flex-flow: row nowrap;
position: relative; position: relative;
color: $gray-dark; color: $gray-dark;
...@@ -24,12 +18,8 @@ ...@@ -24,12 +18,8 @@
} }
input.simple-search-input { input.simple-search-input {
@include flex-grow(1); flex-grow: 1;
@include order(1); order: 1;
/* IE10 support */
-ms-flex: 1;
-ms-flex-order: 1;
color: $text-color; color: $text-color;
border: none; border: none;
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
// http://mbenford.github.io/ngTagsInput/gettingstarted // http://mbenford.github.io/ngTagsInput/gettingstarted
@import "mixins/forms"; @import "mixins/forms";
@import "compass/css3/user-interface";
@import "variables"; @import "variables";
tags-input { tags-input {
...@@ -56,7 +55,7 @@ tags-input { ...@@ -56,7 +55,7 @@ tags-input {
} }
.remove-button { .remove-button {
@include user-select(none); user-select: none;
display: block; display: block;
position: absolute; position: absolute;
top: 0; top: 0;
...@@ -110,8 +109,6 @@ tags-input .autocomplete { ...@@ -110,8 +109,6 @@ tags-input .autocomplete {
width: 100%; width: 100%;
background-color: white; background-color: white;
border: thin solid rgba(0, 0, 0, 0.2); border: thin solid rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0 .3em .6em rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 .3em .6em rgba(0, 0, 0, 0.2);
box-shadow: 0 .3em .6em rgba(0, 0, 0, 0.2); box-shadow: 0 .3em .6em rgba(0, 0, 0, 0.2);
.suggestion-list { .suggestion-list {
......
...@@ -28,15 +28,11 @@ $thread-padding: 1em; ...@@ -28,15 +28,11 @@ $thread-padding: 1em;
margin-left: -$thread-padding; margin-left: -$thread-padding;
} }
@-webkit-keyframes pulse {
10% { background-color: #ffc; }
}
@keyframes pulse { @keyframes pulse {
10% { background-color: #ffc; } 10% { background-color: #ffc; }
} }
&.pulse { &.pulse {
-webkit-animation: pulse 1200ms ease-in-out;
animation: pulse 1200ms ease-in-out; animation: pulse 1200ms ease-in-out;
} }
......
@import 'compass/css3/flexbox';
@import 'base'; @import 'base';
@import 'mixins/responsive'; @import 'mixins/responsive';
...@@ -17,23 +15,16 @@ ...@@ -17,23 +15,16 @@
} }
.topbar .inner { .topbar .inner {
@include display-flex; display: flex;
@include flex-flow(row nowrap); flex-flow: row nowrap;
@include align-items(center); align-items: center;
@include justify-content(space-between); justify-content: space-between;
/* IE10 support */
display: -ms-flexbox;
-ms-flex-align: center;
-ms-flex-flow: row nowrap;
-ms-flex-pack: justify;
height: 28px; height: 28px;
} }
.topbar .inner .simple-search { .topbar .inner .simple-search {
@include flex-grow(1); flex-grow: 1;
-ms-flex: 1; /* IE10 support */
margin-right: .75em; margin-right: .75em;
overflow: hidden; overflow: hidden;
} }
......
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
"unorm": "^1.3.3" "unorm": "^1.3.3"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.0.3",
"chai": "^3.2.0", "chai": "^3.2.0",
"es6-promise": "^3.0.2",
"jscs": "^1.13.1", "jscs": "^1.13.1",
"karma": "^0.13.10", "karma": "^0.13.10",
"karma-browserify": "^3.0.3", "karma-browserify": "^3.0.3",
...@@ -57,6 +59,7 @@ ...@@ -57,6 +59,7 @@
"mocha": "^1.20.1", "mocha": "^1.20.1",
"phantom-ownpropertynames": "^1.0.0", "phantom-ownpropertynames": "^1.0.0",
"phantomjs": "^1.9.7", "phantomjs": "^1.9.7",
"postcss": "^5.0.6",
"proxyquire": "^1.6.0", "proxyquire": "^1.6.0",
"proxyquire-universal": "^1.0.8", "proxyquire-universal": "^1.0.8",
"proxyquireify": "^3.0.0", "proxyquireify": "^3.0.0",
......
#!/usr/bin/env node
// post-process CSS using PostCSS
// (https://github.com/postcss/postcss)
//
// This adds vendor prefixes using autoprefixer
// https://github.com/postcss/autoprefixer
require('es6-promise').polyfill();
var autoprefixer = require('autoprefixer');
var postcss = require('postcss');
var inputCss = '';
process.stdin.on('data', function (chunk) {
inputCss += chunk;
});
process.stdin.on('end', function () {
postcss([autoprefixer])
.process(inputCss)
.then(function (result) {
console.log(result.css);
});
});
Markdown is supported
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