babolivier
/
hyde
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Resolve conflicts

brendan 6 years ago
parent
7c0bc791cf 8cab2d27e2
commit
cc5d4189f7
3 changed files with 7 additions and 6 deletions
Split View Show Diff Stats
  1. 6
    6
      layouts/partials/head.html
  2. 1
    0
      layouts/partials/head_fonts.html
  3. 0
    0
      layouts/partials/hook_head_end.html

+ 6
- 6
layouts/partials/head.html View File 

@@ -31,12 +31,12 @@
31 31 
   <meta property="og:url" content="{{ .Permalink }}"/>
32 32
33 33 
   <!-- CSS -->
34 
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/print.css" media="print">
35 
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/poole.css">
36 
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/syntax.css">
37 
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/hyde.css">
38 
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/fonts/font.css">
39 
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/fontawesome-all.min.css">
34 
+  <link type="text/css" rel="stylesheet" href="{{ .Site.BaseURL }}css/print.css" media="print">
35 
+  <link type="text/css" rel="stylesheet" href="{{ .Site.BaseURL }}css/poole.css">
36 
+  <link type="text/css" rel="stylesheet" href="{{ .Site.BaseURL }}css/syntax.css">
37 
+  <link type="text/css" rel="stylesheet" href="{{ .Site.BaseURL }}css/hyde.css">
38 
+  <link type="text/css" rel="stylesheet" href="{{ .Site.BaseURL }}css/fonts/font.css">
39 
+  <link type="text/css" rel="stylesheet" href="{{ .Site.BaseURL }}css/fontawesome-all.min.css">
40 40
41 41 
   <!-- Icons -->
42 42 
   <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/apple-touch-icon-144-precomposed.png">

+ 1
- 0
layouts/partials/head_fonts.html View File 

@@ -0,0 +1 @@
1 
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Abril+Fatface|PT+Sans:400,400i,700">

+ 0
- 0
layouts/partials/hook_head_end.html View File