Skip to content

Commit

Permalink
fix style include + change to monokai style
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Wickham authored and Thomas Wickham committed Mar 16, 2019
1 parent 91fc869 commit 121c86a
Show file tree
Hide file tree
Showing 8 changed files with 155 additions and 168 deletions.
1 change: 0 additions & 1 deletion _config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ baseurl: "" # the subpath of your site, e.g. /blog
url: "https://crafterscirle.io" # the base hostname & protocol for your site, e.g. http://example.com
# twitter_username: jekyllrb
# github_username: jekyll
css_inline: true # Will insert all styles into a single <style> block in the <head> element and remove the style <link> reference

# jekyll-mentions: https://twitter.com # jekyll-mentions > service used when @replying
# twitter:
Expand Down
128 changes: 62 additions & 66 deletions _layouts/default.html
View file
Original file line number Diff line number Diff line change
@@ -1,69 +1,65 @@
<!DOCTYPE html>
<html lang="{{ site.lang | default: "fr" }}">

<head>
<!-- General meta -->
<meta name="viewport" content="width=device-width, initial-scale=1">

{% if page.indexing == false %}
<meta name="robots" content="noindex">
{% endif %}

{% if page.collectionpage %}
{% seo title=false %}

{% assign collectiondata = site.collections | where: "label", page.collectionpage | first %}
<title>{{ collectiondata.title }} - {{ site.title }}</title>
<meta property="og:title" content="{{ collectiondata.title }}">
<meta name="description" content="{{ collectiondata.description }}">
<meta property="og:description" content="{{ collectiondata.description }}">
{% else %}
{% seo %}
{% endif %}

<link rel="apple-touch-icon" sizes="57x57" href="/assets/favicons/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/assets/favicons/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="/assets/favicons/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="/assets/favicons/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="/assets/favicons/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="/assets/favicons/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="/assets/favicons/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="/assets/favicons/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="/assets/favicons/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="/assets/favicons/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="/assets/favicons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="/assets/favicons/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="/assets/favicons/favicon-16x16.png">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="/assets/favicons/ms-icon-144x144.png">
<meta name="theme-color" content="#ffffff">

<link rel="manifest" href="{{ "/manifest.json" | relative_url }}">
<meta name="theme-color" content="{{ site.manifest.theme_color | default: '#242e2b' }}"/>


{% if site.css_inline == true %}
{% include site-styles.html %}
{% else %}
<link rel="stylesheet" href="{{ "/assets/styles.css" | relative_url }}">
{% endif %}
<link rel="stylesheet" href="{{ "/assets/custom.css" | relative_url }}">
<link rel="stylesheet" href="{{ "/assets/syntax2.css" | relative_url }}">

{% if site.avatarurl %}{% include site-favicons.html %}{% endif %}

{% if site.google_analytics %}{% include site-analytics.html %}{% endif %}

{% include site-before-start.html %}
</head>

<body class="layout-{{ page.layout }}{% if page.title %} {{ page.title | slugify }}{% endif %}">
{% include site-icons.svg %}

{{ content }}

{% if site.service_worker != false %}{% include site-sw.html %}{% endif %}

{% include site-before-end.html %}
</body>
</html>
<head>
<!-- General meta -->
<meta name="viewport" content="width=device-width, initial-scale=1">

{% if page.indexing == false %}
<meta name="robots" content="noindex">
{% endif %}

{% if page.collectionpage %}
{% seo title=false %}

{% assign collectiondata = site.collections | where: "label", page.collectionpage | first %}
<title>{{ collectiondata.title }} - {{ site.title }}</title>
<meta property="og:title" content="{{ collectiondata.title }}">
<meta name="description" content="{{ collectiondata.description }}">
<meta property="og:description" content="{{ collectiondata.description }}">
{% else %}
{% seo %}
{% endif %}

<link rel="apple-touch-icon" sizes="57x57" href="/assets/favicons/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/assets/favicons/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="/assets/favicons/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="/assets/favicons/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="/assets/favicons/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="/assets/favicons/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="/assets/favicons/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="/assets/favicons/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="/assets/favicons/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="/assets/favicons/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="/assets/favicons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="/assets/favicons/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="/assets/favicons/favicon-16x16.png">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="/assets/favicons/ms-icon-144x144.png">
<meta name="theme-color" content="#ffffff">

<link rel="manifest" href="{{ "/manifest.json" | relative_url }}">
<meta name="theme-color" content="{{ site.manifest.theme_color | default: '#242e2b' }}" />


{% include site-styles.html %}
<link rel="stylesheet" href="{{ "/assets/code-style-monokai.css" | relative_url }}">

{% if site.avatarurl %}{% include site-favicons.html %}{% endif %}

{% if site.google_analytics %}{% include site-analytics.html %}{% endif %}

{% include site-before-start.html %}
</head>

<body class="layout-{{ page.layout }}{% if page.title %} {{ page.title | slugify }}{% endif %}">
{% include site-icons.svg %}

{{ content }}

{% if site.service_worker != false %}{% include site-sw.html %}{% endif %}

{% include site-before-end.html %}
</body>

</html>
2 changes: 0 additions & 2 deletions assets/custom.scss → _sass/_custom.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
---
---

.typeset {
& code, & pre {
Expand Down
2 changes: 1 addition & 1 deletion _sass/_settings.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import url('https://fonts.googleapis.com/css?family=EB+Garamond|Lora|Roboto+Mono|');
//@import url('https://fonts.googleapis.com/css?family=Merriweather:400,700');

// Background colours
$backgroundColour: #ffffff;
Expand All @@ -8,6 +7,7 @@ $featureBackgroundColour: #f9fafa;
$accentColour: #05bf85;

// Text colours
// $headingColour: #242e2b;
$headingColour: #242e2b;
$bodyColour: #384743;
$linkColour: #05bf85;
Expand Down
3 changes: 2 additions & 1 deletion _sass/alembic.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
"sassline-base",
"syntax",
"flex",
"theme"
"theme",
"custom"
;
Loading

0 comments on commit 121c86a

Please sign in to comment.