From 84dd32f61e720fcf1b32a3cdcac997d6f298f43c Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Wed, 29 Apr 2015 16:15:44 -0700
Subject: [PATCH 1/2] More tweaks to education page

---
 sass/_project-sass/_project-Header.scss | 6 +++++-
 views/_header_links.erb                 | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sass/_project-sass/_project-Header.scss b/sass/_project-sass/_project-Header.scss
index ba5e671b..28e64804 100644
--- a/sass/_project-sass/_project-Header.scss
+++ b/sass/_project-sass/_project-Header.scss
@@ -89,7 +89,11 @@
     img {
       @include vendor(transform, scaleX(-1));
       width: 100px;
-      margin-right: 20px;
+      margin-right: 25px;
+      
+      &.float-Right {
+        margin-left: 10px;
+      }
     }
     .intro-text {
       font-size: 1.1em;
diff --git a/views/_header_links.erb b/views/_header_links.erb
index e011af15..074fc343 100644
--- a/views/_header_links.erb
+++ b/views/_header_links.erb
@@ -1,4 +1,4 @@
-<% if request.path == '/' && !signed_in? %>
+<% if (request.path == '/'  && !signed_in?) || request.path == '/education' %>
   <li>
     <a href="/">Neocities</a>
   </li>

From 94ee46d9e8dc663d682ef48067fe040312077fa0 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Wed, 29 Apr 2015 16:42:49 -0700
Subject: [PATCH 2/2] Changed yellow alert color to alert-error only, tweaked
 some alerts

---
 sass/_project-sass/_project-Base.scss |  2 +-
 views/education.erb                   | 10 ++++------
 views/index.erb                       | 10 ++++------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/sass/_project-sass/_project-Base.scss b/sass/_project-sass/_project-Base.scss
index 71b8a3c7..0d82fa65 100644
--- a/sass/_project-sass/_project-Base.scss
+++ b/sass/_project-sass/_project-Base.scss
@@ -59,7 +59,7 @@ a{
 @import 'project-Main';			// Project Specific Main Content Area Styling
 @import 'project-Footer';		// Project Specific Footer Styling
 
-.alert{
+.alert-error {
    background-color:#F5BA00; color:#fff;
 }
 
diff --git a/views/education.erb b/views/education.erb
index e62c42ca..3b9f7c3c 100644
--- a/views/education.erb
+++ b/views/education.erb
@@ -75,12 +75,10 @@
           </nav>
 
           <% if flash.keys.length > 0 %>
-            <div class="alert txt-Center">
-              <p style="padding:5px">
-                <% flash.keys.each do |key| %>
-                  <%== flash[key] %>
-                <% end %>
-              </p>
+            <div class="alert alert-block txt-Center">
+              <% flash.keys.each do |key| %>
+                <%== flash[key] %>
+              <% end %>
             </div>
           <% end %>
 
diff --git a/views/index.erb b/views/index.erb
index 02b720b0..7103cf1b 100644
--- a/views/index.erb
+++ b/views/index.erb
@@ -75,12 +75,10 @@
           </nav>
 
           <% if flash.keys.length > 0 %>
-            <div class="alert txt-Center">
-              <p style="padding:5px">
-                <% flash.keys.each do |key| %>
-                  <%== flash[key] %>
-                <% end %>
-              </p>
+            <div class="alert alert-block txt-Center">
+              <% flash.keys.each do |key| %>
+                <%== flash[key] %>
+              <% end %>
             </div>
           <% end %>