Merge branch 'master' into workflow

.travis.yml

@@ -7,9 +7,9 @@ env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
-    - RAILS_VERSION=4.2.7
+    - RAILS_VERSION=4.2.7.1
       RDF_VERSION=1.99.1
-    - RAILS_VERSION=5.0.0
+    - RAILS_VERSION=5.0.0.1
       RDF_VERSION=2.1.0
 notifications:
   irc:

app/assets/stylesheets/curation_concerns/_admin.scss

@@ -0,0 +1,18 @@
+@mixin widget-partial($col: 12) {
+  @include make-sm-column(12);
+  @include make-md-column($col);
+  .partial-wrapper {
+    @extend .panel;
+    @extend .panel-default;
+  }
+}
+
+.partial-total_objects {
+  @include widget-partial;
+}
+.partial-total_objects_charts {
+  @include widget-partial(6);
+}
+.partial-total_embargo_visibility {
+  @include widget-partial(6);
+}

app/assets/stylesheets/curation_concerns/_curation_concerns.scss

@@ -5,3 +5,4 @@
 @import "curation_concerns/typography";
 @import 'hydra-editor/multi_value_fields';
 @import 'curation_concerns/fileupload';
+@import 'curation_concerns/admin';