Branch gab

Gemfile

@@ -9,3 +9,5 @@ group :jekyll_plugins do
   gem 'jekyll-seo-tag', '2.5.0'
   gem 'jekyll-sitemap', '1.2.0'
 end
+
+gem 'tzinfo-data'

Gemfile.lock

@@ -1,15 +1,17 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.9.25)
+    eventmachine (1.2.7-x64-mingw32)
+    ffi (1.11.2)
+    ffi (1.11.2-x64-mingw32)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
@@ -38,32 +40,35 @@ GEM
       jekyll (~> 3.3)
     jekyll-sitemap (1.2.0)
       jekyll (~> 3.3)
-    jekyll-watch (2.0.0)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
     kramdown (1.17.0)
-    liquid (4.0.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    liquid (4.0.3)
+    listen (3.2.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    pathutil (0.16.1)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
+    public_suffix (4.0.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rouge (3.3.0)
-    ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
-    sass (3.6.0)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rouge (3.13.0)
+    safe_yaml (1.0.5)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    tzinfo (2.0.0)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2019.3)
+      tzinfo (>= 1.0.0)
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   jekyll (= 3.8.4)
@@ -72,6 +77,7 @@ DEPENDENCIES
   jekyll-paginate (= 1.1.0)
   jekyll-seo-tag (= 2.5.0)
   jekyll-sitemap (= 1.2.0)
+  tzinfo-data
 
 BUNDLED WITH
-   1.16.4
+   1.17.3

_config.yml

@@ -1,8 +1,8 @@
 # ----
 # Site
 
-title: Frisco Template
-url: "https://brave-submarine.cloudvent.net"
+title: Mago Analytics
+url: "https://magoanalytics.github.io"
 baseurl:
 google_analytics_key:
 google_maps_javascript_api_key:
@@ -52,6 +52,16 @@ jekyll-archives:
   enabled: ['categories']
 
 defaults:
+  -
+    scope:
+      path: ""
+      type: "projects"
+    values:
+      _options:
+        image_path:
+          width: 440
+          height: 440
+          uploads_dir: "/images/staff_members"
   -
     scope:
       path: ""

_data/footer.yml

@@ -3,25 +3,27 @@ left_links:
     link: /blog/
   - name: About
     link: /about/
+  - name: Projects
+    link: /projects/
   - name: Contact
     link: /contact/
 right_links:
   - name:
-    link: https://facebook.com/cloudcannon
+    link: /404
     new_window: true
     social_icon: Facebook
   - name:
-    link: https://twitter.com/cloudcannon
+    link: /404
     social_icon: Twitter
     new_window: true
+#  - name:
+#    link: https://youtube.com/c/cloudcannon
+#    social_icon: YouTube
+#    new_window: true
   - name:
-    link: https://youtube.com/c/cloudcannon
-    social_icon: YouTube
-    new_window: true
-  - name:
-    link: https://instagram.com/
+    link: /404
     social_icon: Instagram
     new_window: true
-  - name:
-    link: /feed.xml
-    social_icon: RSS
+#  - name:
+#    link: /feed.xml
+#    social_icon: RSS

_data/navigation.yml

@@ -1,6 +1,8 @@
-- name: Blog
-  link: /blog/
-- name: About
-  link: /about/
-- name: Contact
-  link: /contact/
+#- name: Blog
+#  link: /blog/
+#- name: About
+#  link: /about/
+#- name: Projects
+#  link: /projects/
+#- name: Contact
+#  link: /contact/

_layouts/default.html

@@ -10,9 +10,11 @@
 
 		<link rel="apple-touch-icon" href="{{ site.baseurl }}/apple-touch-icon.png">
 		<link rel="icon" type="image/png" href="{{ site.baseurl }}/touch-icon.png" sizes="192x192">
-		<link rel="icon" type="image/png" href="{{ site.baseurl }}/images/favicon.png">
+		<link rel="icon" type="image/png" href="{{ site.baseurl }}/images/favicon.ico">
 
 		<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300|Rubik:300">
+		<link href="https://fonts.googleapis.com/css?family=Bebas+Neue|Sulphur+Point&display=swap" rel="stylesheet">
+		<link href="https://fonts.googleapis.com/css?family=Sulphur+Point&display=swap" rel="stylesheet">
 		<link rel="stylesheet" href="{{ site.baseurl }}/css/screen.css">
 
 		{% if jekyll.environment == 'production' and site.google_analytics_key != '' %}
@@ -30,8 +32,8 @@
 			<div class="container">
 				<div class="company-name">
 					<a href="{{ site.baseurl }}/">
-						<span class="dark-logo"><img width="104" height="38" src="{{ site.baseurl }}/images/logo/dark.svg" alt="dark frisco logo"></span>
-						<span class="light-logo"><img width="104" height="38" src="{{ site.baseurl }}/images/logo/light.svg" alt="light frisco logo"></span>
+						<span class="dark-logo"><img width="104" height="38"src="{{ site.baseurl }}/images/logo/horizontal_logo.png" alt="dark frisco logo"></span>
+						<span class="light-logo"><img width="104" height="38" src="{{ site.baseurl }}/images/logo/horizontal_logo.png" alt="light frisco logo"></span>
 					</a>
 				</div>
 				{% include navigation.html %}
@@ -44,7 +46,7 @@
 		<footer>
 			<div class="container">
 				<p class="editor-link"><a href="cloudcannon:collections/_data/footer.yml" class="btn"><strong>&#9998;</strong> Edit footer</a></p>
-				<ul class="footer-left-links">
+			<!--	<ul class="footer-left-links">
 					{% for link in site.data.footer.left_links %}
 						<li>
 							<a {% if link.new_window %}target="_blank"{% endif %} href="{% include relative-src.html src=link.link %}" {% if link.social_icon %}class="{{ link.social_icon | slugify }}-icon"{% endif %}>
@@ -53,7 +55,7 @@
 							</a>
 						</li>
 					{% endfor %}
-				</ul>
+				</ul> -->
 				<ul class="footer-right-links">
 					{% for link in site.data.footer.right_links %}
 						<li>
@@ -64,11 +66,13 @@
 						</li>
 					{% endfor %}
 				</ul>
+				<!--
 				<p class="copyright">
 					<a href="https://cloudcannon.com/">
 						Template by CloudCannon
 					</a>
 				</p>
+			-->
 			</div>
 		</footer>
 

_projects/_defaults.md

@@ -0,0 +1,7 @@
+---
+name:
+position:
+image_path:
+twitter_username:
+blurb:
+---

_sass/forms.scss

@@ -4,26 +4,25 @@
 	border: 2px solid $brand-color;
 	transition: .2s ease-in-out;
 	display: inline-block;
-	padding: 16px 50px;
+	padding: 16px 60px;
 	background: #fff;
 }
 
 .button a:hover, input[type=submit]:hover {
 	background: $brand-color;
-	color: #fff;
+	color: orange;
 	cursor: pointer;
 }
 
 .button.alt a {
-	background: rgba(255,255,255,0);
-	border: 2px solid rgba(255, 255, 255, 1);
-	color: #fff;
+	background: orange;
+	border: black;
+	color: black;
 }
 
 .button.alt a:hover {
-	background: #fff;
-	color: $brand-color;
-	text-shadow: none;
+	background: #eb7200;
+	color: white;
 }
 
 textarea, input, button, select { font-family: inherit; font-size: inherit; }