Merge branch 'master' of https://github.com/LiamWBA/LJsec

# Conflicts:
#	_config.yml

_config.yml

@@ -5,44 +5,44 @@ theme: jekyll-theme-chirpy
 
 # Change the following value to '/PROJECT_NAME' ONLY IF your site type is GitHub Pages Project sites
 # and doesn't have a custom domain.
-baseurl: ""
+baseurl: "/LJsec"
 
 # The language of the webpage › http://www.lingoes.net/en/translator/langcode.htm
 # If it has the same name as one of the files in folder `_data/locales`, the layout language will also be changed,
 # otherwise, the layout language will use the default value of 'en'.
 lang: en
 
 # Change to your timezone › http://www.timezoneconverter.com/cgi-bin/findzone/findzone
-timezone: Asia/Shanghai
+timezone: Europe/London
 
 # jekyll-seo-tag settings › https://github.com/jekyll/jekyll-seo-tag/blob/master/docs/usage.md
 # ↓ --------------------------
 
-title: Chirpy # the main title
+title: LJsec # the main title
 
-tagline: A text-focused Jekyll theme # it will display as the sub-title
+tagline: A security blog focussed around Microsoft security technologies. # it will display as the sub-title
 
 description: >- # used by seo meta and the atom feed
-  A minimal, responsive and feature-rich Jekyll theme for technical writing.
+  A security blog focused around Microsoft security technologies
 
 # fill in the protocol & hostname for your site, e.g., 'https://username.github.io'
-url: ""
+url: "https://LiamWBA.github.io"
 
 github:
-  username: github_username # change to your github username
+  username: LiamWBA # change to your github username
 
 twitter:
   username: twitter_username # change to your twitter username
 
 social:
   # Change to your full name.
   # It will be displayed as the default author of the posts and the copyright owner in the Footer
-  name: your_full_name
-  email: example@domain.com # change to your email address
+  name: LJ
+  email:  # change to your email address
   links:
     # The first element serves as the copyright owner's link
     - https://twitter.com/username # change to your twitter homepage
-    - https://github.com/username # change to your github homepage
+    - https://github.com/LiamWBA # change to your github homepage
     # Uncomment below to add more social links
     # - https://www.facebook.com/username
     # - https://www.linkedin.com/in/username
@@ -73,10 +73,17 @@ theme_mode: # [light|dark]
 # will be added to all image (site avatar & posts' images) paths starting with '/'
 #
 # e.g. 'https://cdn.com'
+<<<<<<< HEAD
 img_cdn:
 
 # the avatar on sidebar, support local or CORS resources
 avatar:
+=======
+img_cdn: ""
+
+# the avatar on sidebar, support local or CORS resources
+avatar: "assets/img/favicons/Avatar.png"
+>>>>>>> 5fbb39fa3b648f9af40c8fce7ac2277bd25885c4
 
 # boolean type, the global switch for TOC in posts.
 toc: true
@@ -104,10 +111,10 @@ comments:
 # Self-hosted static assets, optional › https://github.com/cotes2020/chirpy-static-assets
 assets:
   self_host:
-    enabled: # boolean, keep empty means false
+    enabled: false # boolean, keep empty means false
     # specify the Jekyll environment, empty means both
     # only works if `assets.self_host.enabled` is 'true'
-    env: # [development|production]
+    env: development # [development|production]
 
 pwa:
   enabled: true # the option for PWA feature

_sass/addon/variables.scss

@@ -23,5 +23,6 @@ $code-font-size: 0.85rem !default;
 
 /* fonts */
 
-$font-family-base: 'Source Sans Pro', 'Microsoft Yahei', sans-serif;
+/*$font-family-base: 'Source Sans Pro', 'Microsoft Yahei', sans-serif;*/
 $font-family-heading: Lato, 'Microsoft Yahei', sans-serif;
+$font-family-base: 'Cantarell', sans-serif;