summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRosemary Sanchez <rsanchez@madebyuppercut.com>2013-07-21 19:40:15 -0600
committerRosemary Sanchez <rsanchez@madebyuppercut.com>2013-07-21 19:40:15 -0600
commitca184365d9b2919b260d49131407f20058702797 (patch)
tree6a94727af16386bc2a1da8ed105170c4690da873 /app
parentbad0a8afd91ca78d5ca1692ef1c8fcb2a20487a0 (diff)
Some stuff for mobile and the footer still needs work.
Diffstat (limited to 'app')
-rw-r--r--app/assets/images/mobile/logo.pngbin0 -> 3298 bytes
-rw-r--r--app/assets/stylesheets/custom.css.scss30
-rw-r--r--app/assets/stylesheets/forms.css.scss5
-rw-r--r--app/assets/stylesheets/media-queries.css.scss24
-rw-r--r--app/assets/stylesheets/settings.css.scss1
-rw-r--r--app/views/layouts/application.html.erb3
6 files changed, 56 insertions, 7 deletions
diff --git a/app/assets/images/mobile/logo.png b/app/assets/images/mobile/logo.png
new file mode 100644
index 0000000..7b3b046
--- /dev/null
+++ b/app/assets/images/mobile/logo.png
Binary files differ
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 5aba5f7..61220de 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -9,14 +9,17 @@ body {
footer{
background-color: $blue;
- bottom: 0;
- position: fixed;
- width: 100%;
+ /*bottom: 0;*/
+ /*position: absolute;*/
+ /*width: 100%;*/
padding: 20px 20px;
.content{
color: white;
margin: 0 auto;
+ margin-bottom: 220px;
+ text-align: center;
+ border: 1px solid magenta;
a{
color: white;
@@ -36,6 +39,14 @@ h1#logo{
h2 { font-size: 44px; line-height: 48px; color: #333;}
+a{
+ color: $green;
+ &:hover{
+ color: $lightgreen;
+ text-decoration: none;
+ }
+}
+
.about {
margin: 54px 0 90px;
font: 36px/48px "Helvetica Neue";
@@ -67,3 +78,16 @@ h2 { font-size: 44px; line-height: 48px; color: #333;}
@include clearfix;
}
+
+#thanks{
+ clear: both;
+ padding-top: 45px;
+ p{
+ font: 36px/48px "Helvetica Neue";
+ font-weight: 200;
+ }
+
+ a{
+ font-weight: 400;
+ }
+}
diff --git a/app/assets/stylesheets/forms.css.scss b/app/assets/stylesheets/forms.css.scss
index 0b965fe..23ad0c8 100644
--- a/app/assets/stylesheets/forms.css.scss
+++ b/app/assets/stylesheets/forms.css.scss
@@ -1,4 +1,5 @@
@import "mixins.css.scss";
+@import "settings.css.scss";
input[type="email"], input[type="submit"]{
border-color: #79a8c4;
@@ -28,10 +29,10 @@ input[type="email"]{
input[type="submit"] {
color: #FFFFFF;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- @include gradient(#B1DBAA, #8BC980);
+ @include gradient($lightgreen, $green);
@include border-radius(4px);
padding: 20px 73px;
- border-color: #8BC980;
+ border-color: $green;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
diff --git a/app/assets/stylesheets/media-queries.css.scss b/app/assets/stylesheets/media-queries.css.scss
index 0f6a31d..6e51629 100644
--- a/app/assets/stylesheets/media-queries.css.scss
+++ b/app/assets/stylesheets/media-queries.css.scss
@@ -1,5 +1,8 @@
/* Large desktop */
-@media (min-width: 1200px) {}
+@media (min-width: 1200px) {
+
+ /*740px;*/
+}
/* Portrait tablet to landscape and desktop */
@media (min-width: 768px) and (max-width: 979px) {}
@@ -8,4 +11,21 @@
@media (max-width: 767px) {}
/* Landscape phones and down */
-@media (max-width: 480px) {}
+@media (max-width: 480px) {
+ #logo {
+ background: transparent url('/assets/mobile/logo.png') no-repeat 0 0;
+ /*width: 250px;
+ height: 69px;*/
+ }
+ #logo, .field, .action { float: none; }
+ h2, .about {font-size: 1.5em; line-height: 1.25em;}
+
+ #new_sign_up{
+ .field{
+ input[type="email"]{
+ width: 240px;
+ }
+ margin-right: 20px;
+ }
+ }
+}
diff --git a/app/assets/stylesheets/settings.css.scss b/app/assets/stylesheets/settings.css.scss
index 98e9afd..55f1506 100644
--- a/app/assets/stylesheets/settings.css.scss
+++ b/app/assets/stylesheets/settings.css.scss
@@ -2,3 +2,4 @@ $beige: #fffcf3;
$blue: #719ad0;
$green: #8bc980;
$orange: #e17a26;
+$lightgreen: #B1DBAA;
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 19ee094..67222a0 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -7,6 +7,9 @@
<meta name="description" content="">
<meta name="author" content="">
<%= favicon_link_tag 'favicon.ico' %>
+ <link rel="apple-touch-icon" href="touch-icon-iphone.png" />
+ <link rel="apple-touch-icon" sizes="72x72" href="touch-icon-ipad.png" />
+ <link rel="apple-touch-icon" sizes="114x114" href="touch-icon-iphone4.png" />
<%= stylesheet_link_tag "application", :media => "all" %>
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>