From 81efc3f05cddbc698234342447faff5ea9833fe0 Mon Sep 17 00:00:00 2001
From: Melissa Miller <miller.2676@osu.edu>
Date: Wed, 17 Jun 2015 23:04:05 -0400
Subject: [PATCH] daily build 2
updates to theme 4, base theme, and main menu feature
---
CHANGELOG.txt | 4 +
.../date_popup_authored.info | 2 +-
.../contrib/file_entity/file_entity.info | 2 +-
.../file_entity/tests/file_entity_test.info | 2 +-
.../contrib/manualcrop/manualcrop.info | 2 +-
.../wcm_base/modules/contrib/media/media.info | 2 +-
.../media_bulk_upload/media_bulk_upload.info | 2 +-
.../media_internet/media_internet.info | 2 +-
.../media_migrate_file_types.info | 2 +-
.../modules/media_wysiwyg/media_wysiwyg.info | 2 +-
.../media_wysiwyg_view_mode.info | 2 +-
.../media/modules/mediafield/mediafield.info | 2 +-
.../media/tests/media_module_test.info | 2 +-
.../contrib/media_youtube/media_youtube.info | 2 +-
.../modules/contrib/workbench/workbench.info | 2 +-
.../workbench_media/workbench_media.info | 2 +-
.../tests/workbench_moderation_test.info | 2 +-
.../workbench_moderation.info | 2 +-
.../ocio_main_menu/ocio_main_menu.context.inc | 32 -----
.../custom/ocio_main_menu/ocio_main_menu.info | 2 -
.../ocio_omega_4/css/ocio-4.no-query.css | 31 +++--
.../themes/ocio_omega_4/css/ocio-4.styles.css | 45 +++++--
.../sass/components/_featured-slideshow.scss | 38 +++++-
.../sass/components/regions/_content.scss | 1 -
.../css/components/specific-pages/-front.css | 0
.../css/ocio-omega-base.no-query.css | 125 +++++++++---------
.../css/ocio-omega-base.styles.css | 125 +++++++++---------
.../panels/ocio-omega-threecol.css | 10 +-
.../sass/components/_panels.scss | 63 ---------
.../sass/components/_tiles.scss | 64 +++++++++
.../components/specific-pages/_front.scss | 5 +
31 files changed, 305 insertions(+), 274 deletions(-)
create mode 100644 profiles/wcm_base/themes/ocio_omega_base/css/components/specific-pages/-front.css
create mode 100644 profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss
create mode 100644 profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_front.scss
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bf684a16..8385032a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,8 @@
+Drupal 7.38, 2015-06-17
+-----------------------
+- Fixed security issues (multiple vulnerabilities). See SA-CORE-2015-002.
+
Drupal 7.37, 2015-05-07
-----------------------
- Fixed a regression in Drupal 7.36 which caused certain kinds of content types
diff --git a/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info b/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
index bac38729..561a688b 100644
--- a/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
+++ b/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
@@ -9,5 +9,5 @@ dependencies[] = date_popup
version = "7.x-1.1+2-dev"
core = "7.x"
project = "date_popup_authored"
-datestamp = "1434591579"
+datestamp = "1434596314"
diff --git a/profiles/wcm_base/modules/contrib/file_entity/file_entity.info b/profiles/wcm_base/modules/contrib/file_entity/file_entity.info
index 614f1bd2..b1c0a2fb 100644
--- a/profiles/wcm_base/modules/contrib/file_entity/file_entity.info
+++ b/profiles/wcm_base/modules/contrib/file_entity/file_entity.info
@@ -30,5 +30,5 @@ version = 7.x-2.x-dev
version = "7.x-2.0-alpha3+29-dev"
core = "7.x"
project = "file_entity"
-datestamp = "1434591575"
+datestamp = "1434596310"
diff --git a/profiles/wcm_base/modules/contrib/file_entity/tests/file_entity_test.info b/profiles/wcm_base/modules/contrib/file_entity/tests/file_entity_test.info
index fefe9f73..f714a2c2 100644
--- a/profiles/wcm_base/modules/contrib/file_entity/tests/file_entity_test.info
+++ b/profiles/wcm_base/modules/contrib/file_entity/tests/file_entity_test.info
@@ -10,5 +10,5 @@ hidden = TRUE
version = "7.x-2.0-alpha3+29-dev"
core = "7.x"
project = "file_entity"
-datestamp = "1434591575"
+datestamp = "1434596310"
diff --git a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
index c00609c4..61da2799 100644
--- a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
+++ b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
@@ -13,5 +13,5 @@ files[] = includes/views/manualcrop.views.inc
version = "7.x-1.4+109-dev"
core = "7.x"
project = "manualcrop"
-datestamp = "1434591450"
+datestamp = "1434596194"
diff --git a/profiles/wcm_base/modules/contrib/media/media.info b/profiles/wcm_base/modules/contrib/media/media.info
index 73d2ef21..1c74edfd 100644
--- a/profiles/wcm_base/modules/contrib/media/media.info
+++ b/profiles/wcm_base/modules/contrib/media/media.info
@@ -29,5 +29,5 @@ version = 7.x-2.x-dev
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
-datestamp = "1434591396"
+datestamp = "1434596149"
diff --git a/profiles/wcm_base/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info b/profiles/wcm_base/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info
index 2ca30fe2..07400c11 100644
--- a/profiles/wcm_base/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info
+++ b/profiles/wcm_base/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info
@@ -14,5 +14,5 @@ files[] = includes/MediaBrowserBulkUpload.inc
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
-datestamp = "1434591396"
+datestamp = "1434596149"
diff --git a/profiles/wcm_base/modules/contrib/media/modules/media_internet/media_internet.info b/profiles/wcm_base/modules/contrib/media/modules/media_internet/media_internet.info
index 28ec53cc..cf20451f 100644
--- a/profiles/wcm_base/modules/contrib/media/modules/media_internet/media_internet.info
+++ b/profiles/wcm_base/modules/contrib/media/modules/media_internet/media_internet.info
@@ -16,5 +16,5 @@ files[] = includes/MediaInternetValidationException.inc
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
-datestamp = "1434591396"
+datestamp = "1434596149"
diff --git a/profiles/wcm_base/modules/contrib/media/modules/media_migrate_file_types/media_migrate_file_types.info b/profiles/wcm_base/modules/contrib/media/modules/media_migrate_file_types/media_migrate_file_types.info
index da009519..fed6b0a8 100644
--- a/profiles/wcm_base/modules/contrib/media/modules/media_migrate_file_types/media_migrate_file_types.info
+++ b/profiles/wcm_base/modules/contrib/media/modules/media_migrate_file_types/media_migrate_file_types.info
@@ -13,5 +13,5 @@ configure = admin/structure/file-types/upgrade
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
-datestamp = "1434591396"
+datestamp = "1434596149"
diff --git a/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.info b/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.info
index 6849d7ad..223ba550 100644
--- a/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.info
+++ b/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.info
@@ -20,5 +20,5 @@ configure = admin/config/media/browser
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
-datestamp = "1434591396"
+datestamp = "1434596149"
diff --git a/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info b/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info
index 71dff29c..e7f4b7bc 100644
--- a/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info
+++ b/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info
@@ -14,5 +14,5 @@ files[] = media_wysiwyg_view_mode.test
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
-datestamp = "1434591396"
+datestamp = "1434596149"
diff --git a/profiles/wcm_base/modules/contrib/media/modules/mediafield/mediafield.info b/profiles/wcm_base/modules/contrib/media/modules/mediafield/mediafield.info
index d3b4ff79..f834173c 100644
--- a/profiles/wcm_base/modules/contrib/media/modules/mediafield/mediafield.info
+++ b/profiles/wcm_base/modules/contrib/media/modules/mediafield/mediafield.info
@@ -9,5 +9,5 @@ dependencies[] = media
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
-datestamp = "1434591396"
+datestamp = "1434596149"
diff --git a/profiles/wcm_base/modules/contrib/media/tests/media_module_test.info b/profiles/wcm_base/modules/contrib/media/tests/media_module_test.info
index a79564dc..cbb2a199 100644
--- a/profiles/wcm_base/modules/contrib/media/tests/media_module_test.info
+++ b/profiles/wcm_base/modules/contrib/media/tests/media_module_test.info
@@ -9,5 +9,5 @@ hidden = TRUE
version = "7.x-2.0-alpha3+98-dev"
core = "7.x"
project = "media"
-datestamp = "1434591396"
+datestamp = "1434596149"
diff --git a/profiles/wcm_base/modules/contrib/media_youtube/media_youtube.info b/profiles/wcm_base/modules/contrib/media_youtube/media_youtube.info
index beaa3120..d190ef1b 100644
--- a/profiles/wcm_base/modules/contrib/media_youtube/media_youtube.info
+++ b/profiles/wcm_base/modules/contrib/media_youtube/media_youtube.info
@@ -14,5 +14,5 @@ files[] = includes/MediaYouTubeBrowser.inc
version = "7.x-2.0-rc4+9-dev"
core = "7.x"
project = "media_youtube"
-datestamp = "1434591575"
+datestamp = "1434596311"
diff --git a/profiles/wcm_base/modules/contrib/workbench/workbench.info b/profiles/wcm_base/modules/contrib/workbench/workbench.info
index b0aca4d2..152152fd 100644
--- a/profiles/wcm_base/modules/contrib/workbench/workbench.info
+++ b/profiles/wcm_base/modules/contrib/workbench/workbench.info
@@ -10,5 +10,5 @@ dependencies[] = views
version = "7.x-1.2"
core = "7.x"
project = "workbench"
-datestamp = "1434591526"
+datestamp = "1434596253"
diff --git a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
index ac6cee5e..2028041c 100644
--- a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
+++ b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
@@ -10,5 +10,5 @@ dependencies[] = media
version = "7.x-2.1"
core = "7.x"
project = "workbench_media"
-datestamp = "1434591526"
+datestamp = "1434596254"
diff --git a/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info b/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
index e2886f10..97c8bb25 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
@@ -9,5 +9,5 @@ hidden = TRUE
version = "7.x-1.4+6-dev"
core = "7.x"
project = "workbench_moderation"
-datestamp = "1434591527"
+datestamp = "1434596255"
diff --git a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
index 367effa4..b3df4e8b 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
@@ -22,5 +22,5 @@ files[] = tests/workbench_moderation.files.test
version = "7.x-1.4+6-dev"
core = "7.x"
project = "workbench_moderation"
-datestamp = "1434591527"
+datestamp = "1434596255"
diff --git a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.context.inc b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.context.inc
index 0c881dad..dda1f9bc 100644
--- a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.context.inc
+++ b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.context.inc
@@ -42,37 +42,5 @@ function ocio_main_menu_context_default_contexts() {
t('OCIO Main Menu');
$export['main-menu'] = $context;
- $context = new stdClass();
- $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
- $context->api_version = 3;
- $context->name = 'side-menu';
- $context->description = '';
- $context->tag = 'OCIO Main Menu';
- $context->conditions = array(
- 'sitewide' => array(
- 'values' => array(
- 1 => 1,
- ),
- ),
- );
- $context->reactions = array(
- 'block' => array(
- 'blocks' => array(
- 'menu_block-custom-1' => array(
- 'module' => 'menu_block',
- 'delta' => 'custom-1',
- 'region' => 'sidebar_1',
- 'weight' => '-10',
- ),
- ),
- ),
- );
- $context->condition_mode = 0;
-
- // Translatables
- // Included for use with string extractors like potx.
- t('OCIO Main Menu');
- $export['side-menu'] = $context;
-
return $export;
}
diff --git a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.info b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.info
index 64f333c8..70a3ae27 100644
--- a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.info
+++ b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.info
@@ -15,10 +15,8 @@ dependencies[] = responsive_menus
dependencies[] = strongarm
dependencies[] = superfish
features[context][] = main-menu
-features[context][] = side-menu
features[ctools][] = context:context:3
features[ctools][] = strongarm:strongarm:1
-features[fe_block_settings][] = menu_block-custom-1
features[features_api][] = api:2
features[menu_custom][] = main-menu
features[variable][] = custom_breadcrumb_home
diff --git a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
index 2885ff47..62d04bd2 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
@@ -79,13 +79,13 @@
margin: -1px !important;
}
-.l-constrained, .flexslider a .flex-title, .flexslider a .flex-summary, .flex-control-nav {
+.l-constrained {
padding: 0;
margin: 0 auto;
*zoom: 1;
padding: 0 7%;
}
-.l-constrained:after, .flexslider a .flex-title:after, .flexslider a .flex-summary:after, .flex-control-nav:after {
+.l-constrained:after {
content: "";
display: table;
clear: both;
@@ -291,9 +291,23 @@ blockquote p {
font-family: "capita", Georgia, serif;
}
+/*
+.flexslider a .flex-title, .flexslider a .flex-summary {
+ // @extend .l-constrained;
+ padding: 0 2em;
+}
+*/
+.flex-title {
+ padding: 0 1.1em;
+}
+
+.flex-summary {
+ padding: 0 1.4em;
+}
+
.flexslider a .flex-meta .flex-title {
- font-size: 26px;
- font-size: 2.6rem;
+ font-size: 24px;
+ font-size: 2.4rem;
}
.flex-direction-nav a {
@@ -319,12 +333,13 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
display: block;
position: relative;
background-color: #2d2d2d;
- padding-top: 2em;
- padding-bottom: 2em;
+ padding-top: 1.7em;
+ padding-bottom: 1.9em;
}
.flex-control-nav {
text-align: right;
+ padding-right: 1.8em;
bottom: 120px;
z-index: 99;
width: 100%;
@@ -333,8 +348,8 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.flex-control-paging li a {
background-color: #2d2d2d;
text-align: left;
- width: 20px;
- height: 20px;
+ width: 15px;
+ height: 15px;
margin-bottom: 1em;
}
.flex-control-paging li a.flex-active {
diff --git a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
index 1607b916..1010e357 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
+++ b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
@@ -79,18 +79,18 @@
margin: -1px !important;
}
-.l-constrained, .flexslider a .flex-title, .flexslider a .flex-summary, .flex-control-nav {
+.l-constrained {
padding: 0;
margin: 0 auto;
*zoom: 1;
}
-.l-constrained:after, .flexslider a .flex-title:after, .flexslider a .flex-summary:after, .flex-control-nav:after {
+.l-constrained:after {
content: "";
display: table;
clear: both;
}
@media (min-width: 46em) {
- .l-constrained, .flexslider a .flex-title, .flexslider a .flex-summary, .flex-control-nav {
+ .l-constrained {
padding: 0 7%;
}
}
@@ -295,9 +295,23 @@ blockquote p {
font-family: "capita", Georgia, serif;
}
+/*
+.flexslider a .flex-title, .flexslider a .flex-summary {
+ // @extend .l-constrained;
+ padding: 0 2em;
+}
+*/
+.flex-title {
+ padding: 0 1.1em;
+}
+
+.flex-summary {
+ padding: 0 1.4em;
+}
+
.flexslider a .flex-meta .flex-title {
- font-size: 26px;
- font-size: 2.6rem;
+ font-size: 24px;
+ font-size: 2.4rem;
}
.flex-direction-nav a {
@@ -323,12 +337,13 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
display: block;
position: relative;
background-color: #2d2d2d;
- padding-top: 2em;
- padding-bottom: 2em;
+ padding-top: 1.7em;
+ padding-bottom: 1.9em;
}
.flex-control-nav {
text-align: right;
+ padding-right: 1.8em;
bottom: 120px;
z-index: 99;
width: 100%;
@@ -337,13 +352,25 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.flex-control-paging li a {
background-color: #2d2d2d;
text-align: left;
- width: 20px;
- height: 20px;
+ width: 15px;
+ height: 15px;
margin-bottom: 1em;
}
.flex-control-paging li a.flex-active {
background-color: #fff;
}
+@media (min-width: 46em) {
+ .flex-control-paging li a {
+ width: 17px;
+ height: 17px;
+ }
+}
+@media (min-width: 68em) {
+ .flex-control-paging li a {
+ width: 20px;
+ height: 20px;
+ }
+}
/* IE9 SVG, needs conditional override of 'filter' to 'none' */
.l-main {
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/components/_featured-slideshow.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/components/_featured-slideshow.scss
index a5087edd..642d9c05 100755
--- a/profiles/wcm_base/themes/ocio_omega_4/sass/components/_featured-slideshow.scss
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/components/_featured-slideshow.scss
@@ -1,10 +1,22 @@
+/*
.flexslider a .flex-title, .flexslider a .flex-summary {
- @extend .l-constrained;
+ // @extend .l-constrained;
+ padding: 0 2em;
+}
+*/
+
+
+.flex-title {
+ padding: 0 1.1em;
+}
+
+.flex-summary {
+ padding: 0 1.4em;
}
.flexslider a .flex-meta .flex-title {
- @include font-size(2.6);
+ @include font-size(2.4);
}
@@ -28,27 +40,39 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
display:block;
position:relative;
background-color:$dk-gray;
- padding-top:2em;
- padding-bottom:2em;
+ padding-top:1.7em;
+ padding-bottom:1.9em;
}
.flex-control-nav {
text-align:right;
- @extend .l-constrained;
+ padding-right: 1.8em;
bottom:120px;
z-index:99;
width:100%;
+
}
.flex-control-paging li a {
background-color:$dk-gray;
text-align:left;
- width:20px;
- height:20px;
+ width:15px;
+ height:15px;
margin-bottom:1em;
&.flex-active {
background-color:$white;
}
+
+ @include breakpoint($tab) {
+ width:17px;
+ height:17px;
+ }
+
+ @include breakpoint($desk) {
+ width:20px;
+ height:20px;
+ }
+
}
/* IE9 SVG, needs conditional override of 'filter' to 'none' */
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_content.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_content.scss
index 56c0a6b5..8ad70f21 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_content.scss
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_content.scss
@@ -1,4 +1,3 @@
.l-content {
- // background: aqua;
padding: 0;
}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/components/specific-pages/-front.css b/profiles/wcm_base/themes/ocio_omega_base/css/components/specific-pages/-front.css
new file mode 100644
index 00000000..e69de29b
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 2d7677ed..de0cdce1 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
@@ -1320,14 +1320,6 @@ body .ui-accordion .ui-accordion-content {
padding: 0.5em 1.9em;
}
-.view .date-nav-wrapper ul.pager {
- list-style: none;
-}
-.view .date-nav-wrapper ul.pager .date-prev a,
-.view .date-nav-wrapper ul.pager .date-next a {
- padding: 1em;
-}
-
/* Clean this up sometime soon :) */
.view-faq.view-faq.view-display-id-page .item-list ul {
padding-left: 0;
@@ -1500,8 +1492,64 @@ h2.pane-title {
line-height: 120%;
}
+.sidebar-panel {
+ background-color: #ececec;
+ padding: 1em;
+}
+.sidebar-panel .panel-pane {
+ margin-top: 1em;
+ margin-bottom: 0em;
+}
+.sidebar-panel > .panel-pane:first-child, .sidebar-panel > .panels-ipe-portlet-wrapper:first-child .panel-pane {
+ margin-top: 0;
+}
+
+.more-link, .field--name-node-link {
+ font-size: 15px;
+ font-size: 1.5rem;
+}
+.more-link a, .field--name-node-link a {
+ text-transform: uppercase;
+ color: #b00;
+}
+.more-link a:hover, .field--name-node-link a:hover {
+ text-decoration: none;
+}
+
+.field--name-node-link {
+ margin-top: 10px;
+}
+
+/* Search page advanced search box */
+form.search-form {
+ margin-top: 1em;
+}
+
+fieldset.search-advanced {
+ border: 0px;
+ background-color: #ececec;
+ margin-left: 0;
+ margin-right: 0;
+ padding: .5em 0 0 0;
+}
+fieldset.search-advanced legend {
+ margin-top: 2.5em;
+}
+fieldset.search-advanced .criterion {
+ margin-top: 1em;
+}
+fieldset.search-advanced input.form-submit {
+ margin-bottom: 1em;
+}
+
+/* Search results */
+p.search-result__snippet {
+ padding-left: 0;
+ margin-bottom: 0.4em;
+}
+
.panel-pane.pane-bundle-tile-pane {
- background: #b00;
+ background: #666666;
padding: 0;
}
.panel-pane.pane-bundle-tile-pane:hover {
@@ -1591,62 +1639,6 @@ h2.pane-title {
color: #b00;
}
-.sidebar-panel {
- background-color: #ececec;
- padding: 1em;
-}
-.sidebar-panel .panel-pane {
- margin-top: 1em;
- margin-bottom: 0em;
-}
-.sidebar-panel > .panel-pane:first-child, .sidebar-panel > .panels-ipe-portlet-wrapper:first-child .panel-pane {
- margin-top: 0;
-}
-
-.more-link, .field--name-node-link {
- font-size: 15px;
- font-size: 1.5rem;
-}
-.more-link a, .field--name-node-link a {
- text-transform: uppercase;
- color: #b00;
-}
-.more-link a:hover, .field--name-node-link a:hover {
- text-decoration: none;
-}
-
-.field--name-node-link {
- margin-top: 10px;
-}
-
-/* Search page advanced search box */
-form.search-form {
- margin-top: 1em;
-}
-
-fieldset.search-advanced {
- border: 0px;
- background-color: #ececec;
- margin-left: 0;
- margin-right: 0;
- padding: .5em 0 0 0;
-}
-fieldset.search-advanced legend {
- margin-top: 2.5em;
-}
-fieldset.search-advanced .criterion {
- margin-top: 1em;
-}
-fieldset.search-advanced input.form-submit {
- margin-bottom: 1em;
-}
-
-/* Search results */
-p.search-result__snippet {
- padding-left: 0;
- margin-bottom: 0.4em;
-}
-
.view-user-directory #isotope-container {
margin-left: -10px;
margin-right: 10px;
@@ -2349,3 +2341,6 @@ a#skip:active:hover, a#skip:focus:hover {
background-image: url(../images/osu-navbar/dk-gray/osu_name@2x.png);
}
}
+.front .view-featured-slideshow {
+ margin-bottom: 1em;
+}
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 d1d9f0d0..d521b0be 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
@@ -1336,14 +1336,6 @@ body .ui-accordion .ui-accordion-content {
padding: 0.5em 1.9em;
}
-.view .date-nav-wrapper ul.pager {
- list-style: none;
-}
-.view .date-nav-wrapper ul.pager .date-prev a,
-.view .date-nav-wrapper ul.pager .date-next a {
- padding: 1em;
-}
-
/* Clean this up sometime soon :) */
.view-faq.view-faq.view-display-id-page .item-list ul {
padding-left: 0;
@@ -1524,8 +1516,64 @@ h2.pane-title {
line-height: 120%;
}
+.sidebar-panel {
+ background-color: #ececec;
+ padding: 1em;
+}
+.sidebar-panel .panel-pane {
+ margin-top: 1em;
+ margin-bottom: 0em;
+}
+.sidebar-panel > .panel-pane:first-child, .sidebar-panel > .panels-ipe-portlet-wrapper:first-child .panel-pane {
+ margin-top: 0;
+}
+
+.more-link, .field--name-node-link {
+ font-size: 15px;
+ font-size: 1.5rem;
+}
+.more-link a, .field--name-node-link a {
+ text-transform: uppercase;
+ color: #b00;
+}
+.more-link a:hover, .field--name-node-link a:hover {
+ text-decoration: none;
+}
+
+.field--name-node-link {
+ margin-top: 10px;
+}
+
+/* Search page advanced search box */
+form.search-form {
+ margin-top: 1em;
+}
+
+fieldset.search-advanced {
+ border: 0px;
+ background-color: #ececec;
+ margin-left: 0;
+ margin-right: 0;
+ padding: .5em 0 0 0;
+}
+fieldset.search-advanced legend {
+ margin-top: 2.5em;
+}
+fieldset.search-advanced .criterion {
+ margin-top: 1em;
+}
+fieldset.search-advanced input.form-submit {
+ margin-bottom: 1em;
+}
+
+/* Search results */
+p.search-result__snippet {
+ padding-left: 0;
+ margin-bottom: 0.4em;
+}
+
.panel-pane.pane-bundle-tile-pane {
- background: #b00;
+ background: #666666;
padding: 0;
}
.panel-pane.pane-bundle-tile-pane:hover {
@@ -1615,62 +1663,6 @@ h2.pane-title {
color: #b00;
}
-.sidebar-panel {
- background-color: #ececec;
- padding: 1em;
-}
-.sidebar-panel .panel-pane {
- margin-top: 1em;
- margin-bottom: 0em;
-}
-.sidebar-panel > .panel-pane:first-child, .sidebar-panel > .panels-ipe-portlet-wrapper:first-child .panel-pane {
- margin-top: 0;
-}
-
-.more-link, .field--name-node-link {
- font-size: 15px;
- font-size: 1.5rem;
-}
-.more-link a, .field--name-node-link a {
- text-transform: uppercase;
- color: #b00;
-}
-.more-link a:hover, .field--name-node-link a:hover {
- text-decoration: none;
-}
-
-.field--name-node-link {
- margin-top: 10px;
-}
-
-/* Search page advanced search box */
-form.search-form {
- margin-top: 1em;
-}
-
-fieldset.search-advanced {
- border: 0px;
- background-color: #ececec;
- margin-left: 0;
- margin-right: 0;
- padding: .5em 0 0 0;
-}
-fieldset.search-advanced legend {
- margin-top: 2.5em;
-}
-fieldset.search-advanced .criterion {
- margin-top: 1em;
-}
-fieldset.search-advanced input.form-submit {
- margin-bottom: 1em;
-}
-
-/* Search results */
-p.search-result__snippet {
- padding-left: 0;
- margin-bottom: 0.4em;
-}
-
.view-user-directory #isotope-container {
margin-left: -10px;
margin-right: 10px;
@@ -2388,3 +2380,6 @@ a#skip:active:hover, a#skip:focus:hover {
background-image: url(../images/osu-navbar/dk-gray/osu_name@2x.png);
}
}
+.front .view-featured-slideshow {
+ margin-bottom: 1em;
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.css b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.css
index 65d3e235..e3c18601 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.css
@@ -9,24 +9,24 @@
.ocio-omega-threecol-column-content-region {
min-height: 1px;
- width: 34.043%;
+ width: 33.9%;
float: left;
}
.ocio-omega-threecol-column-content-region-inner {
- margin-right: 20px;
+ margin-right: 5%;
}
.ocio-omega-threecol-column3 {
- width: 31.915%;
+ width: 32.2%;
}
.ocio-omega-threecol-column3-inner {
margin-right: 0;
}
-/* iPhone [portrait + landscape] */
-@media only screen and (max-width: 480px) {
+/* iPhone [portrait + landscape] and some wider phones too */
+@media only screen and (max-width: 600px) {
.ocio-omega-threecol-column-content-region,
.ocio-omega-threecol-column3 {
width: 100%;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_panels.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_panels.scss
index 68b2abd7..ae01968d 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_panels.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_panels.scss
@@ -13,69 +13,6 @@ h2.pane-title {
}
}
-//custom tile panes
-
-.panel-pane.pane-bundle-tile-pane {
- background: $red;
- padding: 0;
-
- &:hover {
- opacity: 0.9;
- }
-
- a {
- text-decoration: none;
- @include link-colors($white, $lt-gray, $md-gray, $white, $blue);
- }
-
- h2 {
- @include font-size(2.4);
- font-weight: 400;
- padding: 0.5em 0.8em 0.7em 0.8em;
- margin-top: 0;
- }
-}
-
-.panel-pane.pane-bundle-tile-pane-plus-text-area {
- background: $lt-gray;
- padding: 0;
- text-align: center;
-
- &:hover {
- opacity: 0.9;
- }
-
- img {
- border-bottom: 4px solid $red;
- }
-
- .text-areas {
- padding: 1em;
-
- &:hover {
- opacity: 0.85;
- }
- }
-
- a {
- text-decoration: none;
-
- h2 {
- @include font-size(2.4);
- font-weight: 600;
- margin-top: 0;
- text-decoration: none;
- @include link-colors($red, $red, $dk-gray, $red, $blue);
- }
-
- p {
- @include font-size(1.3);
- line-height: 150%;
- @include link-colors($dk-gray, $dk-gray, $red, $dk-gray, $blue);
- margin: 0.6em 0;
- }
- }
-}
.sidebar-panel {
background-color: $lt-gray;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss
new file mode 100644
index 00000000..2611ae21
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss
@@ -0,0 +1,64 @@
+//custom tile panes
+
+.panel-pane.pane-bundle-tile-pane {
+ background: $md-gray;
+ padding: 0;
+
+ &:hover {
+ opacity: 0.9;
+ }
+
+ a {
+ text-decoration: none;
+ @include link-colors($white, $lt-gray, $md-gray, $white, $blue);
+ }
+
+ h2 {
+ @include font-size(2.4);
+ font-weight: 400;
+ padding: 0.5em 0.8em 0.7em 0.8em;
+ margin-top: 0;
+ }
+}
+
+.panel-pane.pane-bundle-tile-pane-plus-text-area {
+ background: $lt-gray;
+ padding: 0;
+ text-align: center;
+
+ &:hover {
+ opacity: 0.9;
+ }
+
+ img {
+ border-bottom: 4px solid $red;
+ }
+
+ .text-areas {
+ padding: 1em;
+
+ &:hover {
+ opacity: 0.85;
+ }
+ }
+
+ a {
+ text-decoration: none;
+
+ h2 {
+ @include font-size(2.4);
+ font-weight: 600;
+ margin-top: 0;
+ text-decoration: none;
+ @include link-colors($red, $red, $dk-gray, $red, $blue);
+ }
+
+ p {
+ @include font-size(1.3);
+ line-height: 150%;
+ @include link-colors($dk-gray, $dk-gray, $red, $dk-gray, $blue);
+ margin: 0.6em 0;
+ }
+ }
+}
+
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_front.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_front.scss
new file mode 100644
index 00000000..525e8c91
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_front.scss
@@ -0,0 +1,5 @@
+.front {
+ .view-featured-slideshow {
+ margin-bottom: 1em;
+ }
+}
\ No newline at end of file
--
GitLab