blacklight-spotlight 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89df58d840a596c845a8bcbb2f62b49ac7b0e9a5
-  data.tar.gz: 7ddcda4d2cee3f8fd7f760962b6ff2fda4f563b2
+  metadata.gz: 5a0bdc363611ae794c9f8538a86d7c183e6106fd
+  data.tar.gz: 6eaa6b1112ae5187727f5d55fe8cc8dafd80aa66
 SHA512:
-  metadata.gz: 7c6187d960f255975cba4928ab6359397482ef09c72e9034d2d2ef67464a76500a60b812c9f95f634f12de114cd1f0fb7d3a62935a8200f14269a98c72018441
-  data.tar.gz: cd79ced46190290e79965c6058fae17a7eaae996c2e6ea1cb01d0138080864c74f3c6a7e44644207ad4dfec92cd5bcbd9f916765401385703196eec4723af220
+  metadata.gz: 076a0d3486082869865b4adbf54613ed42022236890d6c2b60dcd979a65dbc1b4bb61a5294047c2c31d8f424a3d42798fc6cad267bb37016fd20d59337d10eb5
+  data.tar.gz: 67e395d6f4c102f7549ca82a54f862d0bd97f252e6c0040a48f8577b67ed91ca9cb3a2b2fc39e6b86add8903e10c1e695dc30c445a6f5fbcc9b418d98fe698aa

data/app/assets/stylesheets/spotlight/_header.scss

@@ -1,7 +1,5 @@
 $masthead-height: 180px;
 $masthead-image-blur: 1px;
-$menu-link-background-color-active: rgba(255, 255, 255, 0.3);
-$menu-link-background-color-hover: rgba(255, 255, 255, 0.15);
 
 @mixin masthead-background-containers() {
   position: absolute;
@@ -12,7 +10,9 @@ $menu-link-background-color-hover: rgba(255, 255, 255, 0.15);
   height: inherit;
 }
 
-@mixin masthead-navigation-menu() {
+@mixin transparent-masthead-navigation-menu() {
+  @extend .navbar-transparent;
+
   border: 0;
   border-radius: 0;
 
@@ -21,39 +21,14 @@ $menu-link-background-color-hover: rgba(255, 255, 255, 0.15);
       text-transform: uppercase;
 
       a {
-        color: $gray-lighter;
         letter-spacing: 1.2px;
       }
     }
 
-    a:hover {
-      background-color: $menu-link-background-color-hover;
-    }
-
-    > .active > a {
-      background-color: $menu-link-background-color-active;
-      color: $white;
-    }
-
     .dropdown-menu {
       text-transform: none;
-
-      > li a {
-        color: $black;
-
-        &:hover {
-          background-color: $gray-lighter;
-        }
-      }
     }
   }
-
-  // Curated Features menu link when it has dropdown menu
-  .navbar-nav > .open > a,
-  .navbar-nav > .open > a:hover,
-  .navbar-nav > .open > a:focus {
-    background-color: $menu-link-background-color-hover;
-  }
 }
 
 #exhibit-masthead,
@@ -65,28 +40,14 @@ $menu-link-background-color-hover: rgba(255, 255, 255, 0.15);
   z-index: 100;
 
   &.page-masthead {
-    @include masthead-navigation-menu();
-    background-color: rgba(0, 0, 0, 0.5);
-    border-bottom: 1px solid $gray;
+    @include transparent-masthead-navigation-menu();
+    border-bottom: 1px solid $navbar-transparent-border;
     margin-bottom: 0;
     margin-top: 0;
 
     .navbar-nav {
       float: right;
     }
-
-    .navbar-brand,
-    .navbar-nav li {
-      color: $gray-lighter;
-
-      &.active a {
-        color: $gray;
-      }
-
-      a {
-        color: $gray-lighter;
-      }
-    }
   }
 
   .navbar-form {
@@ -95,9 +56,9 @@ $menu-link-background-color-hover: rgba(255, 255, 255, 0.15);
 }
 
 #exhibit-masthead.with-image + #exhibit-navbar.navbar-default {
-  @include masthead-navigation-menu();
-  background-color: rgba(0, 0, 0, 0.2);
-  border-top: 1px solid $gray;
+  @include transparent-masthead-navigation-menu();
+  background-color: $navbar-transparent-bg;
+  border-top: 1px solid $navbar-transparent-border;
 }
 
 .navbar + .navbar {

data/app/assets/stylesheets/spotlight/_navbar.scss

@@ -0,0 +1,48 @@
+// Transparent navbar styling, adapted directly from Bootstrap's navbar styles:
+// https://github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/_navbar.scss
+
+.navbar-transparent {
+  background-color: $navbar-transparent-bg;
+  border-color: $navbar-transparent-border;
+
+  .navbar-brand {
+    color: $navbar-transparent-brand-color;
+    &:hover,
+    &:focus {
+      color: $navbar-transparent-brand-hover-color;
+      background-color: $navbar-transparent-brand-hover-bg;
+    }
+  }
+
+  .navbar-text {
+    color: $navbar-transparent-color;
+  }
+
+  .navbar-nav {
+    > li > a {
+      color: $navbar-transparent-link-color;
+
+      &:hover,
+      &:focus {
+        color: $navbar-transparent-link-hover-color;
+        background-color: $navbar-transparent-link-hover-bg;
+      }
+    }
+    > .active > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $navbar-transparent-link-active-color;
+        background-color: $navbar-transparent-link-active-bg;
+      }
+    }
+    > .disabled > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $navbar-transparent-link-disabled-color;
+        background-color: $navbar-transparent-link-disabled-bg;
+      }
+    }
+  }
+}

data/app/assets/stylesheets/spotlight/_spotlight.scss

@@ -2,6 +2,7 @@
 @import "spotlight/mixins";
 @import "bootstrap/variables";
 
+@import "spotlight/navbar";
 @import "spotlight/sir-trevor_overrides";
 @import "spotlight/attachments";
 @import "spotlight/pages";

data/app/assets/stylesheets/spotlight/_variables.scss

@@ -9,3 +9,24 @@ $exhibit-card-border: $well-border !default;
 $exhibit-card-gutter: $padding-large-horizontal !default;
 $exhibit-card-image-size: 273px !default;
 $exhibit-card-shadow: inset 2px 2px 5px -2px $exhibit-card-border !default;
+
+$navbar-transparent-color: $gray !default;
+$navbar-transparent-bg: rgba(0, 0, 0, 0.2) !default;
+$navbar-transparent-border: $gray !default;
+$navbar-transparent-link-color: $gray-lighter !default;
+$navbar-transparent-link-hover-color: $gray-lighter !default;
+$navbar-transparent-link-hover-bg: rgba(255, 255, 255, 0.15) !default;
+$navbar-transparent-link-active-color: $gray-lighter !default;
+$navbar-transparent-link-active-bg: rgba(255, 255, 255, 0.3) !default;
+$navbar-transparent-link-disabled-color: #ccc !default;
+$navbar-transparent-link-disabled-bg: transparent !default;
+
+// Navbar brand label
+$navbar-transparent-brand-color: $navbar-transparent-link-color !default;
+$navbar-transparent-brand-hover-color: darken($navbar-transparent-brand-color, 10%) !default;
+$navbar-transparent-brand-hover-bg: transparent !default;
+
+// Navbar toggle
+$navbar-transparent-toggle-hover-bg: $navbar-default-toggle-hover-bg !default;
+$navbar-transparent-toggle-icon-bar-bg: $navbar-default-toggle-icon-bar-bg !default;
+$navbar-transparent-toggle-border-color: $navbar-default-toggle-border-color !default;

data/app/serializers/spotlight/exhibit_export_serializer.rb

@@ -83,6 +83,8 @@ module Spotlight
       def avatar
         file = represented.avatar.file
 
+        return unless file
+
         { filename: file.filename, content_type: file.content_type, content: Base64.encode64(file.read) }
       end
 

data/db/migrate/20151124101123_remove_default_from_spotlight_exhibit.rb

@@ -1,9 +1,8 @@
 class RemoveDefaultFromSpotlightExhibit < ActiveRecord::Migration
   def up
-    return unless Spotlight::Exhibit.column_names.include? :default
+    return unless Spotlight::Exhibit.column_names.include? 'default'
 
     remove_column :spotlight_exhibits, :default
-    remove_index :spotlight_exhibits, :default
   end
   
   def down

data/lib/spotlight/version.rb

@@ -1,4 +1,4 @@
 #
 module Spotlight
-  VERSION = '0.10.2'
+  VERSION = '0.10.3'
 end

data/spec/serializers/spotlight/exhibit_export_serializer_spec.rb

@@ -134,6 +134,16 @@ describe Spotlight::ExhibitExportSerializer do
         contact = subject.contacts.first
         expect(contact.contact_info[:title]).to eq 'xyz'
       end
+
+      describe 'for a contact without an avatar' do
+        let!(:curator) do
+          FactoryGirl.create(:contact, exhibit: source_exhibit, avatar: nil)
+        end
+
+        it 'has contacts' do
+          expect(subject.contacts.count).to eq 1
+        end
+      end
     end
 
     it 'has tags' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Chris Beer
@@ -762,6 +762,7 @@ files:
 - app/assets/stylesheets/spotlight/_mixins.scss
 - app/assets/stylesheets/spotlight/_multi_image_selector.scss
 - app/assets/stylesheets/spotlight/_multi_up_item_grid.scss
+- app/assets/stylesheets/spotlight/_navbar.scss
 - app/assets/stylesheets/spotlight/_nestable.scss
 - app/assets/stylesheets/spotlight/_pages.scss
 - app/assets/stylesheets/spotlight/_report_a_problem.scss