From 474f4b2be303b5efaf17c6723ec50df31b5e0ba6 Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Tue, 14 Jul 2015 22:18:21 -0400
Subject: [PATCH] daily build 2
---
.../ocio_panels_settings.info | 1 +
.../ocio_panels_settings.make | 13 +++++++
.../css/ocio-omega-base.no-query.css | 36 +++++++++++++++++++
.../css/ocio-omega-base.styles.css | 36 +++++++++++++++++++
profiles/wcm_base/wcm_base.info | 1 -
profiles/wcm_base/wcm_base.install | 1 -
profiles/wcm_base/wcm_base.make | 6 ----
7 files changed, 86 insertions(+), 8 deletions(-)
create mode 100644 profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.make
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 f97c2a40..915f728d 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 00000000..97dcdeea
--- /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 9d56fde8..4cbf5971 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 b2f984a8..9c662811 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 9d92037f..354aca03 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 ad97ba88..5a08ef83 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 bf2b8c01..1c77ab24 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"
--
GitLab