summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRosemary Sanchez <rsanchez@madebyuppercut.com>2013-07-22 17:02:40 -0600
committerRosemary Sanchez <rsanchez@madebyuppercut.com>2013-07-22 17:02:40 -0600
commit13a40786efbb7025af7888fcfed3772b72e14bc5 (patch)
tree5f0a53f5ce949a86774a33e22d344a67ebbc410c /app
parent816743656201c0ca2a8fb6282870184636878e0c (diff)
Style error messaging.
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/custom.css.scss1
-rw-r--r--app/assets/stylesheets/forms.css.scss14
-rw-r--r--app/assets/stylesheets/media-queries.css.scss2
-rw-r--r--app/assets/stylesheets/settings.css.scss1
-rw-r--r--app/views/sign_ups/_form.html.erb19
5 files changed, 26 insertions, 11 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 5aa1d06..7d67e79 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -69,6 +69,7 @@ a{
}
#new_sign_up{
+ position: relative;
label{
font-style: italic;
font-weight: 200;
diff --git a/app/assets/stylesheets/forms.css.scss b/app/assets/stylesheets/forms.css.scss
index 23ad0c8..96d50be 100644
--- a/app/assets/stylesheets/forms.css.scss
+++ b/app/assets/stylesheets/forms.css.scss
@@ -45,3 +45,17 @@ input[type="submit"][disabled] {
background-color: #8BC980;
*background-color: #003bb3;
}
+
+
+#error_explanation{
+ position: absolute;
+ bottom: -10px;
+
+ ul{
+ margin: 0;
+ li{
+ list-style-type: none;
+ color: $red;
+ }
+ }
+}
diff --git a/app/assets/stylesheets/media-queries.css.scss b/app/assets/stylesheets/media-queries.css.scss
index 14b913a..de3348a 100644
--- a/app/assets/stylesheets/media-queries.css.scss
+++ b/app/assets/stylesheets/media-queries.css.scss
@@ -3,7 +3,7 @@
.container { min-height: 600px; }
}
-@media (min-width: 979px) and (orientation: landscape) {
+@media (max-width: 979px) and (orientation: landscape) {
h1#logo { float: none; }
#new_sign_up{
.field{
diff --git a/app/assets/stylesheets/settings.css.scss b/app/assets/stylesheets/settings.css.scss
index 55f1506..2bb1e16 100644
--- a/app/assets/stylesheets/settings.css.scss
+++ b/app/assets/stylesheets/settings.css.scss
@@ -3,3 +3,4 @@ $blue: #719ad0;
$green: #8bc980;
$orange: #e17a26;
$lightgreen: #B1DBAA;
+$red: #cc0000;
diff --git a/app/views/sign_ups/_form.html.erb b/app/views/sign_ups/_form.html.erb
index f43a252..8a70ca4 100644
--- a/app/views/sign_ups/_form.html.erb
+++ b/app/views/sign_ups/_form.html.erb
@@ -1,17 +1,16 @@
<%= form_for(@sign_up) do |f| %>
- <% if @sign_up.errors.any? %>
- <div id="error_explanation">
- <ul>
- <% @sign_up.errors.full_messages.each do |msg| %>
- <li><%= msg %></li>
- <% end %>
- </ul>
- </div>
- <% end %>
-
<div class="field">
<%= f.label :email, "Want to know when we're ready to launch?" %>
<%= f.email_field :email, placeholder: 'Email' %>
+ <% if @sign_up.errors.any? %>
+ <div id="error_explanation">
+ <ul>
+ <% @sign_up.errors.full_messages.each do |msg| %>
+ <li><%= msg %></li>
+ <% end %>
+ </ul>
+ </div>
+ <% end %>
</div>
<div class="actions">
<%= f.submit "Sign up now" %>