Restyle navbar and use across entire site

5 files changed, 10 insertions, 16 deletions

diff --git a/src/components/simulations/FilterButton.sass b/src/components/simulations/FilterButton.sass
index 60f6faca..698bc9a4 100644
--- a/src/components/simulations/FilterButton.sass
+++ b/src/components/simulations/FilterButton.sass
@@ -4,18 +4,13 @@
 .simulation-filter-button
   display: inline-block
   width: 33.3%
-  //margin-right: -4px
   padding: 10px $global-padding
 
   font-size: 12pt
-  border-right: 1px solid #06326b
 
   +clickable
   +transition(background, $transition-length)
 
-.simulation-filter-button:last-of-type
-  border: 0
-
 .simulation-filter-button:hover
   background: #0c60bf
 
diff --git a/src/components/simulations/FilterPanel.js b/src/components/simulations/FilterPanel.js
index b43139c1..811da005 100644
--- a/src/components/simulations/FilterPanel.js
+++ b/src/components/simulations/FilterPanel.js
@@ -7,7 +7,7 @@ const FilterPanel = () => (
         <div className="simulation-filters">
             <FilterLink filter="SHOW_ALL">All Simulations</FilterLink>
             <FilterLink filter="SHOW_OWN">My Simulations</FilterLink>
-            <FilterLink filter="SHOW_SHARED">Simulations shared with me</FilterLink>
+            <FilterLink filter="SHOW_SHARED">Shared with me</FilterLink>
         </div>
     </div>
 );
diff --git a/src/components/simulations/FilterPanel.sass b/src/components/simulations/FilterPanel.sass
index a59ffdfd..70401dcb 100644
--- a/src/components/simulations/FilterPanel.sass
+++ b/src/components/simulations/FilterPanel.sass
@@ -5,12 +5,11 @@
   display: block
 
   background: #0761b1
-  border: 1px solid #06326b
   color: #eee
 
   text-align: center
 
-  +border-radius($standard-border-radius)
+  +border-radius(25px)
   overflow: hidden
 
   margin-bottom: 20px
diff --git a/src/components/simulations/SimulationActionButtons.js b/src/components/simulations/SimulationActionButtons.js
index 1731b9be..29872fcb 100644
--- a/src/components/simulations/SimulationActionButtons.js
+++ b/src/components/simulations/SimulationActionButtons.js
@@ -7,7 +7,7 @@ const SimulationActionButtons = ({simulationId, onViewUsers, onDelete}) => (
         <Link to={"/simulations/" + simulationId} className="open" title="Open this simulation">
             <span className="fa fa-play"/>
         </Link>
-        <div className="users" title="View and edit collaborators on this simulation"
+        <div className="users" title="View and edit collaborators"
              onClick={() => onViewUsers(simulationId)}>
             <span className="fa fa-users"/>
         </div>
diff --git a/src/components/simulations/SimulationAuthList.sass b/src/components/simulations/SimulationAuthList.sass
index 58683446..cb1fe4cc 100644
--- a/src/components/simulations/SimulationAuthList.sass
+++ b/src/components/simulations/SimulationAuthList.sass
@@ -54,8 +54,9 @@
 .simulation-list .list-head > div:not(:first-of-type)
   padding-left: 5px !important
 
-.simulation-row .simulation-icons
+.simulation-icons
   text-align: right
+  padding-right: 0 !important
 
 .simulation-row .simulation-icons div, .simulation-row .simulation-icons a
   display: inline-block
@@ -75,9 +76,10 @@
     top: -4px
     left: -1px
 
+  background-color: $blue-dark
+
   &.open
-    $icon-color: #0c60bf
-    background: $icon-color
+    $icon-color: #0a00bf
 
     span
       left: 1px
@@ -91,23 +93,21 @@
   &.users
     font-size: 10pt
     $icon-color: #17bf55
-    background: $icon-color
 
     span
       left: -2px
 
     &:hover
-      background: lighten($icon-color, 10%)
+      background: $icon-color
 
     &:active
       background: darken($icon-color, 10%)
 
   &.delete
     $icon-color: #e3474d
-    background: $icon-color
 
     &:hover
-      background: lighten($icon-color, 10%)
+      background: $icon-color
 
     &:active
       background: darken($icon-color, 10%)