Change color for weekly planning feature (#75)

* Standardize single navigation links * Standardize weekly blue color and adjust navigation color
blvrd · Jan 22, 2018 · d8c9ee2 · d8c9ee2
1 parent 6eeb622
commit d8c9ee2
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 35 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2017 Garrett Martin
+Copyright 2018 Volition
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/app/assets/stylesheets/application/marketing.scss b/app/assets/stylesheets/application/marketing.scss
@@ -154,7 +154,7 @@
   text-align: center;
   font-size: 2rem;
   margin: 0 !important;
-  color: $light-blue;
+  color: $blue;
 }
 
 .sectionHeading {

diff --git a/app/assets/stylesheets/application/navigation.scss b/app/assets/stylesheets/application/navigation.scss
@@ -51,7 +51,7 @@
   @include align-self(flex-end);
   margin: 10px 40px 5px 0;
   font-size: 1rem;
-  color: $medium-gray;
+  color: $dark-gray;
 
   @include MQ(M) {
     display: none;
@@ -62,7 +62,7 @@
   @include display-flex;
   @include flex-direction(column-reverse);
   font-size: 1.2rem;
-  color: $lighter-blue;
+  color: $medium-gray;
   cursor: pointer;
 
   @include MQ(M) {
@@ -75,8 +75,8 @@
 .menuOverlay {
   width: 100vw !important;
   height: 100vh !important;
-  background: $light-blue;
-  opacity: 0.95;
+  background: $dark-gray;
+  opacity: .97;
   position: absolute;
   z-index: 1000;
   @include display-flex;

diff --git a/app/assets/stylesheets/application/week_plan.scss b/app/assets/stylesheets/application/week_plan.scss
@@ -1,7 +1,7 @@
 %weeklyTodos {
   position: relative;
-  background: $lightest-blue;
-  border: 2px solid $lighter-blue;
+  background: $blue;
+  border: 2px solid $blue;
   border-radius: $base-border-radius;
   color: $white;
   font-size: 1rem;
@@ -13,12 +13,12 @@
     height: 100%;
     overflow-y: auto;
     &::-webkit-scrollbar {
-      background-color: $lightest-blue;
+      background-color: $blue;
       width: 5px;
     }
 
     &::-webkit-scrollbar-thumb {
-      background-color: $lighter-blue;
+      background-color: $blue;
       border-radius: 3px;
     }
   }
@@ -40,7 +40,7 @@
     position: absolute;
     top: -20px;
     right: -2px;
-    background: $lighter-blue;
+    background: $blue;
     border-radius: 3px;
     width: 40px;
     height: 20px;
@@ -89,11 +89,6 @@
     cursor: default;
     transition: background 400ms;
 
-
-    // &:hover {
-    //   background: $lighter-blue;
-    // }
-
     .deleteTodoButton {
       width: 20px;
       height: 20px;
@@ -124,4 +119,3 @@
     margin-right: 10px;
   }
 }
-
diff --git a/app/assets/stylesheets/base/_buttons.scss b/app/assets/stylesheets/base/_buttons.scss
@@ -87,9 +87,16 @@ button, .button, input[type="submit"] {
   }
 
   &.blue {
-    background-color: $lightest-blue;
-    border: 2px solid $lighter-blue;
+    background-color: $blue;
+    border: 2px solid $blue;
     padding: 0.6em $base-spacing;
+
+    &:hover,
+    &:focus {
+      background-color: $dark-blue;
+      border: 2px solid $dark-blue;
+      color: #fff;
+    }
   }
 }
 

diff --git a/app/assets/stylesheets/base/_variables.scss b/app/assets/stylesheets/base/_variables.scss
@@ -21,13 +21,11 @@ $dark-gray: #555;
 $medium-gray: #999;
 $light-gray: #ddd;
 $red: #f44336;
-$dark-red: darken($red, 5%);
+$dark-red: darken($red, 10%);
 $green: #49be5a;
 $dark-green: darken($green, 10%);
-$blue: #25323c;
-$light-blue: lighten($blue, 8%);
-$lighter-blue: lighten($blue, 15%);
-$lightest-blue: lighten($blue, 40%);
+$blue: #4285F4;
+$dark-blue: darken($blue, 10%);
 $white: #fff;
 $yellow: lighten(#ffff00, 35%);
 $heroku-purple: #7057bc;

diff --git a/app/assets/stylesheets/flashes.scss b/app/assets/stylesheets/flashes.scss
@@ -16,6 +16,6 @@
 }
 
 .flash-success {
-  border: 2px solid $lightest-blue;
+  border: 2px solid $blue;
   border-radius: $base-border-radius;
 }
diff --git a/app/views/dashboard/show.html.erb b/app/views/dashboard/show.html.erb
@@ -1,7 +1,7 @@
 <section class="appSection">
   <h1>Dashboard</h1>
   <% if today_is_trackable? %>
-    <%= link_to "go to today's tasks &rarr;".html_safe, today_path, class: "todayLink" %>
+    <%= link_to "Go to today's tasks".html_safe, today_path, class: "todayLink" %>
   <% else %>
     <p class="weekendMessage">Have a good <%= Date::DAYNAMES[Date.current.wday] %> and get some rest.</p>
   <% end %>

diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
@@ -1,6 +1,6 @@
 <footer>
   <p>
-    &copy; <%= Date.current.year %> Garrett Martin
+    &copy; <%= Date.current.year %> Volition
     <br>
     <%= link_to 'Philosophy', philosophy_path  %>
     <br>

diff --git a/app/views/mockups/dashboard.html.erb b/app/views/mockups/dashboard.html.erb
@@ -1,6 +1,6 @@
 <section class="dashboardSection">
   <h1>Dashboard</h1>
-  <a class="todayLink" href="/mockups/today">go to today's tasks &rarr;</a>
+  <a class="todayLink" href="/mockups/today">Go to today's tasks</a>
   <ul class="daySummaryList">
     <a href="/mockups/today" class="noTextStyle">
       <li class="daySummary today">

diff --git a/app/views/mockups/week_plan.html.erb b/app/views/mockups/week_plan.html.erb
@@ -15,7 +15,7 @@
       </div>
     </div>
 
-    <%= link_to "&larr; go back to dashboard".html_safe, dashboard_path %>
+    <%= link_to "Go back to dashboard".html_safe, dashboard_path %>
 
     <p class="instructions">Use this area as a brain dump. Add as many tasks as you need. You can always come back and add more throughout the week.</p>
 

diff --git a/app/views/pages/welcome.html.erb b/app/views/pages/welcome.html.erb
@@ -38,6 +38,6 @@
 
     <p>&mdash; Garrett Martin</p>
 
-    <%= link_to 'Get started &rarr;'.html_safe, dashboard_path, class: 'button' %>
+    <%= link_to 'Get started'.html_safe, dashboard_path, class: 'button' %>
   </div>
 </section>
diff --git a/app/views/reflections/new.html.erb b/app/views/reflections/new.html.erb
@@ -1,6 +1,6 @@
 <section class="appSection">
   <h1>Daily reflection</h1>
-  <%= link_to "&larr; go back to today's tasks".html_safe, today_path %>
+  <%= link_to "Go back to today's tasks".html_safe, today_path %>
 
   <div class="daySummary reflectionDaySummary breatheTop">
     <div class="flexColumn flexAlignCenter flexJustifySpaceAround daySummaryInfoColumn">

diff --git a/app/views/today/new.html.erb b/app/views/today/new.html.erb
@@ -5,7 +5,7 @@
     <div class="calendarIconDay"><span class="day"><%= Date.current.strftime('%e') %></span></div>
   </div>
   <% unless current_user.guest? %>
-    <%= link_to "&larr; go back to dashboard".html_safe, dashboard_path %>
+    <%= link_to "Go back to dashboard".html_safe, dashboard_path %>
   <% end %>
 
   <p class="instructions">Let's plan tasks for today. In the "estimate" column, enter your guess for how many 25 minute blocks it will take to finish each task. If you think it will take more than five, break it down into smaller tasks.</p>

diff --git a/app/views/today/show.html.erb b/app/views/today/show.html.erb
@@ -5,6 +5,8 @@
     <div class="calendarIconDay"><span class="day"><%= Date.current.strftime('%e') %></span></div>
   </div>
 
+  <%= link_to "Go back to dashboard".html_safe, dashboard_path %>
+
   <%= react_component 'TodoList', todos: @todos %>
 
   <% if current_week_plan.todos.present? %>

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
@@ -1,6 +1,6 @@
 <section class="appSection">
   <h1>Settings</h1>
-  <%= link_to "&larr; go back to dashboard".html_safe, dashboard_path %>
+  <%= link_to "Go back to dashboard".html_safe, dashboard_path %>
 
   <%= form_for @user, html: { class: 'settingsForm breatheTop google_signin', id: 'payment-form' } do |f| %>
     <div class="settingsSection">
@@ -120,4 +120,3 @@
     <%= f.submit "Save" %>
   <% end %>
 </section>
-
diff --git a/app/views/week_plan/show.html.erb b/app/views/week_plan/show.html.erb
@@ -15,7 +15,7 @@
       </div>
     </div>
 
-    <%= link_to "&larr; go back to dashboard".html_safe, dashboard_path %>
+    <%= link_to "Go back to dashboard".html_safe, dashboard_path %>
 
     <p class="instructions">Use this area as a brain dump. Add as many tasks as you need. You can always come back and add more throughout the week.</p>