Merge branch 'develop' into topic/COR-777-RSS-Cache-Times

Author: ElliottAYoung

app/assets/stylesheets/authentication.scss

@@ -29,6 +29,6 @@ form.new_user .mdl-button {
 }
 
 .authentication__header-text {
-  @extend %display-text;
+  @include display-text;
   color: $color-white;
 }

app/assets/stylesheets/components/sidebar.scss

@@ -4,11 +4,11 @@ $sidebar-link-width: $sidebar-width-expanded - 60px; // link padding = 60px
 $sidebar-collapse-transition: width 0.2s cubic-bezier(0.4, 0, 0.2, 1), transform 0.2s cubic-bezier(0.4, 0, 0.2, 1);
 $sidebar-toggle-button-transition: transform 500ms linear;
 
-.tenant__item {
+.nav__item {
   position: relative;
 }
 
-.tenant__item .material-icons {
+.nav__item .material-icons {
   position: absolute;
   right: 10px;
 }
@@ -21,7 +21,7 @@ $sidebar-toggle-button-transition: transform 500ms linear;
   flex-grow: 0;
   flex-shrink: 0;
   flex-basis: auto;
-  box-shadow: 1px 0px 5px 1px rgba(0,0,0,.5);
+  box-shadow: 1px 0px 5px 1px rgba(0, 0, 0, .5);
   overflow-y: hidden;
 }
 
@@ -42,7 +42,7 @@ $sidebar-toggle-button-transition: transform 500ms linear;
 }
 
 .sidebar__brand-name {
-  @extend %display-text;
+  @include display-text;
   color: $color-white;
   margin: 0 15px;
   text-decoration: none;
@@ -80,7 +80,7 @@ $sidebar-toggle-button-transition: transform 500ms linear;
   color: $color-grey-dark;
 }
 
-.mdl-layout__drawer .mdl-navigation .mdl-navigation__link.tenant__item {
+.mdl-layout__drawer .mdl-navigation .mdl-navigation__link.nav__item {
   background-color: $employer-color;
   color: $color-white;
 }
@@ -103,35 +103,50 @@ $sidebar-toggle-button-transition: transform 500ms linear;
   }
 }
 
-// Collapsing
-
-@media only screen and (min-width: 1024px) {
-.sidebar--collapsed {
-
-  .nav__item-name,
-  .sidebar__brand-name {
-    display: none;
-  }
-
-  .mdl-layout__drawer .mdl-navigation .mdl-navigation__link {
-    padding-left: 30px;
-  }
+.environment {
+  background-color: $flash-error-background !important;
+}
 
-  .tenant__item .material-icons {
-    position: static;
-  }
+.environment__abbreviated {
+  display: none;
+}
 
-  .sidebar__toggle-button:after {
-    transform: rotate(-540deg);
-    transition: $sidebar-toggle-button-transition;
-  }
+// Collapsing
 
-  .layout__sidebar {
-    width: $sidebar-width-collapsed;
-    transition: $sidebar-collapse-transition;
+@media only screen and (min-width: 1024px) {
+  .sidebar--collapsed {
+    .environment__full {
+      display: none;
+    }
+
+    .environment__abbreviated {
+      display: block;
+    }
+
+    .nav__item-name,
+    .sidebar__brand-name {
+      display: none;
+    }
+
+    .mdl-layout__drawer .mdl-navigation .mdl-navigation__link {
+      padding-left: 30px;
+    }
+
+    .nav__item .material-icons {
+      position: static;
+    }
+
+    .sidebar__toggle-button:after {
+      transform: rotate(-540deg);
+      transition: $sidebar-toggle-button-transition;
+    }
+
+    .layout__sidebar {
+      width: $sidebar-width-collapsed;
+      transition: $sidebar-collapse-transition;
+    }
   }
 }
-}
 
 @media only screen and (max-width: 1024px) {
   .layout__sidebar,

app/assets/stylesheets/variables/_typography.scss

@@ -29,7 +29,7 @@
 $cortex-font-stack: Montserrat, sans-serif;
 $base-font-size: 1rem;
 
-%display-text { // Cortex Logo
+@mixin display-text { // Cortex Logo
   color: $color-grey-dark;
   font-family: $cortex-font-stack;
   font-weight: normal;

app/helpers/application_helper.rb

@@ -10,10 +10,27 @@ def extra_config
   end
 
   def qualtrics_domain
-  	extra_config.qualtrics_id.delete('_').downcase
+    extra_config.qualtrics_id.delete('_').downcase
   end
 
   def flag_enabled?(flag_name)
     Cortex.flipper[flag_name].enabled?(current_user, request)
   end
+
+  def environment
+    request.local? ? :local : Rails.env
+  end
+
+  def environment_abbreviated
+    case environment
+      when 'production'
+        :prd
+      when 'staging'
+        :stg
+      when 'development'
+        :dev
+      else
+        :loc
+    end
+  end
 end

app/views/layouts/application.html.haml

@@ -18,7 +18,7 @@
         %main.mdl-layout__content.layout__main-content
           = yield
     = render 'partials/flash'
-    
+
     %script{src: '//cdn.ckeditor.com/4.6.2/standard-all/ckeditor.js', type: 'text/javascript'}
     = javascript_include_tag :application, {'data-turbolinks-eval': false}
     = render 'layouts/google_analytics' if extra_config.google_analytics_id?

app/views/partials/_environment_display.html.haml

@@ -0,0 +1,5 @@
+.mdl-navigation__link.nav__item.environment{class: "environment--#{environment}"}
+  .environment__full
+    = environment
+  .environment__abbreviated
+    = environment_abbreviated

app/views/partials/_sidebar.html.haml

@@ -4,5 +4,9 @@
       = image_tag 'logo.svg', class: 'sidebar__brand-logo'
       %h1.sidebar__brand-name Cortex
   = render 'partials/navigation'
-  = render 'partials/tenant_display'
+  %footer
+    %nav.demo-navigation.mdl-navigation
+      - unless environment == :production
+        = render 'partials/environment_display'
+      = render 'partials/tenant_display'
   .sidebar__toggle-button#sidebar__toggle-button

app/views/partials/_tenant_display.html.haml

@@ -1,4 +1,2 @@
-%footer
-  %nav.demo-navigation.mdl-navigation
-    %div{class: 'mdl-navigation__link tenant__item'}
-      = cell(:tenant, Tenant.find_by_name('Corporate') || current_user.tenant).(:current)
+.mdl-navigation__link.nav__item
+  = cell(:tenant, Tenant.find_by_name('Corporate') || current_user.tenant).(:current)