Skip to content

Commit

Permalink
switch to postcss-preset-env
Browse files Browse the repository at this point in the history 
closes #147
  • Loading branch information
@robjtede
robjtede committed Jul 22, 2018
1 parent 28b1e2e commit 3c57949
Show file tree
Hide file tree
Showing 23 changed files with 2,536 additions and 1,137 deletions.
3,481 changes: 2,433 additions & 1,048 deletions package-lock.json
View file

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions package.json
View file
Expand Up @@ -26,23 +26,23 @@
},
"dependencies": {
"@angular/animations": "^6.1.0-rc.0",
"@angular/cdk": "^6.3.3",
"@angular/cdk": "^6.4.0",
"@angular/common": "^6.1.0-rc.0",
"@angular/compiler": "^6.1.0-rc.0",
"@angular/core": "^6.1.0-rc.0",
"@angular/platform-browser": "^6.1.0-rc.0",
"@angular/platform-browser-dynamic": "^6.1.0-rc.0",
"@angular/router": "^6.1.0-rc.0",
"@fortawesome/angular-fontawesome": "^0.1.1",
"@fortawesome/fontawesome-svg-core": "^1.2.0",
"@fortawesome/free-brands-svg-icons": "^5.1.0",
"@fortawesome/free-regular-svg-icons": "^5.1.0",
"@fortawesome/free-solid-svg-icons": "^5.1.0",
"@fortawesome/fontawesome-svg-core": "^1.2.1",
"@fortawesome/free-brands-svg-icons": "^5.1.1",
"@fortawesome/free-regular-svg-icons": "^5.1.1",
"@fortawesome/free-solid-svg-icons": "^5.1.1",
"@ngrx/effects": "^6.0.1",
"@ngrx/router-store": "^6.0.1",
"@ngrx/store": "^6.0.1",
"@ngrx/store-devtools": "^6.0.1",
"@swimlane/ngx-charts": "^8.1.0",
"@swimlane/ngx-charts": "^9.0.0",
"common-tags": "^1.8.0",
"core-js": "^2.5.7",
"d3": "^5.5.0",
Expand Down Expand Up @@ -84,7 +84,7 @@
"devtron": "^1.4.0",
"eclint": "^2.8.0",
"electron": "^3.0.0-beta.3",
"electron-builder": "^20.21.2",
"electron-builder": "^20.24.4",
"electron-devtools-installer": "^2.2.4",
"electron-reload": "^1.2.5",
"file-loader": "^1.1.11",
Expand All @@ -94,17 +94,17 @@
"json-types": "^1.0.0",
"lint-staged": "^7.2.0",
"mini-css-extract-plugin": "^0.4.1",
"postcss": "^6.0.23",
"postcss-cssnext": "^3.1.0",
"postcss": "^7.0.1",
"postcss-color-gray": "^4.1.0",
"postcss-easing-gradients": "^3.0.0",
"postcss-loader": "^2.1.6",
"postcss-preset-env": "^5.2.3",
"prettier": "^1.13.7",
"style-loader": "^0.21.0",
"to-string-loader": "^1.1.5",
"tslib": "^1.9.3",
"tslint": "^5.10.0",
"typescript": "^2.9.2",
"webpack": "^4.16.0",
"webpack-cli": "^3.0.8"
"webpack": "^4.16.1",
"webpack-cli": "^3.1.0"
}
}
8 changes: 0 additions & 8 deletions postcss.config.js
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/app/components/amount.component.css
View file
Expand Up @@ -24,6 +24,6 @@
}

.local {
color: var(--local-color, var(--dark-grey, gray(128)));
color: var(--local-color, var(--dark-gray, gray(128)));
font-size: var(--local-size, 0.8em);
}
4 changes: 3 additions & 1 deletion src/app/components/app.component.css
View file
@@ -1,3 +1,5 @@
@import url('../style/vars.css');

:host {
height: 100vh;
display: grid;
Expand Down Expand Up @@ -60,7 +62,7 @@ header {
margin-top: 0.4em;
margin-bottom: 0;

color: var(--label-grey);
color: var(--label-gray);
font-size: 0.8rem;
letter-spacing: 0.025em;
text-transform: uppercase;
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/app.component.ts
View file
Expand Up @@ -12,7 +12,7 @@ import { Store } from '@ngrx/store'
import Debug = require('debug')
import { Account, Amount, extractBalanceAndSpent } from 'monzolib'
import { Observable, fromEvent } from 'rxjs'
import { filter, map, tap } from 'rxjs/operators'
import { filter, map } from 'rxjs/operators'

import { ModalService } from '../services/modal.service'
import { AppState, DefiniteAccountState, DefiniteBalanceState } from '../store'
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/auth-request.component.css
View file
Expand Up @@ -67,7 +67,7 @@ header {
font-size: 1rem;

border-radius: 5px;
border: 1px solid var(--label-grey);
border: 1px solid var(--label-gray);
}
}

Expand All @@ -85,7 +85,7 @@ header {

background-color: inherit;
border-radius: 5px;
border: 1px solid var(--label-grey);
border: 1px solid var(--label-gray);

&:hover {
cursor: pointer;
Expand Down
6 changes: 3 additions & 3 deletions src/app/components/btn.component.css
View file
@@ -1,6 +1,6 @@
:host {
--bg-color: var(--off-white);
--text-color: var(--dark-grey);
--text-color: var(--dark-gray);

display: contents;
}
Expand All @@ -11,7 +11,7 @@
}

:host([secondary]) {
/* color(var(--green) shade(10%)) */
/* color-mod(var(--green) shade(10%)) */
--bg-color: hsl(130, 51%, 52%);
--text-color: var(--off-white);
}
Expand All @@ -27,7 +27,7 @@
}

:host([dark]) {
--bg-color: var(--dark-grey);
--bg-color: var(--dark-gray);
--text-color: var(--off-white);
}

Expand Down
32 changes: 16 additions & 16 deletions src/app/components/category-dialog.component.css
View file
Expand Up @@ -25,7 +25,7 @@ h1 {
justify-self: end;

cursor: pointer;
color: var(--dark-grey);
color: var(--dark-gray);

&:hover {
color: var(--black);
Expand Down Expand Up @@ -53,46 +53,46 @@ h1 {
cursor: pointer;

/* pass in via var() from component */
&[data-category=groceries] {
&[data-category='groceries'] {
--category-color: gold;
}
&[data-category=transport] {
&[data-category='transport'] {
--category-color: teal;
}
&[data-category=entertainment] {
&[data-category='entertainment'] {
--category-color: orangered;
}
&[data-category=eating_out] {
&[data-category='eating_out'] {
--category-color: crimson;
}
&[data-category=cash] {
&[data-category='cash'] {
--category-color: olivedrab;
}
&[data-category=mondo] {
&[data-category='mondo'] {
--category-color: olivedrab;
}
&[data-category=monzo] {
&[data-category='monzo'] {
--category-color: olivedrab;
}
&[data-category=general] {
--category-color: slategrey;
&[data-category='general'] {
--category-color: slategray;
}
&[data-category=bills] {
&[data-category='bills'] {
--category-color: cornflowerblue;
}
&[data-category=holidays] {
&[data-category='holidays'] {
--category-color: orchid;
}
&[data-category=shopping] {
&[data-category='shopping'] {
--category-color: coral;
}
&[data-category=expenses] {
&[data-category='expenses'] {
--category-color: darkkhaki;
}
&[data-category=family] {
&[data-category='family'] {
--category-color: var(--red);
}
&[data-category=personal_care] {
&[data-category='personal_care'] {
--category-color: var(--pink);
}

Expand Down
4 changes: 2 additions & 2 deletions src/app/components/get-client-info.component.css
View file
Expand Up @@ -55,7 +55,7 @@ form {
font-size: 1.2rem;

border-radius: 5px;
border: 1px solid var(--label-grey);
border: 1px solid var(--label-gray);
}

& .submit {
Expand All @@ -66,7 +66,7 @@ form {

background-color: inherit;
border-radius: 5px;
border: 1px solid var(--label-grey);
border: 1px solid var(--label-gray);

&:hover {
cursor: pointer;
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/get-client-info.component.ts
View file
@@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'
import { Router } from '@angular/router'
import { from } from 'rxjs'
import { switchMap } from 'rxjs/operators'
import Debug = require('debug')

Expand Down Expand Up @@ -27,8 +28,7 @@ export class GetClientInfoComponent implements OnInit {
debug('saving client info')

// no parallelism allowed due to get-get-set-set problem
this.monzo
.saveCode('client_id', clientId)
from(this.monzo.saveCode('client_id', clientId))
.pipe(switchMap(() => this.monzo.saveCode('client_secret', clientSecret)))
.subscribe(() => {
debug('saved id and secret')
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/pot-summary.component.css
View file
Expand Up @@ -4,7 +4,7 @@
overflow: hidden;

background-color: var(--white);
border: 1px solid var(--light-grey);
border: 1px solid var(--light-gray);
border-radius: 5px;

box-shadow: 0 1px 8px hsla(0, 0%, 0%, 0.2);
Expand Down Expand Up @@ -101,7 +101,7 @@ hr {
}

.info > * > :nth-of-type(3) {
color: var(--dark-grey);
color: var(--dark-gray);
text-align: right;
}

Expand Down
4 changes: 2 additions & 2 deletions src/app/components/transaction-attachment.component.css
View file
Expand Up @@ -22,9 +22,9 @@ img {
padding-left: 1px;

background: rgb(200, 50, 30);
border: 1px solid var(--medium-grey);
border: 1px solid var(--medium-gray);
border-radius: 50%;
box-shadow: 1px 1px 2px grey;
box-shadow: 1px 1px 2px gray;
cursor: pointer;

font-size: 0.5rem;
Expand Down
20 changes: 10 additions & 10 deletions src/app/components/transaction-detail.component.css
View file
Expand Up @@ -32,7 +32,7 @@
}

&([data-category=general]) {
--category-color: slategrey;
--category-color: slategray;
}

&([data-category=bills]) {
Expand Down Expand Up @@ -167,7 +167,7 @@
padding: 1em 15px 0;

font-size: 1.2rem;
color: color(red saturation(-20%));
color: color-mod(red saturation(-20%));
}

.amount-wrap {
Expand All @@ -185,7 +185,7 @@ m-amount {
--positive-color: green;

@nest :host(.declined) & {
--negative-color: color(red saturation(-20%));
--negative-color: color-mod(red saturation(-20%));
}
}

Expand All @@ -194,7 +194,7 @@ m-amount {
content: var(--label-text);
display: block;

color: var(--label-grey);
color: var(--label-gray);
font-size: 1rem;
}

Expand Down Expand Up @@ -235,7 +235,7 @@ m-amount {
}

& textarea:hover {
border-color: var(--light-grey);
border-color: var(--light-gray);
}

& a {
Expand All @@ -254,7 +254,7 @@ m-amount {
padding-left: 15px;
padding-right: 15px;

color: var(--label-grey);
color: var(--label-gray);
}

& .scroll-wrap {
Expand Down Expand Up @@ -284,7 +284,7 @@ m-amount {

white-space: normal;

border: 1px solid var(--label-grey);
border: 1px solid var(--label-gray);
border-radius: 5px;
cursor: pointer;

Expand All @@ -293,7 +293,7 @@ m-amount {
}

&:active {
background-color: var(--light-grey);
background-color: var(--light-gray);
}

& > p {
Expand All @@ -313,15 +313,15 @@ m-amount {
padding: 0.8em 15px;

font-size: 0.8rem;
color: var(--medium-grey);
color: var(--medium-gray);
white-space: pre-wrap;
}

.smallprint::before {
content: var(--label-text);
display: block;

color: var(--label-grey);
color: var(--label-gray);
}

.date {
Expand Down

0 comments on commit 3c57949

Please sign in to comment.