From 7fd7f468bfce97b600151685d887cda1007a15e1 Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Wed, 31 Aug 2016 10:21:57 -0400
Subject: [PATCH] daily build

---
 .../custom/ocio_news/ocio_news.views_default.inc  |  1 +
 .../layouts/ocio-default/ocio-default.layout.css  | 15 +++++++++++++++
 .../ocio-default/ocio-default.layout.no-query.css | 15 +++++++++++++++
 .../css/ocio-omega-base.no-query.css              | 15 +++++++++++++++
 .../css/ocio-omega-base.styles.css                | 15 +++++++++++++++
 .../themes/ocio_omega_base/sass/base/_media.scss  | 13 +++++++++++--
 6 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc
index e02f6be0..f956efbd 100644
--- a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc
+++ b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc
@@ -350,6 +350,7 @@ function ocio_news_views_default_views() {
   $handler->display->display_options['fields']['field_ocio_body']['alter']['make_link'] = TRUE;
   $handler->display->display_options['fields']['field_ocio_body']['alter']['path'] = '[path]';
   $handler->display->display_options['fields']['field_ocio_body']['alter']['max_length'] = '200';
+  $handler->display->display_options['fields']['field_ocio_body']['alter']['strip_tags'] = TRUE;
   $handler->display->display_options['fields']['field_ocio_body']['alter']['trim'] = TRUE;
   $handler->display->display_options['fields']['field_ocio_body']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['field_ocio_body']['type'] = 'text_summary_or_trimmed';
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
index 19fe7c41..02f847ae 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
@@ -355,6 +355,12 @@ form .chosen-container.chosen-container-multi .chosen-choices li.search-field in
   cursor: default;
 }
 
+.field-name-field-basic-image-caption, .field--name-field-basic-image-caption {
+  color: #666666;
+  font-size: 1.2em;
+  line-height: 125%;
+}
+
 .l-page img {
   width: inherit;
 }
@@ -856,6 +862,15 @@ ol ol ol {
   color: #606060;
 }
 
+.align-center .media-element.file-default {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-right .media-element.file-default {
+  margin-left: auto;
+}
+
 /*
 .cke_editable .media-element {
   @include media-element("edit");
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
index 5a13622e..3b47e773 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
@@ -354,6 +354,12 @@ form .chosen-container.chosen-container-multi .chosen-choices li.search-field in
   cursor: default;
 }
 
+.field-name-field-basic-image-caption, .field--name-field-basic-image-caption {
+  color: #666666;
+  font-size: 1.2em;
+  line-height: 125%;
+}
+
 .l-page img {
   width: inherit;
 }
@@ -855,6 +861,15 @@ ol ol ol {
   color: #606060;
 }
 
+.align-center .media-element.file-default {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-right .media-element.file-default {
+  margin-left: auto;
+}
+
 /*
 .cke_editable .media-element {
   @include media-element("edit");
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
index 901a83bd..4b1e9d83 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
@@ -350,6 +350,12 @@ form .chosen-container.chosen-container-multi .chosen-choices li.search-field in
   cursor: default;
 }
 
+.field-name-field-basic-image-caption, .field--name-field-basic-image-caption {
+  color: #666666;
+  font-size: 1.2em;
+  line-height: 125%;
+}
+
 .l-page img {
   width: inherit;
 }
@@ -851,6 +857,15 @@ ol ol ol {
   color: #606060;
 }
 
+.align-center .media-element.file-default {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-right .media-element.file-default {
+  margin-left: auto;
+}
+
 /*
 .cke_editable .media-element {
   @include media-element("edit");
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
index 9f42994d..940e7eb4 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
@@ -351,6 +351,12 @@ form .chosen-container.chosen-container-multi .chosen-choices li.search-field in
   cursor: default;
 }
 
+.field-name-field-basic-image-caption, .field--name-field-basic-image-caption {
+  color: #666666;
+  font-size: 1.2em;
+  line-height: 125%;
+}
+
 .l-page img {
   width: inherit;
 }
@@ -852,6 +858,15 @@ ol ol ol {
   color: #606060;
 }
 
+.align-center .media-element.file-default {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-right .media-element.file-default {
+  margin-left: auto;
+}
+
 /*
 .cke_editable .media-element {
   @include media-element("edit");
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_media.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_media.scss
index 19de2601..a6e5931a 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_media.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_media.scss
@@ -15,7 +15,7 @@
   }
 
   @each $type in $types {
-    
+
     &.#{$prefix}-#{$type}#{$separator}full,
     &.#{$prefix}-#{$type}#{$separator}large,
     &.#{$prefix}-#{$type}#{$separator}medium,
@@ -69,7 +69,7 @@
 }
 
 .media-element-container,
-.media-element {
+img.media-element {
   @include media-element("view");
   display: table;
   table-layout: fixed;
@@ -94,6 +94,15 @@
   }
 }
 
+.align-center .media-element.file-default {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-right .media-element.file-default {
+  margin-left: auto;
+}
+
 /*
 .cke_editable .media-element {
   @include media-element("edit");
-- 
GitLab