Imported all settings into _config.yml

andyzg · Feb 28, 2017 · 10cd01a · 10cd01a
1 parent c6dbe67
commit 10cd01a
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 34 deletions.
diff --git a/_config.yml b/_config.yml
@@ -32,3 +32,22 @@ title: Andy Zhang's Gallery
 
 # The title on the web page
 full_name: Andy Zhang
+
+# The type of layout
+# Options: ROWS, SQUARES, COLUMNS
+layout_style: COLUMNS
+
+# Variables below are default. Feel free to customize the values below, but do
+# not remove the property.
+
+# Integer: Spacing between each photo
+spacing: 10
+
+# Boolean(true|false): Shuffle the photos in the album
+shuffle: false
+
+# Integer: Number of columns for square or columns
+columns: 3
+
+# Integer: Max height for rows
+max_height: 400
diff --git a/_includes/favicon.html b/_includes/favicon.html
@@ -0,0 +1,18 @@
+<link rel="apple-touch-icon" sizes="57x57" href="favicon.ico/apple-icon-57x57.png">
+<link rel="apple-touch-icon" sizes="60x60" href="favicon.ico/apple-icon-60x60.png">
+<link rel="apple-touch-icon" sizes="72x72" href="favicon.ico/apple-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="76x76" href="favicon.ico/apple-icon-76x76.png">
+<link rel="apple-touch-icon" sizes="114x114" href="favicon.ico/apple-icon-114x114.png">
+<link rel="apple-touch-icon" sizes="120x120" href="favicon.ico/apple-icon-120x120.png">
+<link rel="apple-touch-icon" sizes="144x144" href="favicon.ico/apple-icon-144x144.png">
+<link rel="apple-touch-icon" sizes="152x152" href="favicon.ico/apple-icon-152x152.png">
+<link rel="apple-touch-icon" sizes="180x180" href="favicon.ico/apple-icon-180x180.png">
+<link rel="icon" type="image/png" sizes="192x192"  href="favicon.ico/android-icon-192x192.png">
+<link rel="icon" type="image/png" sizes="32x32" href="favicon.ico/favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="96x96" href="favicon.ico/favicon-96x96.png">
+<link rel="icon" type="image/png" sizes="16x16" href="favicon.ico/favicon-16x16.png">
+<link rel="manifest" href="favicon.ico/manifest.json">
+<meta name="msapplication-TileColor" content="#ffffff">
+<meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
+<meta name="theme-color" content="#ffffff">
+
diff --git a/_includes/ga.html b/_includes/ga.html
@@ -1,7 +1,14 @@
 <script>
   /*
   *************************************************************************
-  *************     ADD YOUR GOOGLE ANALYTICS HERE            *************
+  *************        REPLACE GOOGLE ANALYTICS HERE          *************
   *************************************************************************
   */
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-47938100-7', 'auto');
+  ga('send', 'pageview');
 </script>
diff --git a/index.html b/index.html
@@ -4,23 +4,7 @@
 <html>
   <head>
     <title>{{ site.title }}</title>
-    <link rel="apple-touch-icon" sizes="57x57" href="favicon.ico/apple-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="favicon.ico/apple-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="favicon.ico/apple-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="favicon.ico/apple-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="favicon.ico/apple-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="favicon.ico/apple-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="favicon.ico/apple-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="favicon.ico/apple-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="favicon.ico/apple-icon-180x180.png">
-    <link rel="icon" type="image/png" sizes="192x192"  href="favicon.ico/android-icon-192x192.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="favicon.ico/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="favicon.ico/favicon-96x96.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="favicon.ico/favicon-16x16.png">
-    <link rel="manifest" href="favicon.ico/manifest.json">
-    <meta name="msapplication-TileColor" content="#ffffff">
-    <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
-    <meta name="theme-color" content="#ffffff">
+    {% include favicon.html %}
     <link rel="stylesheet" type="text/css" href="reset.css">
     <link rel="stylesheet" type="text/css" href="style.css">
     <link href="https://fonts.googleapis.com/css?family=Lato:400,900" rel="stylesheet">
@@ -35,6 +19,24 @@ <h2 class="header">{{ site.full_name }}</h2>
     <a href="https://github.com/andyzg/gallery"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/a6677b08c955af8400f44c6298f40e7d19cc5b2d/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677261795f3664366436642e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png"></a>
   </body>
   <script src="gallery.js"></script>
+  <script>
+    var COLUMNS = 'columns';
+    var ROWS = 'rows';
+    var SQUARES = 'squares';
+
+    var columns = COLUMNS;
+    var rows = ROWS;
+    var squares = SQUARES;
+
+    var layoutStyle = {{ site.layout_style }};
+
+    var configuration = {
+      spacing: {{ site.spacing }},
+      shuffle: {{ site.shuffle }},
+      columns: {{ site.columns }},
+      maxHeight: {{ site.max_height }}
+    };
+  </script>
   <script src="script.js"></script>
   {% include ga.html %}
 </html>
diff --git a/script.js b/script.js
@@ -1,21 +1,5 @@
-var COLUMNS = 'columns';
-var ROWS = 'rows';
-var SQUARES = 'squares';
 var id = 'gallery';
 
-/** To customize the layout, CHANGE THE layoutStyle VARIABLE TO BE
-* COLUMNS: Column style layout
-* SQUARES: Square style layout, similar to Instagram
-* ROWS: Row style layout
-***/
-var layoutStyle = ROWS;
-var configuration = {
-  spacing: 10,
-  shuffle: false,
-  columns: 3,
-  maxHeight: 400
-}
-
 function reqListener() {
   var renderer
   switch (layoutStyle) {