diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info index f97c2a40cf1cb6dbed8363aef72f9a03760090fd..915f728dbbdf5ccb575b00cc323765d84074e3a4 100644 --- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info +++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info @@ -8,6 +8,7 @@ dependencies[] = ctools dependencies[] = features dependencies[] = features_override dependencies[] = fieldable_panels_panes +dependencies[] = mm_widgets dependencies[] = page_manager dependencies[] = panelizer dependencies[] = panels diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.make b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.make new file mode 100644 index 0000000000000000000000000000000000000000..97dcdeea6b5758afa20e70d5f79b029806dcaa8d --- /dev/null +++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.make @@ -0,0 +1,13 @@ +; OCIO Panels Settings Makefile + +api = 2 +core = 7.x + + +;modules + +projects[mm][type] = module +projects[mm][subdir] = custom +projects[mm][download][type] = "git" +projects[mm][download][url] = git@code.osu.edu:openosu/mm.git +projects[mm][download][branch] = 7.x-1.x 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 9d56fde8e690b513fe2fba7bc629b3681eeca22d..4cbf5971de43d92610bc341d8835eea965eee5d9 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 @@ -1,3 +1,4 @@ +@charset "UTF-8"; /* No files to import found in abstractions/**\/* */ ul.breadcrumb { padding: 0; @@ -1356,6 +1357,41 @@ body .ui-accordion .ui-accordion-content { filter: alpha(opacity="80"); } +.block--mm-widgets .item, +.pane-mm-widgets-live-pane .item { + margin: 1em 0; +} +.block--mm-widgets .item .excerpt:before, +.pane-mm-widgets-live-pane .item .excerpt:before { + font-family: FontAwesome; + margin-right: 0.4em; +} +.block--mm-widgets .item.twitter .excerpt:before, +.pane-mm-widgets-live-pane .item.twitter .excerpt:before { + content: ''; + color: #00aced; +} +.block--mm-widgets .item.facebook-page .excerpt:before, +.pane-mm-widgets-live-pane .item.facebook-page .excerpt:before { + content: ''; + color: #3b5998; +} +.block--mm-widgets .item.instagram .excerpt:before, +.pane-mm-widgets-live-pane .item.instagram .excerpt:before { + content: ''; + color: #517fa4; +} +.block--mm-widgets .item.rss .excerpt:before, +.pane-mm-widgets-live-pane .item.rss .excerpt:before { + content: ''; + color: #ff6600; +} +.block--mm-widgets .item.youtube-playlist .excerpt:before, +.pane-mm-widgets-live-pane .item.youtube-playlist .excerpt:before { + content: ''; + color: #b00; +} + .node--article .field--name-byline { margin: 0.8em 0 0.6em 0; font-weight: 600; 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 b2f984a80345a181c27af1ab9302d69ef922ff46..9c66281199eec3956f26e66388d4acb489fe740f 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 @@ -1,3 +1,4 @@ +@charset "UTF-8"; /* No files to import found in abstractions/**\/* */ ul.breadcrumb { padding: 0; @@ -1369,6 +1370,41 @@ body .ui-accordion .ui-accordion-content { filter: alpha(opacity="80"); } +.block--mm-widgets .item, +.pane-mm-widgets-live-pane .item { + margin: 1em 0; +} +.block--mm-widgets .item .excerpt:before, +.pane-mm-widgets-live-pane .item .excerpt:before { + font-family: FontAwesome; + margin-right: 0.4em; +} +.block--mm-widgets .item.twitter .excerpt:before, +.pane-mm-widgets-live-pane .item.twitter .excerpt:before { + content: ''; + color: #00aced; +} +.block--mm-widgets .item.facebook-page .excerpt:before, +.pane-mm-widgets-live-pane .item.facebook-page .excerpt:before { + content: ''; + color: #3b5998; +} +.block--mm-widgets .item.instagram .excerpt:before, +.pane-mm-widgets-live-pane .item.instagram .excerpt:before { + content: ''; + color: #517fa4; +} +.block--mm-widgets .item.rss .excerpt:before, +.pane-mm-widgets-live-pane .item.rss .excerpt:before { + content: ''; + color: #ff6600; +} +.block--mm-widgets .item.youtube-playlist .excerpt:before, +.pane-mm-widgets-live-pane .item.youtube-playlist .excerpt:before { + content: ''; + color: #b00; +} + .node--article .field--name-byline { margin: 0.8em 0 0.6em 0; font-weight: 600; diff --git a/profiles/wcm_base/wcm_base.info b/profiles/wcm_base/wcm_base.info index 9d92037fc28c1c7c5e3900dea9a339cc2babd32b..354aca0396a96561e708da8917f9dcbaba34ee4e 100644 --- a/profiles/wcm_base/wcm_base.info +++ b/profiles/wcm_base/wcm_base.info @@ -82,7 +82,6 @@ dependencies[] = uuid ; Custom -dependencies[] = mm_widgets dependencies[] = ocio_accessibility dependencies[] = ocio_admin_menu dependencies[] = ocio_aggregator diff --git a/profiles/wcm_base/wcm_base.install b/profiles/wcm_base/wcm_base.install index ad97ba88ec5050d9d00afdb18ed888120c1201f8..5a08ef831d4d8a284e9ddd7cfb5fbfcbaec49be9 100644 --- a/profiles/wcm_base/wcm_base.install +++ b/profiles/wcm_base/wcm_base.install @@ -61,7 +61,6 @@ function _wcm_base_set_up_admin() { foreach ($features as $feature) { features_revert_module($feature); } - } /** diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make index bf2b8c018ef69266a80e1293511562b9e656e03e..1c77ab24a687515136362b09bd28587e425667d6 100644 --- a/profiles/wcm_base/wcm_base.make +++ b/profiles/wcm_base/wcm_base.make @@ -91,12 +91,6 @@ projects[omega][version] = 4.3 ; ********************************************** ; ****************** CUSTOM ******************** -projects[mm][type] = module -projects[mm][subdir] = custom -projects[mm][download][type] = "git" -projects[mm][download][url] = git@code.osu.edu:openosu/mm.git -projects[mm][download][branch] = 7.x-1.x - projects[ocio_accessibility][type] = module projects[ocio_accessibility][subdir] = custom projects[ocio_accessibility][download][type] = "git"