From a52c2fb04c830fe650b62415a9beb260f5f1a2ac Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 1 Jul 2019 14:20:28 +0300 Subject: [PATCH] Flextype Core: Default Theme #165 - look and feel updates --- .../themes/default/assets/scss/base/main.scss | 4 ++- .../assets/scss/generic/variables.scss | 31 +++++++++++-------- site/themes/default/templates/about.html | 4 +++ .../default/templates/partials/base.html | 2 +- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/site/themes/default/assets/scss/base/main.scss b/site/themes/default/assets/scss/base/main.scss index 216f0719..f8354368 100755 --- a/site/themes/default/assets/scss/base/main.scss +++ b/site/themes/default/assets/scss/base/main.scss @@ -20,7 +20,7 @@ p, select, textarea { font-family: $base-font-family; - font-weight: 400; + font-weight: 300; color: black; } @@ -51,4 +51,6 @@ pre { h1 { font-size: 60px; + margin-top: 20px; + margin-bottom: 30px; } diff --git a/site/themes/default/assets/scss/generic/variables.scss b/site/themes/default/assets/scss/generic/variables.scss index 96398a7a..5930be07 100755 --- a/site/themes/default/assets/scss/generic/variables.scss +++ b/site/themes/default/assets/scss/generic/variables.scss @@ -5,23 +5,28 @@ // // Base // -$base-font-family: Helvetica, arial, sans-serif; -$base-font-color: #606060; -$base-font-size: 16px; -$base-line-height: 24px; +$base-font-family: 'Roboto', sans-serif; +$base-font-color: #606060; +$base-font-size: 16px; +$base-line-height: 24px; // // Colors Grayscale // -$black: #000000; -$gray-darkest: lighten($black, 13.5%); // #222222 -$gray-darker: lighten($black, 26.5%); // #444444 -$gray-dark: lighten($black, 46.7%); // #777777 -$gray: lighten($black, 66.5%); // #aaaaaa -$gray-light: lighten($black, 87%); // #dedede -$gray-lighter: lighten($black, 93.75%); // #efefef +$black: #000000; +$gray-darkest: lighten($black, 13.5%); +// #222222 +$gray-darker: lighten($black, 26.5%); +// #444444 +$gray-dark: lighten($black, 46.7%); +// #777777 +$gray: lighten($black, 66.5%); +// #aaaaaa +$gray-light: lighten($black, 87%); +// #dedede +$gray-lighter: lighten($black, 93.75%); // #efefef $gray-lightest: lighten($black, 97.25%); // #f8f8f8 -$white: #ffffff; +$white: #ffffff; // // Scaffolding @@ -32,4 +37,4 @@ $body-bg: #f2f4f5; // Spacing // $base-spacing-unit: $base-font-size; -$half-spacing-unit: $base-spacing-unit / 2; +$half-spacing-unit: $base-spacing-unit / 2; \ No newline at end of file diff --git a/site/themes/default/templates/about.html b/site/themes/default/templates/about.html index feb07539..48ad300a 100644 --- a/site/themes/default/templates/about.html +++ b/site/themes/default/templates/about.html @@ -1,6 +1,10 @@ {% extends "themes/default/templates/partials/base.html" %} {% block content %} + +

{{ entry.title }}

+ {{ entry.content|shortcode|raw}} + {% endblock %} diff --git a/site/themes/default/templates/partials/base.html b/site/themes/default/templates/partials/base.html index 91a1a436..146fa2c8 100644 --- a/site/themes/default/templates/partials/base.html +++ b/site/themes/default/templates/partials/base.html @@ -13,7 +13,7 @@ {% if entry.title %}{{ entry.title|e('html') }} | {% endif %}{{ registry.settings.title|e('html') }} - + {% set bootstrap = base_url() ~ '/site/themes/' ~ registry.settings.theme ~ '/assets/dist/css/bootstrap.min.css' %} {% set default = base_url() ~ '/site/themes/' ~ registry.settings.theme ~ '/assets/dist/css/default.min.css' %}