From 246fa2709235adaef9c8b7ac9a7af6107714d99b Mon Sep 17 00:00:00 2001 From: Zuhair Date: Sat, 27 Oct 2012 15:49:30 -0500 Subject: [PATCH 1/9] Fixed the upside down website and fixed the top nav --- app/styles/main.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/styles/main.css b/app/styles/main.css index cccd69f..b2ce9e7 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -1,7 +1,6 @@ body { font-family: 'proxima_nova_boldbold', Arial, Helvetica, sans-serif; background-image: -webkit-linear-gradient(top, #E5E5E5 0, white 140px); - -webkit-transform: rotate(180deg); background-image: -moz-linear-gradient(top, #E5E5E5 0, white 140px); background-image: linear-gradient(top, #E5E5E5 0, white 140px); background-position: 0 360px; @@ -43,7 +42,7 @@ h3 { NAV \*********************/ .main-nav { - position: absolute; + position: fixed; } .main-nav > .navbar-inner { background-color: #FAFAFA; From d6f5aec5fac19d887003deb0eb7fde926dd00e82 Mon Sep 17 00:00:00 2001 From: Zuhair Date: Sat, 27 Oct 2012 15:52:01 -0500 Subject: [PATCH 2/9] Fixed the logo problem --- app/styles/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/main.css b/app/styles/main.css index b2ce9e7..15693e1 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -104,7 +104,7 @@ h3 { } .main-header .logo { - position: fixed; + /*position: fixed;*/ left: 50%; margin-left: -104px; z-index: 10000; From 48add7212b4550a768d9c89eb396347c94b942ab Mon Sep 17 00:00:00 2001 From: Zuhair Date: Sat, 27 Oct 2012 15:55:17 -0500 Subject: [PATCH 3/9] Now you can see the labels on the form --- app/styles/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/main.css b/app/styles/main.css index 15693e1..de27dc3 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -136,7 +136,7 @@ h3 { padding: 0 15px; } -*~*+*~*>*>*>*>* label{opacity:0;} +*~*+*~*>*>*>*>* label{opacity:240;} .how-it-works .step.earn > .supporting-graphic { margin-top: 16px; From d7991ce2130bc0deacc972e007cb44853ee22d2f Mon Sep 17 00:00:00 2001 From: Zuhair Date: Sat, 27 Oct 2012 15:57:11 -0500 Subject: [PATCH 4/9] Now you can click the links in the nav --- app/styles/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/main.css b/app/styles/main.css index de27dc3..08f9db0 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -63,7 +63,7 @@ h3 { } .main-nav a:hover { - margin-left: -1000px; + /*margin-left: -1000px;*/ } *:nth-child(n + 5){ background: #ff0000; } From 013792f67e197b8c552827c15d3e9372d06b046d Mon Sep 17 00:00:00 2001 From: Zuhair Date: Sat, 27 Oct 2012 15:59:28 -0500 Subject: [PATCH 5/9] Avatars are in circles --- app/styles/main.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/styles/main.css b/app/styles/main.css index 08f9db0..0ab55dc 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -192,7 +192,8 @@ h3 { .activity .avatar { width: 40px; - box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); + /*box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);*/ + -webkit-border-radius: 40px; } .activity .actor { From c9ef5b4b15f8ba186a7d353577d5010c7a5deac7 Mon Sep 17 00:00:00 2001 From: Zuhair Date: Sat, 27 Oct 2012 16:06:43 -0500 Subject: [PATCH 6/9] Sign up is now next to the activity stream --- app/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/index.html b/app/index.html index ee5550d..ffb691d 100644 --- a/app/index.html +++ b/app/index.html @@ -134,7 +134,7 @@

Sign Up

-
+

Hey, what's goin' on?

From 8129e0200909af7625ff4541eb50b1f6b9582c6f Mon Sep 17 00:00:00 2001 From: Zuhair Date: Sat, 27 Oct 2012 16:10:11 -0500 Subject: [PATCH 7/9] The time the activities were posted no longer have red backgrounds --- app/styles/main.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/styles/main.css b/app/styles/main.css index 0ab55dc..879993d 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -7,7 +7,7 @@ body { color: #555; } -*:nth-child(n + 5){ background: #ff0000; } +/**:nth-child(n + 5){ background: #ff0000; }*/ h1, h2, h3, h4, h5 { font-family: 'museo_slab_500italic', Arial, Helvetica, sans-serif; font-weight: normal; @@ -65,7 +65,7 @@ h3 { .main-nav a:hover { /*margin-left: -1000px;*/ } -*:nth-child(n + 5){ background: #ff0000; } +*:nth-child(n + 5){ /*background: #ff0000;*/ } /*********************\ HEADER @@ -117,7 +117,7 @@ h3 { } -*:nth-child(n + 5){ background: #ff0000; } +*:nth-child(n + 5){ /*background: #ff0000;*/ } .site-section { margin-top: 100px; text-shadow: 0 1px 0 #fff; From 3315c2492a09761abea3fc0b56587e43479b98d0 Mon Sep 17 00:00:00 2001 From: Zuhair Date: Sat, 27 Oct 2012 16:13:19 -0500 Subject: [PATCH 8/9] Centered the text for each step of the how it works --- app/styles/main.css | 1 + 1 file changed, 1 insertion(+) diff --git a/app/styles/main.css b/app/styles/main.css index 879993d..18b67a1 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -134,6 +134,7 @@ h3 { .how-it-works .step { padding: 0 15px; + text-align:center; } *~*+*~*>*>*>*>* label{opacity:240;} From d607afe640de57ca457391c0111946be8148b106 Mon Sep 17 00:00:00 2001 From: Zuhair Date: Sat, 27 Oct 2012 16:19:36 -0500 Subject: [PATCH 9/9] Added back in the shadown for the avatars --- app/styles/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/main.css b/app/styles/main.css index 18b67a1..cd83606 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -193,7 +193,7 @@ h3 { .activity .avatar { width: 40px; - /*box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);*/ + box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); -webkit-border-radius: 40px; }