Skip to content

Commit

Permalink
[IN-219] CSS Fixes (#147)
Browse files Browse the repository at this point in the history 
* Make .alert-maintenance apply globally
  * Update autoprefixer config to backfill *grid* attributes for IE
  • Loading branch information
@chrisseto @alexschiller
chrisseto authored and alexschiller committed Aug 21, 2018
1 parent 33c6f5d commit 76aeec7
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 66 deletions.
2 changes: 1 addition & 1 deletion app/styles/_global.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ body > :global(.ember-view) {
padding: 0;
}

.alert-maintenance {
:global(.alert-maintenance) {
margin-bottom: 0;
}

Expand Down
4 changes: 4 additions & 0 deletions ember-cli-build.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
const Funnel = require('broccoli-funnel');
const jQueryPackage = require('jquery/package.json');
const autoprefixer = require('autoprefixer');

module.exports = function(defaults) {
// const EMBER_DATA_VERSION = defaults.project.addonPackages['ember-data'].pkg.version;
Expand Down Expand Up @@ -80,6 +81,9 @@ module.exports = function(defaults) {
headerModules: [
'reviews/styles/headers',
],
plugins: [
autoprefixer({ grid: true }),
],
},
'ember-cli-babel': {
includePolyfill: true,
Expand Down
6 changes: 4 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"test": "tests"
},
"repository": "",
"browserslist": [
"last 2 major versions"
],
"scripts": {
"build": "ember build",
"start": "ember server",
Expand All @@ -23,15 +26,14 @@
"@centerforopenscience/eslint-config": "^2.0.0",
"@centerforopenscience/osf-style": "1.7.0",
"@cos-forks/ember-content-placeholders": "https://github.com/cos-forks/ember-content-placeholders#c85cdbeb4b9c206c3f76a92422db76815b2c95bc",
"autoprefixer": "^9.1.2",
"bootstrap-sass": "^3.3.7",
"broccoli-asset-rev": "^2.4.5",
"coveralls": "^3.0.0",
"ember-bootstrap": "^1.0.0-rc.1",
"ember-cli": "2.16.2",
"ember-cli-app-version": "^3.0.0",
"ember-cli-autoprefixer": "^0.8.1",
"ember-cli-babel": "^6.3.0",
"ember-cli-bootstrap-sassy": "^0.5.8",
"ember-cli-code-coverage": "^0.4.2",
"ember-cli-dependency-checker": "^2.0.1",
"ember-cli-eslint": "^4.2.0",
Expand Down
116 changes: 53 additions & 63 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ atob@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"

autoprefixer@^7.0.0:
autoprefixer@^7.1.2:
version "7.2.6"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc"
dependencies:
Expand All @@ -524,26 +524,26 @@ autoprefixer@^7.0.0:
postcss "^6.0.17"
postcss-value-parser "^3.2.3"

autoprefixer@^7.1.2:
version "7.1.6"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.6.tgz#fb933039f74af74a83e71225ce78d9fd58ba84d7"
autoprefixer@^8.0.0:
version "8.6.5"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.6.5.tgz#343f3d193ed568b3208e00117a1b96eb691d4ee9"
dependencies:
browserslist "^2.5.1"
caniuse-lite "^1.0.30000748"
browserslist "^3.2.8"
caniuse-lite "^1.0.30000864"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^6.0.13"
postcss "^6.0.23"
postcss-value-parser "^3.2.3"

autoprefixer@^8.0.0:
version "8.6.0"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.6.0.tgz#6da6b0791e15cb0ebf33c3f299414afd340672c0"
autoprefixer@^9.1.2:
version "9.1.2"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.2.tgz#73672614e3ee43a433b84c1c2a4b1ca392d2f6a1"
dependencies:
browserslist "^3.2.8"
caniuse-lite "^1.0.30000847"
browserslist "^4.0.2"
caniuse-lite "^1.0.30000877"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^6.0.22"
postcss "^7.0.2"
postcss-value-parser "^3.2.3"

aws-sign2@~0.6.0:
Expand Down Expand Up @@ -1377,7 +1377,7 @@ bootstrap-datepicker@^1.6.4:
dependencies:
jquery ">=1.7.1 <4.0.0"

bootstrap-sass@^3.0.0, bootstrap-sass@^3.3.7:
bootstrap-sass@^3.3.7:
version "3.3.7"
resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498"

Expand Down Expand Up @@ -1445,14 +1445,6 @@ broccoli-asset-rewrite@^1.1.0:
dependencies:
broccoli-filter "^1.2.3"

broccoli-autoprefixer@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/broccoli-autoprefixer/-/broccoli-autoprefixer-5.0.0.tgz#68c9f3bfdfff9df2d39e46545b9cf9d4443d6a16"
dependencies:
autoprefixer "^7.0.0"
broccoli-persistent-filter "^1.1.6"
postcss "^6.0.1"

broccoli-babel-transpiler@^5.6.2:
version "5.7.2"
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.7.2.tgz#756c30544775144e984333b7115f42c916ba08e0"
Expand Down Expand Up @@ -1960,7 +1952,7 @@ broccoli@^1.1.0:
tmp "0.0.31"
underscore.string "^3.2.2"

browserslist@^2.1.2, browserslist@^2.2.2, browserslist@^2.5.1:
browserslist@^2.1.2, browserslist@^2.2.2:
version "2.9.0"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.9.0.tgz#706aca15c53be15610f466e348cbfa0c00a6a379"
dependencies:
Expand All @@ -1981,6 +1973,14 @@ browserslist@^3.2.8:
caniuse-lite "^1.0.30000844"
electron-to-chromium "^1.3.47"

browserslist@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.0.2.tgz#294388f5844bb3ab15ef7394ca17f49bf7a4e6f1"
dependencies:
caniuse-lite "^1.0.30000876"
electron-to-chromium "^1.3.57"
node-releases "^1.0.0-alpha.11"

bser@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
Expand Down Expand Up @@ -2085,17 +2085,13 @@ can-symlink@^1.0.0:
dependencies:
tmp "0.0.28"

caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000760:
caniuse-lite@^1.0.30000760:
version "1.0.30000760"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000760.tgz#ec720395742f1c7ec8947fd6dd2604e77a8f98ff"

caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805:
version "1.0.30000850"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000850.tgz#e68a88db4ea598b4c33b8419f7385473e4802495"

caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000847:
version "1.0.30000849"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000849.tgz#7e1aa48e6d58917dcd70aabf7e7a33514a258f91"
caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30000876, caniuse-lite@^1.0.30000877:
version "1.0.30000878"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000878.tgz#c644c39588dd42d3498e952234c372e5a40a4123"

capture-exit@^1.1.0:
version "1.2.0"
Expand Down Expand Up @@ -2890,9 +2886,9 @@ electron-to-chromium@^1.3.27:
version "1.3.27"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"

electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.47:
version "1.3.48"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz#d3b0d8593814044e092ece2108fc3ac9aea4b900"
electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.57:
version "1.3.59"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.59.tgz#6377db04d8d3991d6286c72ed5c3fde6f4aaf112"

ember-ace@^1.2.0:
version "1.3.1"
Expand Down Expand Up @@ -2960,13 +2956,6 @@ ember-cli-app-version@^3.0.0:
ember-cli-babel "^6.8.0"
git-repo-version "0.4.1"

ember-cli-autoprefixer@^0.8.1:
version "0.8.1"
resolved "https://registry.yarnpkg.com/ember-cli-autoprefixer/-/ember-cli-autoprefixer-0.8.1.tgz#071dd9574451057b03dcc03b71f5bd9cb07ef332"
dependencies:
broccoli-autoprefixer "^5.0.0"
lodash "^4.0.0"

ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7, ember-cli-babel@^5.2.1:
version "5.2.4"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.4.tgz#5ce4f46b08ed6f6d21e878619fb689719d6e8e13"
Expand Down Expand Up @@ -3012,17 +3001,6 @@ ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.9.2:
ember-cli-version-checker "^2.1.0"
semver "^5.4.1"

ember-cli-bootstrap-sassy@^0.5.8:
version "0.5.8"
resolved "https://registry.yarnpkg.com/ember-cli-bootstrap-sassy/-/ember-cli-bootstrap-sassy-0.5.8.tgz#9bb6d4c3f7f8a634fc51b0f2a29983d82e88b404"
dependencies:
bootstrap-sass "^3.0.0"
broccoli-funnel "^1.2.0"
broccoli-merge-trees "^2.0.0"
broccoli-stew "^1.5.0"
ember-cli-babel "^6.6.0"
resolve "^1.1.7"

ember-cli-broccoli-sane-watcher@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-2.0.4.tgz#f43f42f75b7509c212fb926cd9aea86ae19264c6"
Expand Down Expand Up @@ -3766,16 +3744,6 @@ ember-maybe-import-regenerator@^0.1.5:
ember-cli-babel "^6.0.0-beta.4"
regenerator-runtime "^0.9.5"

"ember-metrics@git+https://github.com/cos-forks/ember-metrics.git#v0.12.1+cos0":
version "0.12.1"
uid "32fcc6eec0c4bc1974c854435401f94f660c6e74"
resolved "git+https://github.com/cos-forks/ember-metrics.git#32fcc6eec0c4bc1974c854435401f94f660c6e74"
dependencies:
broccoli-funnel "^1.0.1"
ember-cli-babel "^6.1.0"
ember-getowner-polyfill "^2.0.0"
ember-runtime-enumerable-includes-polyfill "^2.0.0"

"ember-metrics@https://github.com/cos-forks/ember-metrics#v0.12.1+cos0":
version "0.12.1"
resolved "https://github.com/cos-forks/ember-metrics#32fcc6eec0c4bc1974c854435401f94f660c6e74"
Expand Down Expand Up @@ -7260,6 +7228,12 @@ node-pre-gyp@^0.6.39:
tar "^2.2.1"
tar-pack "^3.4.0"

node-releases@^1.0.0-alpha.11:
version "1.0.0-alpha.11"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.11.tgz#73c810acc2e5b741a17ddfbb39dfca9ab9359d8a"
dependencies:
semver "^5.3.0"

node-sass@^4.1.0:
version "4.6.1"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.6.1.tgz#9b331cf943ee5440f199e858941a90d13bc9bfc5"
Expand Down Expand Up @@ -7871,7 +7845,7 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"

[email protected], postcss@^6.0.1, postcss@^6.0.16, postcss@^6.0.17, postcss@^6.0.22, postcss@^6.0.6:
[email protected], postcss@^6.0.1, postcss@^6.0.16, postcss@^6.0.6:
version "6.0.22"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.22.tgz#e23b78314905c3b90cbd61702121e7a78848f2a3"
dependencies:
Expand Down Expand Up @@ -7904,6 +7878,22 @@ postcss@^6.0.14, postcss@^6.0.19, postcss@^6.0.21:
source-map "^0.6.1"
supports-color "^5.3.0"

postcss@^6.0.17, postcss@^6.0.23:
version "6.0.23"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
dependencies:
chalk "^2.4.1"
source-map "^0.6.1"
supports-color "^5.4.0"

postcss@^7.0.2:
version "7.0.2"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.2.tgz#7b5a109de356804e27f95a960bef0e4d5bc9bb18"
dependencies:
chalk "^2.4.1"
source-map "^0.6.1"
supports-color "^5.4.0"

prelude-ls@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
Expand Down

0 comments on commit 76aeec7

Please sign in to comment.