From c7267b5eaf83a9b65a75a184756bdf607ef5b12b Mon Sep 17 00:00:00 2001
From: Mark Buchthal
Date: Tue, 6 Oct 2015 09:01:55 -0700
Subject: [PATCH 01/87] server.js file creation
---
.gitignore | 5 +++++
app.js | 0
index.html | 17 +++++++++++++++++
package.json | 24 ++++++++++++++++++++++++
public/sass/main.scss | 0
server.js | 29 +++++++++++++++++++++++++++++
6 files changed, 75 insertions(+)
create mode 100644 app.js
create mode 100644 index.html
create mode 100644 package.json
create mode 100644 public/sass/main.scss
create mode 100644 server.js
diff --git a/.gitignore b/.gitignore
index 123ae94..18614db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
+### OSX ###
+.DS_Store
+.AppleDouble
+.LSOverride
+
# Logs
logs
*.log
diff --git a/app.js b/app.js
new file mode 100644
index 0000000..e69de29
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..c02f9cc
--- /dev/null
+++ b/index.html
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Intelly Blog
+
+
+
+
+
+
+
+
+
+
+
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..5efb8fa
--- /dev/null
+++ b/package.json
@@ -0,0 +1,24 @@
+{
+ "name": "mean-stack-1",
+ "version": "1.0.0",
+ "description": "Last week we focussed on JavaScript basics. This week we're going to build up a function web application. You'll be expected to build on knowledge you've already learned (semantic HTML, Sass instead of CSS, in addition to all of the Angular work we'll be doing) and produce a \"production-ready\" blog for your assignment this week.",
+ "main": "index.js",
+ "scripts": {
+ "test": "echo \"Error: no test specified\" && exit 1"
+ },
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/mbuchthal/mean-stack-1.git"
+ },
+ "author": "Mark Buchthal",
+ "license": "ISC",
+ "bugs": {
+ "url": "https://github.com/mbuchthal/mean-stack-1/issues"
+ },
+ "homepage": "https://github.com/mbuchthal/mean-stack-1#readme",
+ "dependencies": {
+ "express": "^4.13.3",
+ "gulp": "^3.9.0",
+ "gulp-sass": "^2.0.4"
+ }
+}
diff --git a/public/sass/main.scss b/public/sass/main.scss
new file mode 100644
index 0000000..e69de29
diff --git a/server.js b/server.js
new file mode 100644
index 0000000..d671768
--- /dev/null
+++ b/server.js
@@ -0,0 +1,29 @@
+'use strict'
+
+var express = require('express');
+var app = express();
+var port = process.env.PORT || 3000;
+
+app.use(express.static(__dirname + '/public'));
+
+var server = app.listen(port, 'localhost', function() {
+ var port = server.address().port;
+ var host = server.address().address;
+ console.log('server listening at http:// ' + host)
+});
+
+app.route('*')
+ .get(function (req, res, next) {
+ console.log('request was made...')
+});
+
+app.route('/')
+ .get(function(req, res) {
+ res.sendFile('index.html', { root: __dirname + '/' });
+});
+
+app.use(function(req, res) {
+ res.status(404).sendFile('404.html', { root: __dirname + '/' });
+});
+
+app.listen();
From b8567c4cd23bce2af4c0cce9c2cd994c3c0cc062 Mon Sep 17 00:00:00 2001
From: Mark Buchthal
Date: Tue, 6 Oct 2015 09:51:06 -0700
Subject: [PATCH 02/87] create index html
---
index.html | 91 +++++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 77 insertions(+), 14 deletions(-)
diff --git a/index.html b/index.html
index c02f9cc..f55adeb 100644
--- a/index.html
+++ b/index.html
@@ -1,17 +1,80 @@
-
-
-
- Intelly Blog
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Intelly Blog
+
+
+
+
+
+
+
+
+
+
+ HOME
+ PAGES
+ BLOG
+ PORTFOLIO
+ SHORTCODES
+ FEATURES
+ CONTACT
+
+
+
+
+
+
+
+
+
+
+ READ MORE
+
+
+
+ Serene in their assurance of their empire over matter
+ 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
+ CONTACT NOW
+ LEARN MORE
+
+
+ 2319 Hilltop Haven Drive Upper Greenwood Lake, NJ 07421
+ 662-407-6792
+
+ FOLLOW US
+ LIKE US
+ CONNECT
+
+
+
+
From 1c89208ad42aef4c017b7f36fa59415a928c7f16 Mon Sep 17 00:00:00 2001
From: Mark Buchthal
Date: Tue, 6 Oct 2015 10:01:18 -0700
Subject: [PATCH 03/87] add gulpfile
---
Gulpfile.js | 13 +++++++++++++
package.json | 3 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 Gulpfile.js
diff --git a/Gulpfile.js b/Gulpfile.js
new file mode 100644
index 0000000..d733b2c
--- /dev/null
+++ b/Gulpfile.js
@@ -0,0 +1,13 @@
+var gulp = require("gulp");
+var sass = require("gulp-sass");
+
+
+gulp.task("sass", function() {
+ gulp.src("sass/**/*.scss")
+ .pipe(sass().on("error", sass.logError))
+ .pipe(gulp.dest("public/css"));
+});
+
+gulp.task("default", function() {
+ gulp.watch("sass/**/*.scss", ["sass"]);
+});
diff --git a/package.json b/package.json
index 5efb8fa..abd79f7 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
"dependencies": {
"express": "^4.13.3",
"gulp": "^3.9.0",
- "gulp-sass": "^2.0.4"
+ "gulp-sass": "^2.0.4",
+ "webpack": "^1.12.2"
}
}
From d699d30de157c9175bd93fa9c0071f2acec6f851 Mon Sep 17 00:00:00 2001
From: Benton Green
Date: Tue, 6 Oct 2015 10:27:52 -0700
Subject: [PATCH 04/87] start header.scss
---
index.html | 38 +++++++++++++++----------------
package.json | 8 ++++++-
public/css/main.css | 0
public/sass/main.scss | 2 ++
public/sass/modules/_reset.sass | 36 +++++++++++++++++++++++++++++
public/sass/partials/_header.scss | 0
6 files changed, 63 insertions(+), 21 deletions(-)
create mode 100644 public/css/main.css
create mode 100644 public/sass/modules/_reset.sass
create mode 100644 public/sass/partials/_header.scss
diff --git a/index.html b/index.html
index f55adeb..9b46fe5 100644
--- a/index.html
+++ b/index.html
@@ -6,21 +6,20 @@
Intelly Blog
-
@@ -36,43 +35,42 @@
- READ MORE
+ Read More
Serene in their assurance of their empire over matter
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
- CONTACT NOW
- LEARN MORE
+ Contact Now
+ Learn More
2319 Hilltop Haven Drive Upper Greenwood Lake, NJ 07421
662-407-6792
- FOLLOW US
- LIKE US
- CONNECT
+ Follow Us
+ Like Us
+ Connect
diff --git a/package.json b/package.json
index 5efb8fa..c8f6deb 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,12 @@
"dependencies": {
"express": "^4.13.3",
"gulp": "^3.9.0",
- "gulp-sass": "^2.0.4"
+ "gulp-sass": "^2.0.4",
+ "webpack": "^1.12.2"
+ },
+ "devDependencies": {
+ "gulp": "^3.9.0",
+ "gulp-sass": "^2.0.4",
+ "sass": "^0.5.0"
}
}
diff --git a/public/css/main.css b/public/css/main.css
new file mode 100644
index 0000000..e69de29
diff --git a/public/sass/main.scss b/public/sass/main.scss
index e69de29..41c3034 100644
--- a/public/sass/main.scss
+++ b/public/sass/main.scss
@@ -0,0 +1,2 @@
+@import "reset.scss";
+@import "header.scss";
\ No newline at end of file
diff --git a/public/sass/modules/_reset.sass b/public/sass/modules/_reset.sass
new file mode 100644
index 0000000..4eb3685
--- /dev/null
+++ 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;
+}
\ No newline at end of file
diff --git a/public/sass/partials/_header.scss b/public/sass/partials/_header.scss
new file mode 100644
index 0000000..e69de29
From 86a182057b6c46e776ff72740565ee0a75360bb0 Mon Sep 17 00:00:00 2001
From: Mark Buchthal
Date: Tue, 6 Oct 2015 10:43:19 -0700
Subject: [PATCH 05/87] correct gulpfile and indexhtml
---
public/css/main.css | 7 +++++++
1 file changed, 7 insertions(+)
create mode 100644 public/css/main.css
diff --git a/public/css/main.css b/public/css/main.css
new file mode 100644
index 0000000..32ec775
--- /dev/null
+++ b/public/css/main.css
@@ -0,0 +1,7 @@
+.links_media_item {
+ display: inline;
+ text-decoration: none; }
+
+.links_media_item {
+ display: inline;
+ text-decoration: none; }
From 93d917fd4929737ccfc70fa4252329e4152c32dc Mon Sep 17 00:00:00 2001
From: Mark Buchthal
Date: Tue, 6 Oct 2015 10:44:50 -0700
Subject: [PATCH 06/87] correct gulpfile and indexhtml
---
Gulpfile.js | 11 +++++------
index.html | 12 +++++-------
public/sass/main.scss | 8 ++++++++
public/sass/modules/_links_media.scss | 5 +++++
4 files changed, 23 insertions(+), 13 deletions(-)
create mode 100644 public/sass/modules/_links_media.scss
diff --git a/Gulpfile.js b/Gulpfile.js
index d733b2c..2f9c1ed 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -1,13 +1,12 @@
var gulp = require("gulp");
var sass = require("gulp-sass");
-
gulp.task("sass", function() {
- gulp.src("sass/**/*.scss")
- .pipe(sass().on("error", sass.logError))
- .pipe(gulp.dest("public/css"));
+ gulp.src("public/sass/**/*.scss")
+ .pipe(sass().on("error", sass.logError))
+ .pipe(gulp.dest("./public/css"));
});
-gulp.task("default", function() {
- gulp.watch("sass/**/*.scss", ["sass"]);
+gulp.task("watch", function() {
+ gulp.watch("public/sass/**/*.scss", ["sass"]);
});
diff --git a/index.html b/index.html
index f55adeb..8af320f 100644
--- a/index.html
+++ b/index.html
@@ -6,8 +6,7 @@
Intelly Blog
-
-
+
@@ -42,7 +41,6 @@
-
Serene in their assurance of their empire over matter
@@ -53,10 +51,10 @@ Serene in their assurance of their empire over matter
2319 Hilltop Haven Drive Upper Greenwood Lake, NJ 07421
662-407-6792
-
- FOLLOW US
- LIKE US
- CONNECT
+
diff --git a/public/sass/main.scss b/public/sass/main.scss
index e69de29..46d00f1 100644
--- a/public/sass/main.scss
+++ b/public/sass/main.scss
@@ -0,0 +1,8 @@
+
+@import "modules/links_media";
+
+
+.links_media_item {
+ display: inline;
+ text-decoration: none;
+}
diff --git a/public/sass/modules/_links_media.scss b/public/sass/modules/_links_media.scss
new file mode 100644
index 0000000..6f64274
--- /dev/null
+++ b/public/sass/modules/_links_media.scss
@@ -0,0 +1,5 @@
+
+.links_media_item {
+ display: inline;
+ text-decoration: none;
+}
From e7d865deb9c32e4be228865a161177cb3dbd0fb3 Mon Sep 17 00:00:00 2001
From: Benton Green
Date: Tue, 6 Oct 2015 10:48:18 -0700
Subject: [PATCH 07/87] commit before pulling down master
---
public/sass/modules/_colors.scss | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 public/sass/modules/_colors.scss
diff --git a/public/sass/modules/_colors.scss b/public/sass/modules/_colors.scss
new file mode 100644
index 0000000..7a2e9cf
--- /dev/null
+++ 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
\ No newline at end of file
From fa661d154c7a138b82f684fecf244aa6b1e1f049 Mon Sep 17 00:00:00 2001
From: Benton Green
Date: Tue, 6 Oct 2015 10:49:47 -0700
Subject: [PATCH 08/87] commit before pulling down master
---
index.html | 2 +-
public/sass/main.scss | 5 +++--
public/sass/partials/_header.scss | 3 +++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/index.html b/index.html
index 9b46fe5..7713d05 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
Intelly Blog
-
+
diff --git a/public/sass/main.scss b/public/sass/main.scss
index 41c3034..ccb4145 100644
--- a/public/sass/main.scss
+++ b/public/sass/main.scss
@@ -1,2 +1,3 @@
-@import "reset.scss";
-@import "header.scss";
\ No newline at end of file
+@import "modules/reset.scss";
+@import "modules/colors.scss";
+@import "partials/header.scss";
\ No newline at end of file
diff --git a/public/sass/partials/_header.scss b/public/sass/partials/_header.scss
index e69de29..3945dbf 100644
--- a/public/sass/partials/_header.scss
+++ b/public/sass/partials/_header.scss
@@ -0,0 +1,3 @@
+header{
+ background-color: $color-1;
+}
\ No newline at end of file
From 48dd063c3776e3b5d1618f212bf9c064bd7862dd Mon Sep 17 00:00:00 2001
From: Benton Green
Date: Tue, 6 Oct 2015 10:58:58 -0700
Subject: [PATCH 09/87] removed _reset.sass
---
public/css/main.css | 38 +++++++++++++++++++
.../sass/modules/{_reset.sass => _reset.scss} | 0
2 files changed, 38 insertions(+)
rename public/sass/modules/{_reset.sass => _reset.scss} (100%)
diff --git a/public/css/main.css b/public/css/main.css
index 32ec775..12c7917 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -1,3 +1,41 @@
+/* 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; }
+
+header {
+ background-color: #1E1D24; }
+
.links_media_item {
display: inline;
text-decoration: none; }
diff --git a/public/sass/modules/_reset.sass b/public/sass/modules/_reset.scss
similarity index 100%
rename from public/sass/modules/_reset.sass
rename to public/sass/modules/_reset.scss
From 875da01c41bb12d52721a31698f3b9379b099567 Mon Sep 17 00:00:00 2001
From: Mark Buchthal
Date: Tue, 6 Oct 2015 11:15:33 -0700
Subject: [PATCH 10/87] create circular media links
---
public/css/main.css | 54 +++++++++++++++++--
public/sass/main.scss | 5 --
public/sass/modules/_links_media.scss | 12 ++++-
.../sass/modules/{_reset.sass => _reset.scss} | 0
4 files changed, 60 insertions(+), 11 deletions(-)
rename public/sass/modules/{_reset.sass => _reset.scss} (100%)
diff --git a/public/css/main.css b/public/css/main.css
index 32ec775..c364c23 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -1,7 +1,51 @@
-.links_media_item {
- display: inline;
- text-decoration: none; }
+/* 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; }
+
+header {
+ background-color: #1E1D24; }
.links_media_item {
- display: inline;
- text-decoration: none; }
+ display: inline-block;
+ text-decoration: none;
+ border-radius: 50%;
+ width: 10em;
+ height: 5.5em;
+ background: #fff;
+ border: 1px solid #666;
+ color: #666;
+ text-align: center;
+ font: .5em Arial, sans-serif;
+ padding-top: 4.5em;
+ text-transform: uppercase; }
diff --git a/public/sass/main.scss b/public/sass/main.scss
index 2edccfc..211d3f7 100644
--- a/public/sass/main.scss
+++ b/public/sass/main.scss
@@ -3,8 +3,3 @@
@import "partials/header.scss";
@import "modules/links_media";
-.links_media_item {
- display: inline;
- text-decoration: none;
-}
-
diff --git a/public/sass/modules/_links_media.scss b/public/sass/modules/_links_media.scss
index 6f64274..b8c7f61 100644
--- a/public/sass/modules/_links_media.scss
+++ b/public/sass/modules/_links_media.scss
@@ -1,5 +1,15 @@
.links_media_item {
- display: inline;
+ display: inline-block;
text-decoration: none;
+ border-radius: 50%;
+ width: 10em;
+ height: 5.5em;
+ background: #fff;
+ border: 1px solid #666;
+ color: #666;
+ text-align: center;
+ font: .5em Arial, sans-serif;
+ padding-top: 4.5em;
+ text-transform: uppercase;
}
diff --git a/public/sass/modules/_reset.sass b/public/sass/modules/_reset.scss
similarity index 100%
rename from public/sass/modules/_reset.sass
rename to public/sass/modules/_reset.scss
From fffea3764f8a42138edd2b763a70dc284cde8c52 Mon Sep 17 00:00:00 2001
From: Mark Buchthal
Date: Tue, 6 Oct 2015 11:15:53 -0700
Subject: [PATCH 11/87] create circular media links
---
public/sass/modules/_links_media.scss | 1 +
1 file changed, 1 insertion(+)
diff --git a/public/sass/modules/_links_media.scss b/public/sass/modules/_links_media.scss
index b8c7f61..071c4e9 100644
--- a/public/sass/modules/_links_media.scss
+++ b/public/sass/modules/_links_media.scss
@@ -12,4 +12,5 @@
font: .5em Arial, sans-serif;
padding-top: 4.5em;
text-transform: uppercase;
+ font-weight: bolder;
}
From 43429e2443bd00e466b1d12db8432a565560fd38 Mon Sep 17 00:00:00 2001
From: Mark Buchthal
Date: Tue, 6 Oct 2015 11:20:37 -0700
Subject: [PATCH 12/87] add css to gitignore
---
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitignore b/.gitignore
index 18614db..1bde127 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+
+public/css/**/*.css
+
+
### OSX ###
.DS_Store
.AppleDouble
From 940325cadeb3d3d0dbbcf4a2aca26125db506c7f Mon Sep 17 00:00:00 2001
From: Benton Green
Date: Tue, 6 Oct 2015 11:26:56 -0700
Subject: [PATCH 13/87] icon fonts added
---
public/css/fonts/icomoon.eot | Bin 0 -> 2332 bytes
public/css/fonts/icomoon.svg | 15 ++++++++
public/css/fonts/icomoon.ttf | Bin 0 -> 2168 bytes
public/css/fonts/icomoon.woff | Bin 0 -> 2244 bytes
public/sass/modules/_icon-styles.scss | 47 ++++++++++++++++++++++++++
public/sass/modules/_typography.scss | 0
6 files changed, 62 insertions(+)
create mode 100644 public/css/fonts/icomoon.eot
create mode 100644 public/css/fonts/icomoon.svg
create mode 100644 public/css/fonts/icomoon.ttf
create mode 100644 public/css/fonts/icomoon.woff
create mode 100644 public/sass/modules/_icon-styles.scss
create mode 100644 public/sass/modules/_typography.scss
diff --git a/public/css/fonts/icomoon.eot b/public/css/fonts/icomoon.eot
new file mode 100644
index 0000000000000000000000000000000000000000..1fed2130493de7af7b633f6ab8192e54e6dbbd63
GIT binary patch
literal 2332
zcmaJ@OH3O_82)E>?e${g_nH94*t=k-IQX@G@U&b4p?MGp5GNH4V8FZzHUiQTDXpwl
z?VEm-j%g#Mz4cb9mq_ikm$oteXT6RgLLKeSeE&E9%s=!0
z^KuISdj;4c4hUr~O&sT`ZZ$m_v97;d2VjOZScD>M;$MUUDwtss@~{FoVFPlo
zjf@Mj$ZW$7>QWsqL?HwbRrlrANK%7FC;uq<=&62k6$$bA_tFk*IH(#4d_nqzN4Enr|UVGZVc&%$Dvi@*?Vq*W{I)O~7gkPl~B;)a{APmNp
z3E@u94ax2_oAmiCZ_?{|(PC^eecCg@`fl_F`-x81)-CDHJR5838t_}}gU-w0u922z
zkLUuQ{zY+B>yUDX9iB-6Io(xi&mJLzvufJMVr&5_+rU~E$)|zY*TEk*EFx3!AQ4ucDB-=ff5C!lCw`5m}blQ(Yort
zWm2wW7^rHtc2;oz(Kd%b%Hyr^*`dmBI8NMuT6~u3(LqnA(rh$R9~rNAz1TSFqM;iK
zcNTuQZxZn|qr^P8ma37A&`o!AuT_H-$?lD^tbucgR!cJA^|l*@uwUvAHhX)Me4
zyUWTF!Zr}bz(;z{Tzz-y?9SEb>2nKxfgw|?P6${#E}gDLxf-r3pWmKyw@>*jQ`bkj
zq{L{j&G$ygpOn(scxWuu?oUqyeHjPGbEa2xJj=TFdIq<$O859iW@tAXlTWSMeV3Yz
zrdq^Rf1p=j-8%AQ&NA>97%`BTe(C+;$9k!G3=d_xzSV?&RL@l!cubhrPd1eSp;}WF
zXfrCm{HwJM-~_Snkr@xuV|P>Jg8v~@of$3@IuC$N^Pr0ep15?
z5QqC~i^a`iv2grW&*ryx)`|shG!!}cDnGH+iR5H{<>p3i`}iB-M9p)>!mf8EU&wFg
zcJoW#g
+
+
+Generated by IcoMoon
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/css/fonts/icomoon.ttf b/public/css/fonts/icomoon.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..d267a9f2a1c05b026c0e554df771b87d2f50b003
GIT binary patch
literal 2168
zcmaJ?OKclO82)E>?e)fv-|I9l$KFls5;uOWA9-3PO&a=0lP0NK6q>|IHjk3nQ67*=
z1z8|C5FYJ;LnVYN)B_R{>V;DgvU)5a6>i*+xKx5G7oax(tk-p@D#o6f@BinY|2Z=Y
z1OUuX0v4iEvyr&X$^C+yZ?P|}Z0C1QQ|a`Gfl$>CcdMZ|4tp
zzy@z3eIIFGA-}EOIVb#$^kcN~{!VdkAN|B;x=Po9Wxpb~zyQG9VSYf)C$*XU4hj*d
z+_6T`?fUfe9G=5%4|Xs!yv`
zZI|x}XqZ%gJHg?;<9Z1Yl(HS;F#zcSO{5|B|2&MiT1LfXaKg)Q5$0hZpvP_G!z7p?
zikGx#f6*mb86FvfY>bz^L_`TIjvid5*h`dnhDj#Ej7&s1DJPYrA}XTX<1q$NQy@jv
zuo6|9Or+9OJf+kW^b(nTGqp0XBstZr({Jm|2!uJG-dwyacVy+(E3=uw)7?EGzt1(`
z%mh}h^v*}GKRBA6K6-GSK(&GWGq+ei
z?w@A;*9JmE#9-*`lZ;lLjkoj;2W-v}_r*x>cw4JibVZsY=LUy1-F64nPOVf*nt^QJ
z_%vazjE&6`CO=mBN$%`hRzjBo=hle1)#~wTHPG`I#NuPJM7Nhw95fM$)DY%GGIkP$
zmmL{a%Mt_iAWEf$(Ytq>UH5&rW@-%P4wAzphPYme77ZwIPfLcRtpuw~$A*J-M=K<@
zcr>40J7uz&!gK!6X^YWf6r85M;byPB%_j)a4`&E7nd*o;J-sg8>vjd4&3<|aW8-DhI3UzkY6RUz>F2w)+5~R!!bA9ryg?o@Gnys=
z4(O|ot!_~x^uY>W>-Grn$gA0A5HIPNMV!(xhxkCp2K*9=IyNHzypEfo4L+dnI42;-
ziYqnDAYRuoi+DuG9O9cgHh>54OQr2KB7a85O^|?ln=8fbVzB_5umVNc#$JR%PTk$x
zEEasRa1>t&6?S0{1#kiN#2^gO7w&o?b4Fc1*vjvsQ579MfGxH!G}ap6>itg5F15^&>HA8kxj^gizwx+^AmZ8ooA3YM|Niy8
znVXYiV?Y3h`7v1Z=RTc}8QZv7ZQfc%*<%3i0i`!>u?Oo~eg%N1dsCEzyN}%KC`8$Pw{|fm9`{yd
zEeJM?%T(_vLJuY85AM^g{66~SpCKR6$qqLQ`7I4V@S*SbDBU|J{(Ymkvx{M29EKi?
zh-JSZcfbU|++)5+{^RPC{0=G+kv}?!<0waQ7T_tzmJiF2Wsy)qkZL2K1KkTEAFfgC
z!|2Iy}4(A>j;B{iI3%OK#c52q@@hV}jx*5^C6R_Tn)$<)>@^EQEvH+2q%?5-it#h%X5
zmS(@??rH2f*FUh~aX6`U>ZMZB9b~&lrwDUpWMqyo`H{*`N?Z4m+I1;(Zk1S?ZC=0L
z1EY>%Yz!7l^7t9mNehuk4PZ@VzKy7Y;>@sml^CccQ7X+3-@o7J{wi>1=EK!~>X|Lq
z{F72?ad^JuZd@!??nv`*fA%WfhRw#V8vZjBmRt&rHl!CZRvwApTs%m%y8Sa~Ziy3E~!jebWPJafe)uK~FuIT2hsFOlEHQ-PcFjeT4X1h#Dq@VZ~Q^2oXeQzl?`q
z@GK|T&8Z2mn{!y2I;@OEa4U_NH}@iM2S^}88gmcIyyWzF)nGi8bS6RyQJkuil|xv0
z%nFYum7tue;gXcW)900(?CkTaKv~r{gLu)vEaH@b
zImCMgHsRM)GBA(w^9F8!7I>e&$2k!tHe9J<2JxDKS;RvI<`CaDunD{nFffnuX#+Pv
z0v>EE7q^PV0&KuC6k!Xg2!))sy|Ym)1Y(gWz9lr+h80As`haI_`=#s2`9Z+WKx
literal 0
HcmV?d00001
diff --git a/public/sass/modules/_icon-styles.scss b/public/sass/modules/_icon-styles.scss
new file mode 100644
index 0000000..ceb30dc
--- /dev/null
+++ b/public/sass/modules/_icon-styles.scss
@@ -0,0 +1,47 @@
+@font-face {
+ font-family: 'icomoon';
+ src:url('fonts/icomoon.eot?lumkvl');
+ src:url('fonts/icomoon.eot?lumkvl#iefix') format('embedded-opentype'),
+ url('fonts/icomoon.ttf?lumkvl') format('truetype'),
+ url('fonts/icomoon.woff?lumkvl') format('woff'),
+ url('fonts/icomoon.svg?lumkvl#icomoon') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+%icon-fonts{
+ font-family: 'icomoon';
+ speak: none;
+ font-style: normal;
+ font-weight: normal;
+ font-variant: normal;
+ text-transform: none;
+ line-height: 1;
+
+ -webkit-font-smoothing: antialiased;
+}
+
+$icons: (google "\e800") (facebook "\e801") (twitter "\e802") (pinterest "\e804") (linkedin "\e803");
+
+@each $icon in $icons {
+ .icon-#{nth($icon, 1)}:before {
+ content: nth($icon, 2);
+ @extend %icon-fonts;
+ }
+}
+
+.icon-google-plus3:before {
+ content: "\e800";
+}
+.icon-facebook3:before {
+ content: "\e801";
+}
+.icon-twitter3:before {
+ content: "\e802";
+}
+.icon-linkedin:before {
+ content: "\e803";
+}
+.icon-pinterest:before {
+ content: "\e804";
+}
diff --git a/public/sass/modules/_typography.scss b/public/sass/modules/_typography.scss
new file mode 100644
index 0000000..e69de29
From 5bcbd98674724ff821de4210cfadad5447b22ee7 Mon Sep 17 00:00:00 2001
From: Mark Buchthal
Date: Tue, 6 Oct 2015 12:11:57 -0700
Subject: [PATCH 14/87] add contactsection
---
Gulpfile.js | 24 ++++++++++++++++++++++
index.html | 7 +++++--
package.json | 2 ++
public/css/main.css | 9 +++++---
public/sass/main.scss | 7 +------
public/sass/partials/_section_contact.scss | 8 ++++++++
6 files changed, 46 insertions(+), 11 deletions(-)
create mode 100644 public/sass/partials/_section_contact.scss
diff --git a/Gulpfile.js b/Gulpfile.js
index 2f9c1ed..28c517e 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -10,3 +10,27 @@ gulp.task("sass", function() {
gulp.task("watch", function() {
gulp.watch("public/sass/**/*.scss", ["sass"]);
});
+
+// var gulp = require("gulp");
+// var sass = require("gulp-sass");
+// var autoprefixer = require("autoprefixer");
+// var sourcemaps = require("gulp-sourcemaps");
+// var input = "public/sass/**/*.scss";
+// var output = "./public/css";
+// var autoprefixerOptions = {
+// browsers: ['last 2 versions']
+// };
+
+// gulp.task("sass", function() {
+// return gulp
+// .src(input)
+// .pipe(sourcemaps.init())
+// .pipe(sass().on("error", sass.logError))
+// .pipe(sourcemaps.write("./stylesheets/maps"))
+// .pipe(autoprefixer(autoprefixerOptions))
+// .pipe(gulp.dest(output));
+// });
+
+// gulp.task("watch", function() {
+// gulp.watch("public/sass/**/*.scss", ["sass"]);
+// });
diff --git a/index.html b/index.html
index 2c99d3b..dfdf24b 100644
--- a/index.html
+++ b/index.html
@@ -48,9 +48,12 @@ Serene in their assurance of their empire over matter
Contact Now
Learn More
-
@@ -77,5 +77,6 @@ Serene in their assurance of their empire over matter
+