Merge pull request #6 from mbuchthal/sass-modules

Sass modules
mbuchthal · Oct 6, 2015 · 8f7e1d5 · 8f7e1d5
2 parents faca18b + e250a2b
commit 8f7e1d5
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 20 deletions.
diff --git a/index.html b/index.html
@@ -10,16 +10,16 @@
   </head>
   <body>
     <header>
-      <a href=""></a>
+      <a href="">intelly</a>
       <nav>
         <ul>
-          <li>HOME</li>
-          <li>PAGES</li>
-          <li>BLOG</li>
-          <li>PORTFOLIO</li>
-          <li>SHORTCODES</li>
-          <li>FEATURES</li>
-          <li>CONTACT</li>
+          <li><a href="">Home</a></li>
+          <li><a href="">Pages</a></li>
+          <li><a href="">Blog</a></li>
+          <li><a href="">Portfolio</a></li>
+          <li><a href="">Shortcodes</a></li>
+          <li><a href="">Features</a></li>
+          <li><a href="">Contact</a></li>
         </ul>
       </nav>
     </header>
@@ -35,7 +35,7 @@ <h2></h2>
         <li></li>
         <li></li>
       </ul>
-      <a href="">READ MORE</a>
+      <a href="">Read More</a>
     </article>
     <section>
       <a href=""></a>
@@ -45,32 +45,32 @@ <h2></h2>
     <section>
       <h2>Serene in their assurance of their empire over matter</h2>
       <p>No one would have believed in the last years of the nine-teenth century that thiw world was being watched keenly and closely by intelligences great than man's</p>
-      <a href="">CONTACT NOW</a>
-      <a href="">LEARN MORE</a>
+      <a href="">Contact Now</a>
+      <a href="">Learn More</a>
     </section>
     <section>
       <address>2319 Hilltop Haven Drive<br> Upper Greenwood Lake, NJ 07421</address>
       <a href="tel:6624076792">662-407-6792</a>
       <ul class="links_media">
-        <li class="links_media_item">FOLLOW US</li>
-        <li class="links_media_item">LIKE US</li>
-        <li class="links_media_item">CONNECT</li>
+        <li class="links_media_item">Follow Us</li>
+        <li class="links_media_item">Like Us</li>
+        <li class="links_media_item">Connect</li>
       </ul>
     </section>
     <footer>
       <p>&#169;2014 Intelly LLC</p>
       <ul>
         <li>
-          <a href="">TERMS OF USE</a>
+          <a href="">Terms Of Use</a>
         </li>
         <li>
-          <a href="">PRIVACY POLICY</a>
+          <a href="">Privacy Policy</a>
         </li>
         <li>
-          <a href="">CONTACT</a>
+          <a href="">Contact</a>
         </li>
         <li>
-          <a href="">SUPPORT</a>
+          <a href="">Support</a>
         </li>
       </ul>
     </footer>

diff --git a/public/sass/main.scss b/public/sass/main.scss
@@ -1,8 +1,10 @@
-
+@import "modules/reset.scss";
+@import "modules/colors.scss";
+@import "partials/header.scss";
 @import "modules/links_media";
 
-
 .links_media_item {
   display: inline;
   text-decoration: none;
 }
+
diff --git a/public/sass/modules/_colors.scss b/public/sass/modules/_colors.scss
@@ -0,0 +1,4 @@
+//---color variables---
+$color-1: #1E1D24; // dark gray
+$color-2: #B4B3B5; // light gray
+$color-3: #97F1E7; // light teal
diff --git a/public/sass/modules/_reset.sass b/public/sass/modules/_reset.sass
@@ -0,0 +1,36 @@
+/* http://meyerweb.com/eric/tools/css/reset/ 
+   v2.0 | 20110126
+   License: none (public domain)
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed, 
+figure, figcaption, footer, header, hgroup, 
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+	font: inherit;
+	vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure, 
+footer, header, hgroup, menu, nav, section {
+	display: block;
+}
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
diff --git a/public/sass/partials/_header.scss b/public/sass/partials/_header.scss
@@ -0,0 +1,3 @@
+header{
+	background-color: $color-1;
+}