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 e02f6be050b4b4fbecb3edae2a41df22b41397f8..f956efbd5476fef0ef74178d8cc92cb5e2244144 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 19fe7c41246d2e744f7ae8f1a38af624ae81d206..02f847ae9a2da9feac531d4d44f57d167aa0042d 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 5a13622e4dc4e7fe26995667c6373b9318e0ca5c..3b47e773ffe381ff544a9535f2ff9304843f2f28 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 901a83bdf426911657b13a4b59175539152b656c..4b1e9d83cb4693f2d84690d8f1b743e50ec1d484 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 9f42994db02078f161128d3109b38e1a596f16c4..940e7eb452d8a04d100fad2b50db37acf788015c 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 19de260159ebe8c5a536f97cd1e2a87cc02629dc..a6e5931a260c1a2fdd12bceb9a160f230359e4e4 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");