Redesign csharpguidelines (dennisdoomen#197)

- Ignored .idea and node_modules folders - Added google font Montserrat - Added custom styling - Added new "watch" command to package.json to run the environment locally
stepahead · Mar 22, 2021 · 748b653 · 748b653
1 parent 18001f5
commit 748b653
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,6 @@ _site
 .sass-cache
 .jekyll-metadata
 
+
+.idea/
+/node_modules/
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -21,6 +21,7 @@ GEM
     execjs (2.7.0)
     faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
+    ffi (1.9.18)
     ffi (1.9.18-x64-mingw32)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
@@ -196,6 +197,8 @@ GEM
     minitest (5.10.1)
     multipart-post (2.0.0)
     net-dns (0.8.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
     nokogiri (1.8.2-x64-mingw32)
       mini_portile2 (~> 2.3.0)
     octokit (4.8.0)
@@ -229,10 +232,11 @@ GEM
     unicode-display_width (1.3.0)
 
 PLATFORMS
+  ruby
   x64-mingw32
 
 DEPENDENCIES
   github-pages
 
 BUNDLED WITH
-   1.16.1
+   1.17.3
diff --git a/_includes/head.html b/_includes/head.html
@@ -15,6 +15,7 @@
 
 <!-- For all browsers -->
 <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
+<link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,700,800&display=swap" rel="stylesheet">
 
 <!--[if lte IE 9]>
   <style>

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -8,7 +8,7 @@
   Free for personal and commercial use under the MIT license
   https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt
 -->
-<html lang="{{ site.locale | slice: 0,2 | default: "en" }}" class="no-js">
+<html lang="{{ site.locale | slice: 0,2 | default: 'en' }}" class="no-js">
   <head>
     {% include head.html %}
     {% include head/custom.html %}

diff --git a/_sass/custom/_generic.scss b/_sass/custom/_generic.scss
@@ -0,0 +1,52 @@
+h1,
+h2,
+h3,
+h4 {
+  font-family: $font-family !important;
+  font-weight: 900 !important;
+  color: $black !important;
+}
+
+h1 {
+  font-size: 45px !important;
+  line-height: 56px !important;
+}
+
+h2 {
+  font-size: 21px !important;
+  line-height: 31px !important;
+}
+
+p,
+li {
+  font-family: $font-family;
+  font-size: 16px !important;
+  line-height: 32px !important;
+
+  code {
+    font-size: 16px;
+    line-height: 32px;
+  }
+}
+
+.page__hero--overlay {
+  h1 {
+    color: $blue !important;
+  }
+}
+
+.nav__sub-title {
+  font-family: $font-family;
+  font-size: 18px;
+  font-weight: 900;
+}
+
+.nav__items {
+  a {
+    font-family: $font-family;
+
+    &:hover {
+      color: $blue;
+    }
+  }
+}
diff --git a/_sass/custom/_variables.scss b/_sass/custom/_variables.scss
@@ -0,0 +1,11 @@
+$blue: #5fc1e8;
+$blue-light: #cfecff;
+
+$light-gray: #f2f2f2;
+$medium-gray: #dcdcdc;
+$dark-gray: #8d8d8f;
+$black: #272727;
+$white: #fff;
+
+$global-font-size: rem-calc(16);
+$font-family: 'Montserrat', sans-serif;
diff --git a/_sass/custom/main.scss b/_sass/custom/main.scss
@@ -0,0 +1,2 @@
+@import "variables";
+@import "generic";
diff --git a/_sass/minimal-mistakes.scss b/_sass/minimal-mistakes.scss
@@ -38,3 +38,6 @@
 @import "minimal-mistakes/archive";
 @import "minimal-mistakes/sidebar";
 @import "minimal-mistakes/print";
+
+//Custom styling by Aviva Solutions 2019
+@import "custom/main";
diff --git a/package.json b/package.json
@@ -6,7 +6,11 @@
     "type": "git",
     "url": "git://github.com/mmistakes/minimal-mistakes.git"
   },
-  "keywords": ["jekyll", "theme", "minimal"],
+  "keywords": [
+    "jekyll",
+    "theme",
+    "minimal"
+  ],
   "author": "Michael Rose",
   "license": "MIT",
   "bugs": {
@@ -22,11 +26,10 @@
     "uglify-js": "^2.6.1"
   },
   "scripts": {
-    "uglify":
-      "uglifyjs assets/js/vendor/jquery/jquery-3.3.1.min.js assets/js/plugins/jquery.fitvids.js assets/js/plugins/jquery.greedy-navigation.js assets/js/plugins/jquery.magnific-popup.js assets/js/plugins/jquery.smooth-scroll.min.js assets/js/_main.js -c -m -o assets/js/main.min.js",
+    "uglify": "uglifyjs assets/js/vendor/jquery/jquery-3.3.1.min.js assets/js/plugins/jquery.fitvids.js assets/js/plugins/jquery.greedy-navigation.js assets/js/plugins/jquery.magnific-popup.js assets/js/plugins/jquery.smooth-scroll.min.js assets/js/_main.js -c -m -o assets/js/main.min.js",
     "add-banner": "node banner.js",
-    "watch:js":
-      "onchange \"assets/js/**/*.js\" -e \"assets/js/main.min.js\" -- npm run build:js",
-    "build:js": "npm run uglify && npm run add-banner"
+    "watch:js": "onchange \"assets/js/**/*.js\" -e \"assets/js/main.min.js\" -- npm run build:js",
+    "build:js": "npm run uglify && npm run add-banner",
+    "watch": "LANG=\"en_US.UTF-8\" LC_ALL=\"en_US.UTF-8\" bundle exec jekyll serve -H 0.0.0.0 --incremental --watch -o"
   }
 }