Merge branch 'master' of github.com:keoghpe/spectre

keoghpe · Feb 15, 2018 · cb5d09c · cb5d09c
2 parents 4f96539 + a9fb17a
commit cb5d09c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/app/assets/stylesheets/components/masthead.scss b/app/assets/stylesheets/components/masthead.scss
@@ -34,6 +34,6 @@
   animation-iteration-count: infinite;
   display: inline-block;
   margin-left: 8px;
-  vertical-align: baseline;
-  width: 14px;
+  vertical-align: middle;
+  width: 32px;
 }
diff --git a/app/assets/stylesheets/utilities/variables.scss b/app/assets/stylesheets/utilities/variables.scss
@@ -1,10 +1,10 @@
 $container-width: 1300px;
 
 $colours: (
-  'deep-blue': #223658,
+  'deep-blue': #131313,
   'turquoise': #39d398,
   'coral-pink': #fb3457,
-  'yellow': #ffae0c,
+  'yellow': #eda22b,
   'sky': #3d5cee,
   'warm-grey': #5f6062,
   'dark-grey': #333333,

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= @page_title %> — Spectre</title>
-    <link rel="icon" href="/favicon.gif">
+    <title><%= @page_title %> — GoldenEye</title>
+    <link rel="icon" href="/favicon.png">
     <%= stylesheet_link_tag 'application', media: 'all' %>
     <link href="https://fonts.googleapis.com/css?family=Merriweather:400,700" rel="stylesheet" type="text/css">
     <%= javascript_include_tag 'application' %>
@@ -12,7 +12,7 @@
 
     <div class="masthead">
       <div class="container header">
-        <a class="masthead__name" href="<%= projects_url %>">Spectre<img src="/favicon.gif" alt="" class="masthead__logo"></a>
+        <a class="masthead__name" href="<%= projects_url %>">GoldenEye<img src="/goldeneye-logo.png" alt="" class="masthead__logo"></a>
       </div>
     </div>
 

diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
@@ -14,7 +14,7 @@
   </thead>
   <tbody>
     <% @projects.includes(:suites).each do |project| %>
-      <% project.suites.each_with_index do |suite, i| %>
+      <% project.suites.order(updated_at: :desc).each_with_index do |suite, i| %>
       <tr id="project_<%= project.id %>" class="project">
         <th><%= project.name %></th>
         <td><%= link_to suite.name, project_suite_path(suite.project, suite) %></td>

diff --git a/public/favicon.png b/public/favicon.png
diff --git a/public/goldeneye-logo.png b/public/goldeneye-logo.png