style: create layout - intermediate stage

Resources/assets/gumpy/config.rb

@@ -12,7 +12,7 @@ Compass::Frameworks.register('modular-scale', :path => File.expand_path("#{exten
 
 # Set this to the root of your project when deployed:
 http_path = "/"
-css_dir = "css"
+css_dir = "./../../public/css"
 sass_dir = "sass"
 images_dir = "img"
 

Resources/assets/gumpy/sass/_custom.scss

@@ -1 +1,16 @@
 // Your custom SCSS should be written here...
+$font-family-title: "Merriweather Sans";
+$font-weight-title: $font-weight-semibold;
+
+h1,h2,h3,h4,h5,h6 {
+    font-family: $font-family-title;
+    font-weight: $font-weight-title;
+}
+
+//correct entypo
+@font-face { font-family: "entypo"; font-style: normal; font-weight: 400; 
+             src: url('./../../fonts/icons/entypo.eot'); 
+             src: url("../../fonts/icons/entypo.eot?#iefix") format("ie9-skip-eot"), 
+                 url("./../../fonts/icons/entypo.woff") format("woff"), 
+                 url("./../../fonts/icons/entypo.ttf") format("truetype"); 
+}

Resources/assets/gumpy/sass/_fonts.scss

@@ -1,7 +1,7 @@
 /* Fonts */
 
 // Import Google Web Fonts
-@import url(//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700);
+//@import url(//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700);
 
 
 // Set local icon font

Resources/assets/gumpy/sass/_nav.scss

@@ -0,0 +1,6 @@
+nav.inline-nav {
+    ul, ol {
+        display: inline-block;
+        list-style-type: none;
+    }
+}

Resources/assets/gumpy/sass/chillmain.scss

@@ -0,0 +1,3 @@
+@import "_nav.scss";
+
+

Resources/assets/gumpy/sass/var/_settings.scss

@@ -18,7 +18,7 @@ $max-device-width: 2880px;						// Max Document Size
 $nav-distance: 0; 							// Navigation distance from the top of the viewport
 
 // Typography
-$font-family: "Open Sans";
+$font-family: "Oxygen";
 $font-style-italic: italic;
 $icons: entypo;
 $font-smoothing: antialiased;