From c5dc7bedb4870742c36f39ebc97b56071b262cea Mon Sep 17 00:00:00 2001 From: Emmanuel Roussel Date: Thu, 26 Jan 2017 22:13:45 -0500 Subject: [PATCH 1/6] Change sass color variables to stockpile branding --- src/theme/variables.scss | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/theme/variables.scss b/src/theme/variables.scss index d188bf0..cc879db 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -5,16 +5,6 @@ $font-path: "../assets/fonts"; @import "ionic.globals"; -// Shared Variables -// -------------------------------------------------- -// To customize the look and feel of this app, you can override -// the Sass variables found in Ionic's source scss files. -// To view all the possible Ionic variables, see: -// http://ionicframework.com/docs/v2/theming/overriding-ionic-variables/ - - - - // Named Color Variables // -------------------------------------------------- // Named colors makes it easy to reuse colors on various components. @@ -24,19 +14,27 @@ $font-path: "../assets/fonts"; // The "primary" color is the only required color in the map. $colors: ( - primary: #387ef5, - secondary: #32db64, + primary: #6d435a, + secondary: #ff6978, danger: #f53d3d, - light: #f4f4f4, - dark: #222 + light: #fffcf9, + dark: #352d39 ); -// App iOS Variables +// Shared Variables // -------------------------------------------------- -// iOS only Sass variables can go here +// To customize the look and feel of this app, you can override +// the Sass variables found in Ionic's source scss files. +// To view all the possible Ionic variables, see: +// http://ionicframework.com/docs/v2/theming/overriding-ionic-variables/ + +$background-color: #b1ede8; +// App iOS Variables +// -------------------------------------------------- +// iOS only Sass variables can go here // App Material Design Variables From 45e0353dc8811be1cd166e2ab7bbb6627da5adf2 Mon Sep 17 00:00:00 2001 From: Emmanuel Roussel Date: Thu, 26 Jan 2017 22:25:45 -0500 Subject: [PATCH 2/6] Change tabs and toolbar styles to match branding --- src/theme/variables.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/theme/variables.scss b/src/theme/variables.scss index cc879db..5ee5904 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -30,6 +30,12 @@ $colors: ( // http://ionicframework.com/docs/v2/theming/overriding-ionic-variables/ $background-color: #b1ede8; +$tabs-background: color($colors, primary); +$toolbar-background: color($colors, primary); + +$text-color: color($colors, dark); +$tabs-tab-color-active: color($colors, light); +$tabs-tab-color-inactive: color($colors, light); // App iOS Variables @@ -41,7 +47,7 @@ $background-color: #b1ede8; // -------------------------------------------------- // Material Design only Sass variables can go here - +$tabs-md-tab-color-inactive: color($colors, light); // App Windows Variables From 7e040bb51a379408164e1d6ea4e053f5bc5aca81 Mon Sep 17 00:00:00 2001 From: Emmanuel Roussel Date: Mon, 30 Jan 2017 21:28:38 -0500 Subject: [PATCH 3/6] Change secondary and danger colors --- src/theme/variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 5ee5904..d9a169f 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -15,8 +15,8 @@ $font-path: "../assets/fonts"; $colors: ( primary: #6d435a, - secondary: #ff6978, - danger: #f53d3d, + secondary: #b1ede8, + danger: #ff6978, light: #fffcf9, dark: #352d39 ); From 54fc010aded61e1d02fbbdc54a09a47b69dcc69a Mon Sep 17 00:00:00 2001 From: Emmanuel Roussel Date: Mon, 30 Jan 2017 21:28:58 -0500 Subject: [PATCH 4/6] Remove background color --- src/theme/variables.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/theme/variables.scss b/src/theme/variables.scss index d9a169f..723c48f 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -29,7 +29,6 @@ $colors: ( // To view all the possible Ionic variables, see: // http://ionicframework.com/docs/v2/theming/overriding-ionic-variables/ -$background-color: #b1ede8; $tabs-background: color($colors, primary); $toolbar-background: color($colors, primary); From 22ef1e8b590a81337c6ade0a3d90a3254cc4e39d Mon Sep 17 00:00:00 2001 From: Emmanuel Roussel Date: Tue, 31 Jan 2017 14:40:49 -0500 Subject: [PATCH 5/6] Add proxy for development in browser --- ionic.config.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ionic.config.json b/ionic.config.json index 6aa55d6..02c5340 100644 --- a/ionic.config.json +++ b/ionic.config.json @@ -2,5 +2,11 @@ "name": "stockpile", "app_id": "", "v2": true, - "typescript": true + "typescript": true, + "proxies": [ + { + "path": "/api", + "proxyUrl": "http://localhost:5000" + } + ] } From 5430b0de84ef1b4cae52ec5735fd51c9e4aa666a Mon Sep 17 00:00:00 2001 From: Emmanuel Roussel Date: Wed, 1 Feb 2017 20:59:26 -0500 Subject: [PATCH 6/6] Fix ionicons import path --- src/theme/variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 723c48f..2a2f793 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -71,7 +71,7 @@ $tabs-md-tab-color-inactive: color($colors, light); // The premium icon font for Ionic. For more info, please see: // http://ionicframework.com/docs/v2/ionicons/ -@import "ionicons"; +@import "ionic.ionicons"; // Fonts