Skip to content
Snippets Groups Projects
Commit 96edb996 authored by Chris Gross's avatar Chris Gross
Browse files

daily build

parent d5ed44cf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 163 additions and 73 deletions
profiles/wcm_base/CHANGELOG.txt
+ 5
− 0
View file @ 96edb996
WCM Base 7.x-1.x, 2015-09-11
----------------------------
- WCM Tile Panes: Added tile image style field.
- OCIO Omega Base: Styled textarea tile panes with icon mode.
WCM Base 7.x-1.x, 2015-09-09
----------------------------
- WCM Base: Added telephone module as dependency.
......
profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.strongarm.inc
+ 3
− 3
View file @ 96edb996
......@@ -191,7 +191,7 @@ function ocio_main_menu_strongarm() {
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'responsive_menus_mean_menu_close_txt';
$strongarm->value = '<i class="fa fa-bars"></i>';
$strongarm->value = '<i class="fa fa-chevron-up"></i>';
$export['responsive_menus_mean_menu_close_txt'] = $strongarm;
$strongarm = new stdClass();
......@@ -205,7 +205,7 @@ function ocio_main_menu_strongarm() {
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'responsive_menus_mean_menu_contract_txt';
$strongarm->value = '–';
$strongarm->value = '－';
$export['responsive_menus_mean_menu_contract_txt'] = $strongarm;
$strongarm = new stdClass();
......@@ -226,7 +226,7 @@ function ocio_main_menu_strongarm() {
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'responsive_menus_mean_menu_expand_txt';
$strongarm->value = '+';
$strongarm->value = '＋';
$export['responsive_menus_mean_menu_expand_txt'] = $strongarm;
$strongarm = new stdClass();
......
profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.features.field_base.inc
+ 25
− 0
View file @ 96edb996
......@@ -86,6 +86,31 @@ function wcm_tile_panes_field_default_field_bases() {
'type' => 'image',
);
// Exported field_base: 'field_tile_image_style'
$field_bases['field_tile_image_style'] = array(
'active' => 1,
'cardinality' => 1,
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_tile_image_style',
'indexes' => array(
'value' => array(
0 => 'value',
),
),
'locked' => 0,
'module' => 'list',
'settings' => array(
'allowed_values' => array(
'full' => 'Full Width',
'icon' => 'Icon',
),
'allowed_values_function' => '',
),
'translatable' => 0,
'type' => 'list_text',
);
// Exported field_base: 'field_tile_link'
$field_bases['field_tile_link'] = array(
'active' => 1,
......
profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.features.field_instance.inc
+ 44
− 7
View file @ 96edb996
......@@ -37,7 +37,7 @@ function wcm_tile_panes_field_default_field_instances() {
'active' => 1,
'module' => 'options',
'settings' => array(),
'type' => 'options_buttons',
'type' => 'options_select',
'weight' => 2,
),
);
......@@ -188,7 +188,7 @@ function wcm_tile_panes_field_default_field_instances() {
'module' => 'list',
'settings' => array(),
'type' => 'list_default',
'weight' => 3,
'weight' => 2,
),
),
'ds_extras_field_template' => '',
......@@ -203,7 +203,7 @@ function wcm_tile_panes_field_default_field_instances() {
'active' => 1,
'module' => 'options',
'settings' => array(),
'type' => 'options_buttons',
'type' => 'options_select',
'weight' => 2,
),
);
......@@ -228,7 +228,7 @@ function wcm_tile_panes_field_default_field_instances() {
'ds_extras_field_template' => '',
'entity_type' => 'fieldable_panels_pane',
'field_name' => 'field_tile_background_img',
'label' => 'Background Image',
'label' => 'Image',
'required' => 0,
'settings' => array(
'alt_field' => 0,
......@@ -261,7 +261,6 @@ function wcm_tile_panes_field_default_field_instances() {
'media_default--media_browser_my_files' => 0,
'media_internet' => 0,
'upload' => 0,
'youtube' => 0,
),
'manualcrop_crop_info' => 1,
'manualcrop_default_crop_area' => 1,
......@@ -281,6 +280,42 @@ function wcm_tile_panes_field_default_field_instances() {
),
);
// Exported field_instance: 'fieldable_panels_pane-tile_pane_plus_text_area-field_tile_image_style'
$field_instances['fieldable_panels_pane-tile_pane_plus_text_area-field_tile_image_style'] = array(
'bundle' => 'tile_pane_plus_text_area',
'default_value' => array(
0 => array(
'value' => 'full',
),
),
'deleted' => 0,
'description' => '',
'display' => array(
'default' => array(
'label' => 'hidden',
'module' => 'list',
'settings' => array(),
'type' => 'list_default',
'weight' => 4,
),
),
'ds_extras_field_template' => '',
'entity_type' => 'fieldable_panels_pane',
'field_name' => 'field_tile_image_style',
'label' => 'Image Style',
'required' => 1,
'settings' => array(
'user_register_form' => FALSE,
),
'widget' => array(
'active' => 1,
'module' => 'options',
'settings' => array(),
'type' => 'options_select',
'weight' => 4,
),
);
// Exported field_instance: 'fieldable_panels_pane-tile_pane_plus_text_area-field_tile_link'
$field_instances['fieldable_panels_pane-tile_pane_plus_text_area-field_tile_link'] = array(
'bundle' => 'tile_pane_plus_text_area',
......@@ -350,7 +385,7 @@ function wcm_tile_panes_field_default_field_instances() {
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 2,
'weight' => 3,
),
),
'ds_extras_field_template' => '',
......@@ -374,7 +409,7 @@ function wcm_tile_panes_field_default_field_instances() {
'rows' => 5,
),
'type' => 'text_textarea',
'weight' => 4,
'weight' => 5,
),
);
......@@ -382,6 +417,8 @@ function wcm_tile_panes_field_default_field_instances() {
// Included for use with string extractors like potx.
t('Background Color');
t('Background Image');
t('Image');
t('Image Style');
t('Link');
t('Text Area');
......
profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.info
+ 2
− 0
View file @ 96edb996
......@@ -19,6 +19,7 @@ features[features_api][] = api:2
features[field_base][] = field_background_color
features[field_base][] = field_background_color_2
features[field_base][] = field_tile_background_img
features[field_base][] = field_tile_image_style
features[field_base][] = field_tile_link
features[field_base][] = field_tile_text_area
features[field_instance][] = fieldable_panels_pane-tile_pane-field_background_color
......@@ -26,6 +27,7 @@ features[field_instance][] = fieldable_panels_pane-tile_pane-field_tile_backgrou
features[field_instance][] = fieldable_panels_pane-tile_pane-field_tile_link
features[field_instance][] = fieldable_panels_pane-tile_pane_plus_text_area-field_background_color_2
features[field_instance][] = fieldable_panels_pane-tile_pane_plus_text_area-field_tile_background_img
features[field_instance][] = fieldable_panels_pane-tile_pane_plus_text_area-field_tile_image_style
features[field_instance][] = fieldable_panels_pane-tile_pane_plus_text_area-field_tile_link
features[field_instance][] = fieldable_panels_pane-tile_pane_plus_text_area-field_tile_text_area
features[fieldable_panels_pane_type][] = tile_pane
......
profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.strongarm.inc
+ 1
− 1
View file @ 96edb996
......@@ -69,7 +69,7 @@ function wcm_tile_panes_strongarm() {
'display' => array(
'title' => array(
'default' => array(
'weight' => '3',
'weight' => '5',
'visible' => FALSE,
),
),
......
profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_base.inc
+ 2
− 2
View file @ 96edb996
......@@ -105,12 +105,12 @@ function wcm_user_profile_field_default_field_bases() {
),
),
'locked' => 0,
'module' => 'text',
'module' => 'telephone',
'settings' => array(
'max_length' => 20,
),
'translatable' => 0,
'type' => 'text',
'type' => 'telephone',
);
// Exported field_base: 'field_room_and_building'
......
profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_instance.inc
+ 11
− 7
View file @ 96edb996
......@@ -307,7 +307,7 @@ function wcm_user_profile_field_default_field_instances() {
'label' => 'hidden',
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'type' => 'text_plain',
'weight' => 3,
),
'featured' => array(
......@@ -318,16 +318,20 @@ function wcm_user_profile_field_default_field_instances() {
),
'full' => array(
'label' => 'hidden',
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'module' => 'telephone',
'settings' => array(
'title' => '',
),
'type' => 'telephone_link',
'weight' => 5,
),
'leadership_listing' => array(
'label' => 'hidden',
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'module' => 'telephone',
'settings' => array(
'title' => '',
),
'type' => 'telephone_link',
'weight' => 5,
),
'leadership_profile' => array(
......
profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.install
+ 1
− 1
View file @ 96edb996
......@@ -4,7 +4,7 @@
*/
function wcm_user_profile_update_7001(){
if (module_enable('telephone')) {
if (module_enable('telephone') && module_exists('telephone')) {
db_update('field_config')
->fields(array(
'type' => 'telephone',
......
profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.css
+ 5
− 1
View file @ 96edb996
......@@ -90,9 +90,13 @@
}
@media (max-width: 47.5em) {
.l-region--osu-navbar .l-constrained, .l-region--osu-navbar .l-region--highlighted, .l-region--osu-navbar .l-region--footer, .l-region--masthead .l-constrained, .l-region--masthead .l-region--highlighted, .l-region--masthead .l-region--footer {
body .l-region--osu-navbar .l-constrained, body .l-region--osu-navbar .l-region--highlighted, body .l-region--osu-navbar .l-region--footer, body .l-region--masthead .l-constrained, body .l-region--masthead .l-region--highlighted, body .l-region--masthead .l-region--footer {
padding: 0 4%;
}
body .l-main,
body .l-footer-wrapper {
padding: 4%;
}
}
@media (min-width: 100em) {
.max-width {
......
profiles/wcm_base/themes/ocio_omega_3/css/layouts/ocio-3/ocio-3.layout.no-query.css
+ 5
− 1
View file @ 96edb996
......@@ -85,9 +85,13 @@
clear: both;
}
.l-region--osu-navbar .l-constrained, .l-region--osu-navbar .l-region--highlighted, .l-region--osu-navbar .l-region--footer, .l-region--masthead .l-constrained, .l-region--masthead .l-region--highlighted, .l-region--masthead .l-region--footer {
body .l-region--osu-navbar .l-constrained, body .l-region--osu-navbar .l-region--highlighted, body .l-region--osu-navbar .l-region--footer, body .l-region--masthead .l-constrained, body .l-region--masthead .l-region--highlighted, body .l-region--masthead .l-region--footer {
padding: 0 4%;
}
body .l-main,
body .l-footer-wrapper {
padding: 4%;
}
/* Setting body and page background color */
body.html {
......
profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.no-query.css
+ 5
− 5
View file @ 96edb996
......@@ -81,9 +81,13 @@
clear: both;
}
.l-region--osu-navbar .l-constrained, .l-region--masthead .l-constrained {
body .l-region--osu-navbar .l-constrained, body .l-region--masthead .l-constrained {
padding: 0 4%;
}
body .l-main,
body .l-footer-wrapper {
padding: 4%;
}
/* Setting body and page background color */
body.html {
......@@ -426,7 +430,3 @@ div.workbench-info-block #edit-submit {
.l-footer-wrapper .l-region--footer-2 {
margin-top: 10px;
}
.l-region--main-menu-wrapper .l-constrained {
padding: 0 2.5%;
}
profiles/wcm_base/themes/ocio_omega_3/css/ocio-3.styles.css
+ 9
− 3
View file @ 96edb996
......@@ -86,9 +86,13 @@
}
@media (max-width: 47.5em) {
.l-region--osu-navbar .l-constrained, .l-region--masthead .l-constrained {
body .l-region--osu-navbar .l-constrained, body .l-region--masthead .l-constrained {
padding: 0 4%;
}
body .l-main,
body .l-footer-wrapper {
padding: 4%;
}
}
@media (min-width: 100em) {
.max-width {
......@@ -445,6 +449,8 @@ div.workbench-info-block #edit-submit {
margin-top: 10px;
}
.l-region--main-menu-wrapper .l-constrained {
padding: 0 2.5%;
@media (min-width: 47.5em) {
.l-region--main-menu-wrapper .max-width {
padding: 0 2%;
}
}
profiles/wcm_base/themes/ocio_omega_3/sass/base/_layout-base.scss
+ 10
− 3
View file @ 96edb996
......@@ -11,9 +11,16 @@
//add padding to navbar and masthead for mobile
@include breakpoint($small, true) {
.l-region--osu-navbar, .l-region--masthead {
.l-constrained {
padding: 0 4%;
body {
.l-region--osu-navbar, .l-region--masthead {
.l-constrained {
padding: 0 4%;
}
}
.l-main,
.l-footer-wrapper {
padding: 4%;
}
}
}
......
profiles/wcm_base/themes/ocio_omega_3/sass/components/regions/_footer.scss
+ 2
− 5
View file @ 96edb996
.l-footer-wrapper {
.l-region--footer-1,
.l-region--footer-2 {
margin-top: 10px;
margin-top: 10px;
}
}
}
profiles/wcm_base/themes/ocio_omega_3/sass/components/regions/_main-menu.scss
+ 7
− 5
View file @ 96edb996
.l-region--main-menu-wrapper {
.l-constrained {
padding:0 2.5%;
}
}
\ No newline at end of file
@include breakpoint($tab) {
.l-region--main-menu-wrapper {
.max-width {
padding: 0 2%;
}
}
}
profiles/wcm_base/themes/ocio_omega_3/sass/layouts/ocio-3/ocio-3.layout.scss
+ 13
− 4
View file @ 96edb996
......@@ -11,7 +11,6 @@
@import "../../variables/**/*";
@import "../../base/**/*";
/* Header */
.l-region--header {
padding: $vert-spacing-unit 0;
......@@ -25,15 +24,19 @@
.l-highlighted-wrapper {
padding: $vert-spacing-unit 0;
}
.l-region--highlighted {
@extend .l-constrained;
}
.l-region--help {
margin-bottom: $vert-spacing-unit;
}
.l-main {}
/* Sidebars */
.l-region--sidebar-1,
.l-region--sidebar-2 {
padding: $vert-spacing-unit $horz-spacing-unit;
......@@ -49,14 +52,15 @@
}
@include breakpoint($tab, true) {
/* Header */
.l-branding {
@include grid-span(3, 1);
}
.l-region--navigation {
@include grid-span(6, 4);
}
.l-region--header {
@include grid-span(3, 10);
}
......@@ -67,6 +71,7 @@
.l-content {
@include grid-span(8, 1);
}
.l-region--sidebar-1,
.l-region--sidebar-2 {
@include grid-span(4, 9);
......@@ -78,37 +83,41 @@
.l-region--footer-1 {
@include grid-span(7, 1);
}
.l-region--footer-2 {
@include grid-span(5, 8);
}
.l-region--footer-3 {
clear: both;
}
}
@include breakpoint($desk, true) {
/* Sidebars */
.has-one-sidebar {
.l-content {
@include grid-span(8, 1);
}
.l-region--sidebar-1 {
@include grid-span(4, 9);
clear: none;
}
}
.has-two-sidebars {
.l-content {
@include grid-span(6, 1);
}
.l-region--sidebar-1,
.l-region--sidebar-2 {
@include grid-span(3, 7);
clear: none;
}
.l-region--sidebar-2 {
@include grid-span(3, 10);
}
......
profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
+ 4
− 9
View file @ 96edb996
......@@ -395,21 +395,16 @@ h2.pane-title {
color: #2d2d2d;
}
.panel-pane.pane-bundle-tile-pane {
.panel-pane.pane-bundle-tile-pane,
.panel-pane.pane-bundle-tile-pane-plus-text-area {
-moz-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
-webkit-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane .title-box .title-text {
display: block;
text-align: center;
padding: 0 2em;
}
.panel-pane.pane-bundle-tile-pane-plus-text-area {
-moz-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
-webkit-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
padding: 0 1em;
}
.node-type-ocio-landing-page .l-main {
......
profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
+ 4
− 9
View file @ 96edb996
......@@ -418,21 +418,16 @@ h2.pane-title {
color: #2d2d2d;
}
.panel-pane.pane-bundle-tile-pane {
.panel-pane.pane-bundle-tile-pane,
.panel-pane.pane-bundle-tile-pane-plus-text-area {
-moz-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
-webkit-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane .title-box .title-text {
display: block;
text-align: center;
padding: 0 2em;
}
.panel-pane.pane-bundle-tile-pane-plus-text-area {
-moz-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
-webkit-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
padding: 0 1em;
}
@media (min-width: 85.375em) {
......
profiles/wcm_base/themes/ocio_omega_4/sass/components/_tiles.scss
+ 5
− 7
View file @ 96edb996
//custom tile panes
.panel-pane.pane-bundle-tile-pane {
.panel-pane.pane-bundle-tile-pane,
.panel-pane.pane-bundle-tile-pane-plus-text-area {
@include box-shadow;
}
.panel-pane.pane-bundle-tile-pane {
.fieldable-panels-pane {
.title-box {
.title-text {
display: block;
text-align: center;
padding: 0 2em;
padding: 0 1em;
}
}
}
}
.panel-pane.pane-bundle-tile-pane-plus-text-area {
@include box-shadow;
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment