Merge pull request #2 from kaogeek/develop-teng

Update for deployment to server

.gitignore

@@ -9,6 +9,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
+/log/
 
 # Used by dotenv library to load environment variables.
 # .env

README.md

@@ -14,13 +14,11 @@
 [![Accessibility conformance](https://img.shields.io/badge/accessibility-WAI:AA-green.svg)](https://www.w3.org/WAI/eval/Overview)
 [![A11y issues checked with Rocket Validator](https://rocketvalidator.com/badges/checked_with_rocket_validator.svg?url=https://rocketvalidator.com)](https://rocketvalidator.com/opensource)
 
-This is the opensource code repository cloned from CONSUL (https://github.com/consul/consul).
+This is the opensource code repository cloned from **CONSUL** (https://github.com/consul/consul).
 
 ## Configuration for development and test environments
 
-**NOTE**: For more detailed instructions check the [docs](https://docs.consulproject.org)
-
-Prerequisites: install git, Ruby 2.7.6, CMake, pkg-config, shared-mime-info, Node.js and PostgreSQL (>=9.5).
+**Prerequisites:** install *git*, *Ruby 2.7.6*, *CMake*, *pkg-config*, *shared-mime-info*, *Node.js* and *PostgreSQL (>=9.5)*, first before proceeding to the next steps. Some of them could be installed by using the following commands.
 
 ```bash
 #bundler

app/assets/stylesheets/_consul_settings.scss

@@ -14,7 +14,8 @@
 $black: #222 !default;
 $white: #fdfdfd !default;
 
-$body-font-family: "Source Sans Pro", "Helvetica", "Arial", sans-serif !important !default;
+//$body-font-family: "Source Sans Pro", "Helvetica", "Arial", sans-serif !important !default;
+$body-font-family: "Pracharath", sans-serif !default;
 
 $global-radius: rem-calc(3) !default;
 $global-width: rem-calc(1200) !default;
@@ -52,14 +53,18 @@ $show-header-for-stacked: true !default;
 $body-margin: calc(50vw - #{$global-width / 2}) !default;
 $full-width-margin: unquote("#{$global-width / 2} - 50vw") !default;
 
-$base-font-size:      rem-calc(17) !default;
+// $base-font-size:      rem-calc(17) !default;
+// Scale up to offset Pracharath's font size.
+// Its base font size is smaller than Source Sans Pro
+// used by CONSUL.
+$base-font-size:      rem-calc(18) !default;
 $base-line:           rem-calc(26) !default;
 $line-height:         rem-calc(24) !default;
 $tiny-font-size:      rem-calc(12) !default;
 
 $font-family-serif: Georgia, "Times New Roman", Times, serif !default;
 
-$brand:             #004a83 !default;
+$brand:             #e67e44 !default;
 $brand-secondary:   darken($brand, 10%) !default;
 $dark:              $brand-secondary !default;
 

app/assets/stylesheets/_custom_settings.scss

@@ -3,3 +3,5 @@
 //
 // To override existing variables, use the file named
 // `_consul_custom_overrides.scss` instead
+
+$text-color-reduce: #404d5c;

app/assets/stylesheets/_settings.scss

@@ -80,7 +80,8 @@ $black: #0a0a0a !default;
 $white: #fefefe !default;
 $body-background: $white !default;
 $body-font-color: $black !default;
-$body-font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif !default;
+//$body-font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif !default;
+$body-font-family: "Pracharath", sans-serif !default;
 $body-antialiased: true !default;
 $global-margin: 1rem !default;
 $global-padding: 1rem !default;
@@ -128,7 +129,8 @@ $block-grid-max: 8 !default;
 // 4. Base Typography
 // ------------------
 
-$header-font-family: $body-font-family !default;
+//$header-font-family: $body-font-family !default;
+$header-font-family: "Anakotmai", "HelveticaNeue-Medium", "Helvetica Neue Medium", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
 $header-font-weight: $global-weight-normal !default;
 $header-font-style: normal !default;
 $font-family-monospace: Consolas, "Liberation Mono", Courier, monospace !default;
@@ -276,15 +278,20 @@ $breadcrumbs-item-separator-color: $medium-gray !default;
 // 11. Button
 // ----------
 
-$button-font-family: inherit !default;
-$button-padding: 0.85em 1em !default;
+//$button-font-family: inherit !default;
+$button-font-family: $header-font-family !default;
+// Override button padding for MFP-NEXT.
+// $button-padding: 0.85em 1em !default;
+$button-padding: 0.4em 1.1em !default;
 $button-margin: 0 0 $global-margin 0 !default;
 $button-fill: solid !default;
 $button-background: $primary-color !default;
 $button-background-hover: scale-color($button-background, $lightness: -15%) !default;
 $button-color: $white !default;
 $button-color-alt: $black !default;
-$button-radius: $global-radius !default;
+// Override button border radius for MFP-NEXT.
+// $button-radius: $global-radius !default;
+$button-radius: 0.4rem;
 $button-hollow-border-width: 1px !default;
 $button-sizes: (
   tiny: 0.6rem,

app/assets/stylesheets/admin.scss

@@ -121,7 +121,8 @@ $table-header:   #ecf1f6;
       a {
         color: inherit;
         display: inline-block;
-        font-family: "Lato" !important;
+        // TODO: Need to be edited: "Lato" is CONSUL's font.
+        // font-family: "Lato" !important;
         font-size: rem-calc(24);
         font-weight: lighter;
         line-height: 1;

app/assets/stylesheets/fonts.scss

@@ -1,4 +1,95 @@
 // Fonts
+
+/*
+  ==================================================
+  Anakotmai
+  ==================================================
+  will be used as header font for visuals & branding.
+*/
+
+// --- Light ---
+@font-face {
+  font-family: 'Anakotmai';
+  src: url('mfp/anakotmai-light.woff2') format('woff2'),
+       url('mfp/anakotmai-light.woff') format('woff');
+  font-weight: 300;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Anakotmai';
+  src: url('mfp/anakotmai-light.woff2') format('woff2'),
+       url('mfp/anakotmai-light.woff') format('woff');
+  font-weight: 300;
+  font-style: italic;
+}
+
+// --- Normal ---
+@font-face {
+  font-family: 'Anakotmai';
+  src: url('mfp/anakotmai-medium.woff2') format('woff2'),
+       url('mfp/anakotmai-medium.woff') format('woff');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Anakotmai';
+  src: url('mfp/anakotmai-medium.woff2') format('woff2'),
+       url('mfp/anakotmai-medium.woff') format('woff');
+  font-weight: normal;
+  font-style: italic;
+}
+
+// --- Bold ---
+@font-face {
+  font-family: 'Anakotmai';
+  src: url('mfp/anakotmai-bold.woff2') format('woff2'),
+       url('mfp/anakotmai-bold.woff') format('woff');
+  font-weight: bold;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Anakotmai';
+  src: url('mfp/anakotmai-bold.woff2') format('woff2'),
+       url('mfp/anakotmai-bold.woff') format('woff');
+  font-weight: bold;
+  font-style: italic;
+}
+
+/*
+  ==================================================
+  Pracharath
+  ==================================================
+  will be used as body/content font for legibility.
+*/
+
+@font-face {
+  font-family: 'Pracharath';
+  src: url('mfp/pracharath.woff2') format('woff2'),
+       url('mfp/pracharath.woff') format('woff');
+  font-weight: normal;
+  font-style: normal;
+  font-display: fallback;
+}
+
+@font-face {
+  font-family: 'Pracharath';
+  src: url('mfp/pracharath-bld.woff2') format('woff2'),
+       url('mfp/pracharath-bld.woff') format('woff');
+  font-weight: bold;
+  font-style: normal;
+  font-display: fallback;
+}
+
+/*
+=====================
+ALL FONTS FROM CONSUL
+--------------------
+will be ignored
+=====================
+
 //
 // 01. Source Sans Pro (https://www.google.com/fonts/specimen/Source+Sans+Pro)
 // 02. Lato (https://www.google.com/fonts/specimen/Lato)
@@ -125,3 +216,5 @@
   font-weight: 500;
   font-style: normal;
 }
+
+*/