From 3d7fd19cb1a6b9e8895f332c5fce83004d33f1eb Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Mon, 24 Aug 2015 17:26:44 -0400
Subject: [PATCH] daily build
---
.../ocio_image_styles.features.inc | 16 +++++++++++++++-
.../ocio_image_styles/ocio_image_styles.info | 1 +
.../wcm_user_leadership.views_default.inc | 2 +-
.../layouts/ocio-default/ocio-default.layout.css | 4 ++--
.../ocio-default.layout.no-query.css | 4 ++--
.../css/ocio-omega-base.no-query.css | 4 ++--
.../css/ocio-omega-base.styles.css | 4 ++--
.../ocio_omega_base/sass/base/_typography.scss | 2 +-
8 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.features.inc b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.features.inc
index b5d47a90..d631ac87 100644
--- a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.features.inc
+++ b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.features.inc
@@ -60,6 +60,21 @@ function ocio_image_styles_image_default_styles() {
),
);
+ // Exported image style: image_style_tiny.
+ $styles['image_style_tiny'] = array(
+ 'label' => 'Tiny (50x50)',
+ 'effects' => array(
+ 1 => array(
+ 'name' => 'image_scale_and_crop',
+ 'data' => array(
+ 'width' => 50,
+ 'height' => 50,
+ ),
+ 'weight' => 1,
+ ),
+ ),
+ );
+
// Exported image style: teaser_image.
$styles['teaser_image'] = array(
'label' => 'Teaser Image',
@@ -75,6 +90,5 @@ function ocio_image_styles_image_default_styles() {
),
),
);
-
return $styles;
}
diff --git a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.info b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.info
index cbcd89a9..6c977054 100644
--- a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.info
+++ b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.info
@@ -18,4 +18,5 @@ features[features_api][] = api:2
features[image][] = image_style_full
features[image][] = image_style_large
features[image][] = image_style_small
+features[image][] = image_style_tiny
features[image][] = teaser_image
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.views_default.inc b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.views_default.inc
index 1e878c4e..fa26c502 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.views_default.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.views_default.inc
@@ -169,7 +169,7 @@ function wcm_user_leadership_views_default_views() {
$handler->display->display_options['fields']['field_user_photo']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['field_user_photo']['click_sort_column'] = 'fid';
$handler->display->display_options['fields']['field_user_photo']['settings'] = array(
- 'image_style' => 'bitsy',
+ 'image_style' => 'image_style_tiny',
'image_link' => 'content',
);
/* Field: Realname: Real name */
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 21f60aae..5f8aa5b6 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
@@ -776,7 +776,7 @@ p {
h1, .alpha {
font-size: 40px;
font-size: 4rem;
- margin: .8em 0 0 0.4em;
+ margin: .8em 0 0.2em 0;
color: #b00;
}
@@ -1092,7 +1092,7 @@ p {
h1, .alpha {
font-size: 40px;
font-size: 4rem;
- margin: .8em 0 0 0.4em;
+ margin: .8em 0 0.2em 0;
color: #b00;
}
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 9e47d82f..ebb55c4f 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
@@ -776,7 +776,7 @@ p {
h1, .alpha {
font-size: 40px;
font-size: 4rem;
- margin: .8em 0 0 0.4em;
+ margin: .8em 0 0.2em 0;
color: #b00;
}
@@ -1088,7 +1088,7 @@ p {
h1, .alpha {
font-size: 40px;
font-size: 4rem;
- margin: .8em 0 0 0.4em;
+ margin: .8em 0 0.2em 0;
color: #b00;
}
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 cb700c57..6da2fe04 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
@@ -772,7 +772,7 @@ p {
h1, .alpha {
font-size: 40px;
font-size: 4rem;
- margin: .8em 0 0 0.4em;
+ margin: .8em 0 0.2em 0;
color: #b00;
}
@@ -1085,7 +1085,7 @@ p {
h1, .alpha {
font-size: 40px;
font-size: 4rem;
- margin: .8em 0 0 0.4em;
+ margin: .8em 0 0.2em 0;
color: #b00;
}
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 64972db4..aff76708 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
@@ -772,7 +772,7 @@ p {
h1, .alpha {
font-size: 40px;
font-size: 4rem;
- margin: .8em 0 0 0.4em;
+ margin: .8em 0 0.2em 0;
color: #b00;
}
@@ -1089,7 +1089,7 @@ p {
h1, .alpha {
font-size: 40px;
font-size: 4rem;
- margin: .8em 0 0 0.4em;
+ margin: .8em 0 0.2em 0;
color: #b00;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_typography.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_typography.scss
index c3db5737..02f30244 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_typography.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_typography.scss
@@ -18,7 +18,7 @@ p {
//heading sizes
h1, .alpha {
@include font-size(4);
- margin: .8em 0 0 0.4em;
+ margin: .8em 0 0.2em 0;
color: $red;
}
--
GitLab