From 752d6aa9e3a68b17ff6613cfc03f767b91e8975a Mon Sep 17 00:00:00 2001 From: EnesAlili Date: Thu, 6 Oct 2016 19:14:46 +0100 Subject: [PATCH] Front-end and design tweaks --- app/app/styles/color.scss | 10 +++++----- app/app/styles/view/document/content.scss | 2 +- app/app/styles/view/document/wizard.scss | 11 +++++------ app/app/styles/view/document/wysiwyg.scss | 6 +++--- app/app/styles/view/page-documents.scss | 1 + app/app/templates/components/layout/zone-header.hbs | 2 +- app/package.json | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/app/styles/color.scss b/app/app/styles/color.scss index d63354bb..37cf0a98 100644 --- a/app/app/styles/color.scss +++ b/app/app/styles/color.scss @@ -10,26 +10,26 @@ // https://documize.com $color-off-white: #f5f5f5; -$color-off-black: #333333; +$color-off-black: #393939; $color-black: #000000; $color-white: #ffffff; -$color-primary: #115a97; +$color-primary: #2667af; $color-red: #d04134; $color-green: #4caf50; -$color-blue: #115a97; +$color-blue: #2667af; $color-gray: #8b9096; $color-goldy: #cc9933; $color-header: #f3f5f8; $color-link: #0092d3; -$color-border: #e1e1e1; +$color-border: #f3f5f8; $color-input: #5a5a5a; $color-stroke: #e1e1e1; $color-tooltip: #a1a1a1; $color-toast: #4c4c4c; -$color-checkbox: #115a97; +$color-checkbox: #2667af; $color-card-active: #f7fcff; $color-chip: #98A2AB; diff --git a/app/app/styles/view/document/content.scss b/app/app/styles/view/document/content.scss index 609b88c1..e784254e 100644 --- a/app/app/styles/view/document/content.scss +++ b/app/app/styles/view/document/content.scss @@ -43,7 +43,7 @@ } > .file { - font-size: 0.9rem; + font-size: 1rem; } } diff --git a/app/app/styles/view/document/wizard.scss b/app/app/styles/view/document/wizard.scss index d6678429..59cdf405 100644 --- a/app/app/styles/view/document/wizard.scss +++ b/app/app/styles/view/document/wizard.scss @@ -13,10 +13,11 @@ cursor: pointer; padding: 10px 5px; margin: 5px 0; + @include ease-in(); &:hover { @include ease-in(); - + > .details { > .title { color: $color-primary; @@ -31,22 +32,20 @@ .icon { text-align: center; display: inline-block; - padding-right: 20px; width: 50px; > .img { float: left; text-align: center; display: inline-block; - height: 45px; - width: 45px; + height: 40px; + width: 40px; } } > .details { vertical-align: top; display: inline-block; - float: left; width: 80%; > .title { @@ -58,7 +57,7 @@ > .desc { color: $color-gray; - font-size: 0.8rem; + font-size: 0.9rem; margin-top: 5px; } } diff --git a/app/app/styles/view/document/wysiwyg.scss b/app/app/styles/view/document/wysiwyg.scss index 56874af7..2baebd3a 100644 --- a/app/app/styles/view/document/wysiwyg.scss +++ b/app/app/styles/view/document/wysiwyg.scss @@ -45,8 +45,8 @@ h1 { - font-size: 2em; - font-weight: bold; + font-size: 1.6em; + font-family: open_sansregular; color:$color-off-black; margin: 30px 0 20px 0; } @@ -134,7 +134,7 @@ border-width: 2px; } th { - background: #e6e6e6; + background: #efefef; } } } diff --git a/app/app/styles/view/page-documents.scss b/app/app/styles/view/page-documents.scss index 6a541785..d1487116 100644 --- a/app/app/styles/view/page-documents.scss +++ b/app/app/styles/view/page-documents.scss @@ -57,6 +57,7 @@ width: 100%; position: relative; transition: .3s; + border-bottom: 1px solid $color-border; &:hover { > .link { diff --git a/app/app/templates/components/layout/zone-header.hbs b/app/app/templates/components/layout/zone-header.hbs index 84d0567b..612d89a0 100644 --- a/app/app/templates/components/layout/zone-header.hbs +++ b/app/app/templates/components/layout/zone-header.hbs @@ -1,5 +1,5 @@
-
+
 {{title}}
diff --git a/app/package.json b/app/package.json index 4785ef5b..53c15c41 100644 --- a/app/package.json +++ b/app/package.json @@ -21,7 +21,7 @@ "devDependencies": { "broccoli-asset-rev": "^2.4.2", "ember-ajax": "2.3.2", - "ember-cli": "2.8.0", + "ember-cli": "^2.8.0", "ember-cli-app-version": "^1.0.0", "ember-cli-babel": "^5.1.6", "ember-cli-dependency-checker": "^1.2.0", @@ -32,9 +32,9 @@ "ember-cli-mirage": "^0.2.0", "ember-cli-qunit": "^2.1.0", "ember-cli-release": "0.2.9", - "ember-cli-test-loader": "^1.1.0", "ember-cli-sass": "5.3.1", "ember-cli-sri": "^2.1.0", + "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", "ember-data": "^2.8.0", "ember-export-application-global": "^1.0.5",