From cb0c787145b347a420c23ddd5e40ba6f76e6d206 Mon Sep 17 00:00:00 2001 From: Matt Walters Date: Tue, 2 Sep 2014 22:26:26 -0400 Subject: [PATCH 1/5] adding node to npm start --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a0ee23..f577d6b 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "union": "0.3.8" }, "scripts": { - "start": "./server.js" + "start": "node server.js" }, "subdomain": "empirenode-2014", "engines": { From 44ae78c9dfe212b2f891bca841d499c3681206dc Mon Sep 17 00:00:00 2001 From: Matt Walters Date: Mon, 8 Sep 2014 23:36:11 -0400 Subject: [PATCH 2/5] adding page nav --- .gitignore | 1 + public/css/style.css | 9 +++++++-- public/img/twitter.png | Bin 0 -> 1038 bytes public/index.html | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 public/img/twitter.png diff --git a/.gitignore b/.gitignore index a72b52e..cfb8f70 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ results npm-debug.log node_modules +.DS_Store diff --git a/public/css/style.css b/public/css/style.css index 9445fca..79821cd 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -70,6 +70,10 @@ a:hover.button { padding-top: 25px; } +#twitter-bird { + margin-top: -10px; +} + .empire-state { display: block; position: relative; @@ -140,7 +144,7 @@ a:hover.button { color: #fff; position: relative; font-size: 18px; - margin: 5px auto 0 auto; + margin: 30px auto 0 auto; padding: 15px 0px 12px 10px; width: 991px; } @@ -406,7 +410,8 @@ a:hover.button { /* !3.1 Nav */ #page-nav { - background-color: #FFF; + background-color: #000; + color: #FFF; height: 60px; width: 100%; position: fixed; diff --git a/public/img/twitter.png b/public/img/twitter.png new file mode 100644 index 0000000000000000000000000000000000000000..83e1f533dfbe55bb90a1d9052ca168465201453d GIT binary patch literal 1038 zcmV+p1o8WcP)SpW1HJ?fFsQ6NX1;fo7dybF#)z$>M=CIpLIZ`VRpwbW-B#^th2c z@RX#t2Ldu+Qqnm|qjv~sE$NAf__DGAwiOZcz@r^7S`AD?7~j$0L)3+TXQ&^22Mr9HA$0_UY2xE`v111Wl3At`1Z1-9i5UStG3C>7{EKg zPZ?R|hVAJ!^o#+=fwzE1Z2!_j&Ymi%^UX}qdC>NR?WL0UUMm5~yKH}Gdwx9`!0{>u ze31z_t@Qr5?T^=a=Z`XEwLNBg9JtU!*P`w0dj5JQ==|r9+kOT(+ZARPGIZXZ7T8PI zitT1j7HV~1JR?iI((y_}s3?ll5wR;G9spjCi1*V0EHmJ~lx=$HDkM$hG&HT;)1Dfc zgSOvY-I%1@eX&A@YG&$ez@N5p%;R}pbp z(ys}{8^FC0u^V_!(&L#!gl_s#(vG4i{^|#0rqaYLmsWtAz>UP$LDPdy1*euxIwjq0(!s%FQ z?`oe+r
+ + +
@@ -140,6 +154,28 @@

Organized by

+ + +
From 6b5fe0aefe21893dbe39c922e0c148114e790864 Mon Sep 17 00:00:00 2001 From: indexzero Date: Wed, 10 Sep 2014 15:09:22 -0700 Subject: [PATCH 3/5] [dist] Version bump. 2.6.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f577d6b..f88f625 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "empirenode-2014", "description": "Homepage for 2014.empirenode.org", - "version": "2.5.0", + "version": "2.6.0", "repository": { "type": "git", "url": "http://github.com/empirejs/2014.empirenode.org.git" From 2482f3189efc9f24b8c59163a76e61d6d701ac49 Mon Sep 17 00:00:00 2001 From: indexzero Date: Wed, 10 Sep 2014 15:16:47 -0700 Subject: [PATCH 4/5] [fix] Make "Interested in Sponsoring?" copy more readable. --- public/css/style.css | 14 +++++++++++--- public/index.html | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 79821cd..f39e511 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -178,7 +178,7 @@ a:hover.button { #organizers, #speakers, #love { - margin-top: 50px; + margin-top: 25px; border-top: 2px solid #999; padding-top: 20px; } @@ -196,7 +196,6 @@ a:hover.button { #schedule .subheader, #location .subheader, #organizers .subheader { - border-bottom: 1px solid black; display: block; height: 40px; margin: 0 0 20px 0; @@ -213,7 +212,8 @@ a:hover.button { text-align: left; } -#sponsors .subheader h2 { +#sponsors .subheader h2, +#sponsor-list h2 a { color: #b4d183; } @@ -233,6 +233,14 @@ a:hover.button { padding-bottom: 40px; } +#sponsor-list h2 { + margin-top: 25px; +} + +#sponsor-list h2 a { + text-decoration: underline; +} + #location .location05, #location .cruise, #location .lightbox { diff --git a/public/index.html b/public/index.html index dceb9b2..9a5eb5f 100644 --- a/public/index.html +++ b/public/index.html @@ -97,7 +97,6 @@

Speakers & Instructors

Sponsorship by

-

Interested in sponsoring? Email us!

From d2374cbe54a5e85b36378c84c5aac6caa1d162f9 Mon Sep 17 00:00:00 2001 From: indexzero Date: Wed, 10 Sep 2014 15:17:00 -0700 Subject: [PATCH 5/5] [dist] Version bump. 2.6.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f88f625..34a3ad0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "empirenode-2014", "description": "Homepage for 2014.empirenode.org", - "version": "2.6.0", + "version": "2.6.1", "repository": { "type": "git", "url": "http://github.com/empirejs/2014.empirenode.org.git"