Mobile font fix & global style update

Zaffri · Feb 2, 2016 · 6ffb066 · 6ffb066
1 parent 93daec0
commit 6ffb066
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 21 deletions.
diff --git a/1.0/css/global.min.css b/1.0/css/global.min.css
diff --git a/1.0/css/global.css → Jolt/css/global.css b/1.0/css/global.css → Jolt/css/global.css
@@ -1,7 +1,7 @@
 /* --------------------------------------------------------
 	Jolt Global CSS File
 
-	Version: 	1.0
+	Version: 	1.0.1
 	Author: 		Steven Morrison
 
 	Website:	jolt.zaffri.com
@@ -26,31 +26,19 @@
 		padding: 0;
 	}
 
-/* Larger screen fonts */
-	@media (min-width: 1000px) {
-		body {
-			font-family: 'Oxygen', Helvetica, Arial, sans-serif;
-			font-weight: 300;
-		}
-	}
-
-/* Smaller screen fonts (roboto - android, iOS - helvetica/h'nue, windows - arial)*/
-	@media (max-width: 999px) {
-		body {
-			font-family: Roboto, Helvetica, "Helvetica Neue", Arial, sans-serif;
-		}
-	}
-
 /* Global body properties */
 	body {
 		font-size: 16px;
 		color: #2f2f2f;
 		background: #fcfcfc;
+		font-family: 'Oxygen', Roboto, Helvetica, "Helvetica Neue", Arial, sans-serif; /* Font media query styles placed here 1.1 */
+		font-weight: 300;
 	}
 
 /* Anchor links */
 	a {
 		text-decoration: none;
+		color: #0caad7;
 	}
 
 /* Images */

diff --git a/Jolt/css/global.min.css b/Jolt/css/global.min.css
diff --git a/1.0/css/topbar.css → Jolt/css/topbar.css b/1.0/css/topbar.css → Jolt/css/topbar.css
@@ -1,7 +1,7 @@
 /* --------------------------------------------------------
 	Jolt Topbar CSS File
 
-	Version: 	1.0
+	Version: 	1.0.1
 	Author: 		Steven Morrison
 
 	Website:	jolt.zaffri.com

diff --git a/1.0/css/topbar.min.css → Jolt/css/topbar.min.css b/1.0/css/topbar.min.css → Jolt/css/topbar.min.css
diff --git a/1.0/js/topbar.js → Jolt/js/topbar.js b/1.0/js/topbar.js → Jolt/js/topbar.js
@@ -1,3 +1,13 @@
+/* --------------------------------------------------------
+	Jolt Topbar JavaScript File
+
+	Version: 	1.0.1
+	Author: 		Steven Morrison
+
+	Website:	jolt.zaffri.com
+	GitHub:		github.com/Zaffri
+-------------------------------------------------------- */
+
 /* ---------------------------  [JavaScript burger nav fallback click] --------------------------- */
 var toggle = document.querySelector("input:checked");
 

diff --git a/1.0/js/topbar.min.js → Jolt/js/topbar.min.js b/1.0/js/topbar.min.js → Jolt/js/topbar.min.js
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Jolt 1.0
+# Jolt
 Front-end web development framework: HTML5 &amp; CSS3 by <a href="http://www.zaffri.com"><em>Zaffri</em></a>.
 
 <p><b>Documentation:</b></p>
@@ -21,4 +21,17 @@ http://zaffri.com
     </ul>
 </ul>
 
-<p>I will be adding more functionality/fixing bugs throughout the year, let me know if you have any suggestions or constructive critism. Thanks!</p>
+<p><b>Demos:</b></p>
+	<ul>
+		<li>1.  "demo-basic.html" - Basic demo of vertical/horizontal alignment and Topbar component.</li>
+		<li>2.  <i>More to come...</i></li>
+	</ul>
+
+<p><b>Templates:</b></p>
+	<ul>
+		<li>1.  "starter-template-1.html" - Basic structure for Jolt site with single level navigation using Topbar component <i>(Markup only)</i>.</li>
+		<li>2.  "starter-template-2.html" - Basic structure for Jolt site with dropdowns using Topbar component <i>(Markup only)</i>.</li>
+	</ul>
+
+<p>I will be adding more functionality/fixing bugs as time goes on, let me know if you have any suggestions or constructive critism. Thanks!</p>
+<p>Steven.</p>
diff --git a/demos/css/global.min.css b/demos/css/global.min.css