Skip to content
Snippets Groups Projects
Commit 0fe94092 authored by Melissa Miller's avatar Melissa Miller
Browse files

weekly build

parent d83c2b27
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1530 additions and 1108 deletions
profiles/wcm_base/modules/custom/news_client/news_client.tokens.inc 0 → 100644
+ 86
− 0
View file @ 0fe94092
<?php
/**
* @file
* Defines tokens for news_client.
*/
/**
* Implements hook_token_info().
*/
function news_client_token_info() {
$info = array();
$info['tokens']['node']['news_client_body_summary'] = array(
'name' => t('News Client:Body Summary'),
'description' => t('Body summary for the News Client Cached Article.'),
);
$info['tokens']['node']['news_client_featured_image_url'] = array(
'name' => t('News Client:Featured Image URL'),
'description' => t('Featured Image URL for the News Client Cached Article.'),
);
$info['tokens']['node']['news_client_featured_image_alt'] = array(
'name' => t('News Client:Featured Image Alt'),
'description' => t('Featured Image alt text for the News Client Cached Article.'),
);
return $info;
}
/**
* Implements hook_tokens().
*/
function news_client_tokens($type, $tokens, array $data = array(), array $options = array()) {
$replacements = array();
$sanitize = !empty($options['sanitize']);
if ($type == 'node' && !empty($data['node'])) {
$node = $data['node'];
if ($node->type == 'news_client_cached_article') {
try {
$wrapper = entity_metadata_wrapper('node', $node);
foreach ($tokens as $name => $original) {
switch ($name) {
case 'news_client_body_summary':
$summary = $wrapper->news_client_body->summary->value();
$summary = strip_tags($summary);
$summary = trim($summary);
if (empty($summary)) {
$body = $wrapper->news_client_body->value->value();
$body = strip_tags($body);
$summary = text_summary($body, NULL, 200);
}
$replacements[$original] = $summary;
break;
case 'news_client_featured_image_url' :
$image_json = $wrapper->news_client_image_json->value();
$image_array = json_decode($image_json, TRUE);
$image_data = array_shift($image_array);
$replacements[$original] = isset($image_data['url']) ? $image_data['url'] : '';
break;
case 'news_client_featured_image_alt' :
$image_json = $wrapper->news_client_image_json->value();
$image_array = json_decode($image_json, TRUE);
$image_data = array_shift($image_array);
$replacements[$original] = isset($image_data['alt']) ? $image_data['alt'] : '';
break;
}
}
}
catch (Exception $e) {
_news_client_entitymetadatawrapper_exception($e);
}
}
}
return $replacements;
}
profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.panelizer.inc
+ 1
− 1
View file @ 0fe94092
...@@ -30,7 +30,7 @@ function ocio_landing_page_panelizer_defaults() { ...@@ -30,7 +30,7 @@ function ocio_landing_page_panelizer_defaults() {
$panelizer->contexts = array(); $panelizer->contexts = array();
$panelizer->relationships = array(); $panelizer->relationships = array();
$display = new panels_display(); $display = new panels_display();
$display->layout = 'ocio-omega-tiles-equalcol'; $display->layout = 'wcm-omega-3c';
$display->layout_settings = array(); $display->layout_settings = array();
$display->panel_settings = array( $display->panel_settings = array(
'style_settings' => array( 'style_settings' => array(
......
profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.context.inc
+ 32
− 0
View file @ 0fe94092
...@@ -10,6 +10,38 @@ ...@@ -10,6 +10,38 @@
function ocio_main_menu_context_default_contexts() { function ocio_main_menu_context_default_contexts() {
$export = array(); $export = array();
$context = new stdClass();
$context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
$context->api_version = 3;
$context->name = 'global-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-menu-global-menu' => array(
'module' => 'menu',
'delta' => 'menu-global-menu',
'region' => 'global_menu',
'weight' => '-10',
),
),
),
);
$context->condition_mode = 0;
// Translatables
// Included for use with string extractors like potx.
t('OCIO Main Menu');
$export['global-menu'] = $context;
$context = new stdClass(); $context = new stdClass();
$context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */ $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
$context->api_version = 3; $context->api_version = 3;
......
profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.features.fe_block_settings.inc
+ 21
− 19
View file @ 0fe94092
...@@ -12,37 +12,39 @@ function ocio_main_menu_default_fe_block_settings() { ...@@ -12,37 +12,39 @@ function ocio_main_menu_default_fe_block_settings() {
$export['version'] = '2.0'; $export['version'] = '2.0';
$export['menu_block-custom-1'] = array( $export['menu-menu-global-menu'] = array(
'cache' => -1, 'cache' => -1,
'custom' => 0, 'custom' => 0,
'delta' => 'custom-1', 'delta' => 'menu-global-menu',
'module' => 'menu_block', 'module' => 'menu',
'node_types' => array(), 'node_types' => array(),
'pages' => '', 'pages' => '',
'roles' => array(), 'roles' => array(),
'themes' => array( 'themes' => array(
'ocio_1' => array( 'wcm_omega' => array(
'region' => '',
'status' => 0,
'theme' => 'ocio_1',
'weight' => 0,
),
'ocio_2' => array(
'region' => '',
'status' => 0,
'theme' => 'ocio_2',
'weight' => 0,
),
'ocio_3' => array(
'region' => '', 'region' => '',
'status' => 0, 'status' => 0,
'theme' => 'ocio_3', 'theme' => 'wcm_omega',
'weight' => 0, 'weight' => 0,
), ),
'ocio_4' => array( ),
'title' => '<none>',
'visibility' => 0,
);
$export['menu_block-custom-1'] = array(
'cache' => -1,
'custom' => 0,
'delta' => 'custom-1',
'module' => 'menu_block',
'node_types' => array(),
'pages' => '',
'roles' => array(),
'themes' => array(
'wcm_omega' => array(
'region' => '', 'region' => '',
'status' => 0, 'status' => 0,
'theme' => 'ocio_4', 'theme' => 'wcm_omega',
'weight' => 0, 'weight' => 0,
), ),
), ),
......
profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.features.menu_custom.inc
+ 8
− 0
View file @ 0fe94092
...@@ -16,9 +16,17 @@ function ocio_main_menu_menu_default_menu_custom() { ...@@ -16,9 +16,17 @@ function ocio_main_menu_menu_default_menu_custom() {
'title' => 'Main menu', 'title' => 'Main menu',
'description' => 'The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.', 'description' => 'The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.',
); );
// Exported menu: menu-global-menu.
$menus['menu-global-menu'] = array(
'menu_name' => 'menu-global-menu',
'title' => 'Global Menu',
'description' => 'Simple top menu for all pages',
);
// Translatables // Translatables
// Included for use with string extractors like potx. // Included for use with string extractors like potx.
t('Global Menu');
t('Main menu'); t('Main menu');
t('Simple top menu for all pages');
t('The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.'); t('The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.');
return $menus; return $menus;
......
profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.info
+ 6
− 0
View file @ 0fe94092
...@@ -11,17 +11,22 @@ dependencies[] = fe_block ...@@ -11,17 +11,22 @@ dependencies[] = fe_block
dependencies[] = features dependencies[] = features
dependencies[] = menu dependencies[] = menu
dependencies[] = menu_block dependencies[] = menu_block
dependencies[] = menu_depth_limit
dependencies[] = responsive_menus dependencies[] = responsive_menus
dependencies[] = search dependencies[] = search
dependencies[] = special_menu_items dependencies[] = special_menu_items
dependencies[] = strongarm dependencies[] = strongarm
dependencies[] = superfish dependencies[] = superfish
features[context][] = global-menu
features[context][] = main-menu features[context][] = main-menu
features[context][] = second-level-menu features[context][] = second-level-menu
features[ctools][] = context:context:3 features[ctools][] = context:context:3
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[fe_block_settings][] = menu-menu-global-menu
features[fe_block_settings][] = menu_block-custom-1
features[features_api][] = api:2 features[features_api][] = api:2
features[menu_custom][] = main-menu features[menu_custom][] = main-menu
features[menu_custom][] = menu-global-menu
features[variable][] = custom_breadcrumb_home features[variable][] = custom_breadcrumb_home
features[variable][] = custom_breadcrumbs_append_bid_class features[variable][] = custom_breadcrumbs_append_bid_class
features[variable][] = custom_breadcrumbs_append_page_title features[variable][] = custom_breadcrumbs_append_page_title
...@@ -45,6 +50,7 @@ features[variable][] = menu_block_1_level ...@@ -45,6 +50,7 @@ features[variable][] = menu_block_1_level
features[variable][] = menu_block_1_parent features[variable][] = menu_block_1_parent
features[variable][] = menu_block_1_sort features[variable][] = menu_block_1_sort
features[variable][] = menu_block_1_title_link features[variable][] = menu_block_1_title_link
features[variable][] = menu_depth_limit__menu-global-menu
features[variable][] = responsive_menus_ignore_admin features[variable][] = responsive_menus_ignore_admin
features[variable][] = responsive_menus_mean_menu_close_size features[variable][] = responsive_menus_mean_menu_close_size
features[variable][] = responsive_menus_mean_menu_close_txt features[variable][] = responsive_menus_mean_menu_close_txt
......
profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.make
+ 3
− 0
View file @ 0fe94092
...@@ -18,6 +18,9 @@ projects[custom_breadcrumbs][subdir] = contrib ...@@ -18,6 +18,9 @@ projects[custom_breadcrumbs][subdir] = contrib
projects[custom_breadcrumbs_features][version] = 2.0-rc1 projects[custom_breadcrumbs_features][version] = 2.0-rc1
projects[custom_breadcrumbs_features][subdir] = contrib projects[custom_breadcrumbs_features][subdir] = contrib
projects[menu_depth_limit][version] = 1.0
projects[menu_depth_limit][subdir] = contrib
;libraries ;libraries
libraries[superfish][directory_name] = superfish libraries[superfish][directory_name] = superfish
......
profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.module
+ 62
− 5
View file @ 0fe94092
...@@ -37,6 +37,7 @@ function ocio_main_menu_permission() { ...@@ -37,6 +37,7 @@ function ocio_main_menu_permission() {
); );
} }
/** /**
* Implements hook_menu(). * Implements hook_menu().
*/ */
...@@ -53,6 +54,13 @@ function ocio_main_menu_menu() { ...@@ -53,6 +54,13 @@ function ocio_main_menu_menu() {
'file' => 'menu.admin.inc', 'file' => 'menu.admin.inc',
); );
//main menu
$items['admin/menu/main'] = array(
'title' => 'Main Menu',
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -10
);
$items['admin/menu/add'] = array( $items['admin/menu/add'] = array(
'title' => 'Add link', 'title' => 'Add link',
'page callback' => 'drupal_get_form', 'page callback' => 'drupal_get_form',
...@@ -98,6 +106,33 @@ function ocio_main_menu_menu() { ...@@ -98,6 +106,33 @@ function ocio_main_menu_menu() {
'file' => 'menu.admin.inc', 'file' => 'menu.admin.inc',
); );
//global menu tab
$items['admin/menu/global'] = array(
'title' => 'Global Menu',
'type' => MENU_LOCAL_TASK,
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_overview_form', menu_load('menu-global-menu')),
'access arguments' => array('administer ocio main menu'),
'file path' => drupal_get_path('module', 'menu'),
'file' => 'menu.admin.inc',
);
$items['admin/menu/global/add'] = array(
'title' => 'Add link',
'page callback' => 'drupal_get_form',
'page arguments' => array(
'menu_edit_item',
'add',
NULL,
menu_load('menu-global-menu'),
),
'access arguments' => array('administer ocio main menu'),
'type' => MENU_LOCAL_ACTION,
'file path' => drupal_get_path('module', 'menu'),
'file' => 'menu.admin.inc',
);
//help link
$items['admin/help'] = array( $items['admin/help'] = array(
'title' => 'Help', 'title' => 'Help',
'description' => t('Documentation for using this site.'), 'description' => t('Documentation for using this site.'),
...@@ -107,16 +142,17 @@ function ocio_main_menu_menu() { ...@@ -107,16 +142,17 @@ function ocio_main_menu_menu() {
'weight' => 50, 'weight' => 50,
); );
$items['admin/help']['options']['attributes']['target'] = '_blank'; $items['admin/help']['options']['attributes']['target'] = '_blank';
return $items; return $items;
} }
/* /*
* Allow access to modify manin menu menu items only * Allow access to modify main menu and global menu menu items only
*/ */
function ocio_main_menu_item_access($item) { function ocio_main_menu_item_access($item) {
return $item['menu_name'] == 'main-menu' && user_access('administer ocio main menu'); return $item['menu_name'] == 'main-menu' || 'menu-global-menu' && user_access('administer ocio main menu');
} }
/** /**
...@@ -138,6 +174,7 @@ function ocio_main_menu_form_alter(&$form, $form_state, $form_id) { ...@@ -138,6 +174,7 @@ function ocio_main_menu_form_alter(&$form, $form_state, $form_id) {
} }
$form['#submit'][] = 'ocio_main_menu_menu_redirect'; $form['#submit'][] = 'ocio_main_menu_menu_redirect';
} }
} }
/** /**
...@@ -178,7 +215,7 @@ function ocio_main_menu_form_menu_overview_form_alter(&$form, &$form_state) { ...@@ -178,7 +215,7 @@ function ocio_main_menu_form_menu_overview_form_alter(&$form, &$form_state) {
// Correct empty text add link path. // Correct empty text add link path.
if (array_key_exists('#empty_text', $form)) { if (array_key_exists('#empty_text', $form)) {
$form['#empty_text'] = t('There are no menu links yet. <a href="@link">Add link</a>.', array('@link' => url('admin/menu/add'))); $form['#empty_text'] = t('There are no menu links yet. <a href="@link">Add link</a>.', array('@link' => url($form['#action'] .'/add')));
} }
} }
} }
...@@ -192,9 +229,23 @@ function ocio_main_menu_form_menu_edit_menu_alter(&$form, &$form_state) { ...@@ -192,9 +229,23 @@ function ocio_main_menu_form_menu_edit_menu_alter(&$form, &$form_state) {
$access = user_access('administer menu'); $access = user_access('administer menu');
$form['menu_name']['#access'] = $access; $form['menu_name']['#access'] = $access;
$form['description']['#access'] = $access; $form['description']['#access'] = $access;
//hides menu selected by page checkbox
$form['menu_block_menu_order']['#access'] = FALSE;
//hides depth limit field, leave value set to default of 9
$form['depth_limit']['#access'] = FALSE;
} }
}
//adjutsments to global menu tab
if ($form['#action'] == '/admin/menu/global') {
//hides menu title field on the global menu edit page
$form['title']['#access'] = FALSE;
$form['description_toggle']['#weight'] = '100';
//hides menu selected by page checkbox
$form['menu_block_menu_order']['#access'] = FALSE;
//hides depth limit field, value set to 1 via strongarm
$form['depth_limit']['#access'] = FALSE;
}
}
/* /*
* Checks if menu is being accessed via default path * Checks if menu is being accessed via default path
...@@ -208,7 +259,13 @@ function ocio_main_menu_is_custom_path() { ...@@ -208,7 +259,13 @@ function ocio_main_menu_is_custom_path() {
*/ */
function ocio_main_menu_menu_redirect($form, &$form_state) { function ocio_main_menu_menu_redirect($form, &$form_state) {
// Redirect using drupal_goto, because normal redirect value gets lost. // Redirect using drupal_goto, because normal redirect value gets lost.
drupal_goto('admin/menu'); $url = 'admin/menu';
if (($form_state['input']['op'] == 'Save' && $form_state['values']['menu_name'] == 'menu-global-menu') || ($form_state['input']['op'] == 'Confirm' && $form['#item']['menu_name'] == 'menu-global-menu')) {
$url .= '/global';
}
drupal_goto($url);
} }
/** /**
......
profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.strongarm.inc
+ 7
− 0
View file @ 0fe94092
...@@ -171,6 +171,13 @@ function ocio_main_menu_strongarm() { ...@@ -171,6 +171,13 @@ function ocio_main_menu_strongarm() {
$strongarm->value = 0; $strongarm->value = 0;
$export['menu_block_1_title_link'] = $strongarm; $export['menu_block_1_title_link'] = $strongarm;
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'menu_depth_limit__menu-global-menu';
$strongarm->value = '1';
$export['menu_depth_limit__menu-global-menu'] = $strongarm;
$strongarm = new stdClass(); $strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1; $strongarm->api_version = 1;
......
profiles/wcm_base/modules/panopoly/panopoly_magic/PATCHES.txt
+ 1
− 1
View file @ 0fe94092
The following patches have been applied to this project: The following patches have been applied to this project:
- http://drupal.org/files/issues/panopoly_magic-indirect_variable_access-2869560-4.patch - http://drupal.org/files/issues/panopoly_magic-indirect_variable_access-2869560-4.patch
This file was automatically generated by Drush Make (http://drupal.org/project/drush). This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
profiles/wcm_base/modules/panopoly/panopoly_search/PATCHES.txt
+ 1
− 1
View file @ 0fe94092
The following patches have been applied to this project: The following patches have been applied to this project:
- http://drupal.org/files/issues/panopoly_search-update-search-api-2863077-2.patch - http://drupal.org/files/issues/panopoly_search-update-search-api-2863077-2.patch
This file was automatically generated by Drush Make (http://drupal.org/project/drush). This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
profiles/wcm_base/themes/wcm_omega/css/wcm-omega.styles.css
+ 1
− 1
View file @ 0fe94092
source diff could not be displayed: it is too large. Options to address this: view the blob.
profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4e/wcm-omega-4e.inc 0 → 100644
+ 44
− 0
View file @ 0fe94092
<?php
// Plugin definition
$plugin = array(
'title' => t('Layout 4e'),
'icon' => 'wcm-omega-4e.png',
'category' => t('WCM Omega Layouts'),
'theme' => 'wcm_omega_4e',
'css' => '../wcm-omega-layouts.css',
'regions' => array(
'header' => t('Header'),
'tiles_header' => t('Tiles Header'),
'tile1' => t('Tile 1'),
'tile2' => t('Tile 2'),
'tile3' => t('Tile 3'),
'tile4' => t('Tile 4'),
'tile5' => t('Tile 5'),
'tile6' => t('Tile 6'),
'tile7' => t('Tile 7'),
'tile8' => t('Tile 8'),
'tile9' => t('Tile 9'),
'tile10' => t('Tile 10'),
'tile11' => t('Tile 11'),
'tile12' => t('Tile 12'),
'tile13' => t('Tile 13'),
'tile14' => t('Tile 14'),
'tile15' => t('Tile 15'),
'tile16' => t('Tile 16'),
'footer' => t('Footer'),
),
);
/**
* Implements hook_preprocess_wcm_omega_4e().
*/
function template_preprocess_wcm_omega_4e(&$vars) {
$rows = array(
'header' => array('header'),
'content_group' =>array('tiles_header','tile1', 'tile2', 'tile3', 'tile4', 'tile5', 'tile6', 'tile7', 'tile8', 'tile9', 'tile10', 'tile11', 'tile12', 'tile13', 'tile14', 'tile15', 'tile16'),
'footer' => array('footer'),
);
$vars['panels_row'] = ocio_omega_settings_panel_rows($rows, $vars);
$vars['panels_row_classes'] = ocio_omega_settings_panel_row_classes();
}
profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4e/wcm-omega-4e.png 0 → 100644
+ 0
− 0
View file @ 0fe94092
profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4e/wcm-omega-4e.png

446 B

profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4e/wcm-omega-4e.tpl.php 0 → 100644
+ 170
− 0
View file @ 0fe94092
<?php
/**
* @file
* Template for custom wcm-omega-4e Panopoly layout.
*
* Variables:
* - $css_id: An optional CSS id to use for the layout.
* - $content: An array of content, each item in the array is keyed to one
* panel of the layout. This layout supports the following sections:
*/
?>
<div class="panel-display wcm-omega-4e clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
<!-- header-->
<div class="row-header panels-row <?php print $panels_row['header']; ?>">
<div class="clearfix row-fluid panel-panel span12 <?php print $panels_row_classes; ?>">
<div class="panel-panel-inner">
<?php print $content['header']; ?>
</div>
</div>
</div>
<!-- content_group -->
<div class="row-tiles-group panels-row row-tiles <?php print $panels_row['content_group']; ?>">
<!-- tiles_header -->
<div class="clearfix row-fluid panel-panel span12 <?php print $panels_row_classes; ?>">
<div class="panel-panel-inner">
<?php print $content['tiles_header']; ?>
</div>
</div>
<!-- first row of tiles -->
<div class="clearfix row-fluid panels-row tiles-row <?php print $panels_row_classes; ?>">
<div class="panel-panel tile-panel span3 first-tile">
<div class="panel-panel-inner">
<?php print $content['tile1']; ?>
</div>
</div>
<div class="panel-panel tile-panel span3">
<div class="panel-panel-inner">
<?php print $content['tile2']; ?>
</div>
</div>
<div class="panel-panel tile-panel span3">
<div class="panel-panel-inner">
<?php print $content['tile3']; ?>
</div>
</div>
<div class="panel-panel tile-panel span3 last-tile">
<div class="panel-panel-inner">
<?php print $content['tile4']; ?>
</div>
</div>
</div><!-- /first row of tiles -->
<!-- second row of tiles -->
<div class="clearfix row-fluid panels-row tiles-row multiple <?php print $panels_row_classes; ?>">
<div class="panel-panel tile-panel span3 first-tile">
<div class="panel-panel-inner">
<?php print $content['tile5']; ?>
</div>
</div>
<div class="panel-panel tile-panel span3">
<div class="panel-panel-inner">
<?php print $content['tile6']; ?>
</div>
</div>
<div class="panel-panel tile-panel span3">
<div class="panel-panel-inner">
<?php print $content['tile7']; ?>
</div>
</div>
<div class="panel-panel tile-panel span3 last-tile">
<div class="panel-panel-inner">
<?php print $content['tile8']; ?>
</div>
</div>
</div><!-- /second row of tiles -->
<!-- third row of tiles -->
<div class="clearfix row-fluid panels-row tiles-row multiple <?php print $panels_row_classes; ?>">
<div class="panel-panel tile-panel span3 first-tile">
<div class="panel-panel-inner">
<?php print $content['tile9']; ?>
</div>
</div>
<div class="panel-panel tile-panel span3">
<div class="panel-panel-inner">
<?php print $content['tile10']; ?>
</div>
</div>
<div class="panel-panel tile-panel span3">
<div class="panel-panel-inner">
<?php print $content['tile11']; ?>
</div>
</div>
<div class="panel-panel tile-panel span3 last-tile">
<div class="panel-panel-inner">
<?php print $content['tile12']; ?>
</div>
</div>
</div><!-- /third row of tiles -->
<!-- fourth row of tiles -->
<div class="clearfix row-fluid panels-row tiles-row multiple <?php print $panels_row_classes; ?>">
<div class="panel-panel tile-panel span3 first-tile">
<div class="panel-panel-inner">
<?php print $content['tile13']; ?>
</div>
</div>
<div class="panel-panel tile-panel span3">
<div class="panel-panel-inner">
<?php print $content['tile14']; ?>
</div>
</div>
<div class="panel-panel tile-panel span3">
<div class="panel-panel-inner">
<?php print $content['tile15']; ?>
</div>
</div>
<div class="panel-panel tile-panel span3 last-tile">
<div class="panel-panel-inner">
<?php print $content['tile16']; ?>
</div>
</div>
</div><!-- /fourth row of tiles -->
</div> <!-- /content_group -->
<!-- footer -->
<div class="row-footer panels-row <?php print $panels_row['footer']; ?>">
<div class="clearfix row-fluid panel-panel span12 <?php print $panels_row_classes; ?>">
<div class="panel-panel-inner">
<?php print $content['footer']; ?>
</div>
</div>
</div>
</div><!-- /.wcm-omega-4e -->
profiles/wcm_base/themes/wcm_omega/sass/base/_wysiwyg.scss
+ 16
− 1
View file @ 0fe94092
...@@ -53,6 +53,11 @@ h3.underlined { ...@@ -53,6 +53,11 @@ h3.underlined {
&:last-child { &:last-child {
padding-bottom: 0; padding-bottom: 0;
} }
&.align-center {
width: 90%;
margin-left: auto;
margin-right: auto;
}
} }
.intro-text-alt { .intro-text-alt {
...@@ -63,10 +68,15 @@ h3.underlined { ...@@ -63,10 +68,15 @@ h3.underlined {
&:last-child { &:last-child {
padding-bottom: 0; padding-bottom: 0;
} }
&.align-center {
width: 90%;
margin-left: auto;
margin-right: auto;
}
} }
.intro-text-legacy { .intro-text-legacy {
@include font-size(1.8); @include font-size(2.0);
font-family: $capita; font-family: $capita;
font-weight: 100; font-weight: 100;
line-height: 170%; line-height: 170%;
...@@ -75,6 +85,11 @@ h3.underlined { ...@@ -75,6 +85,11 @@ h3.underlined {
&:last-child { &:last-child {
padding-bottom: 0; padding-bottom: 0;
} }
&.align-center {
width: 85%;
margin-left: auto;
margin-right: auto;
}
} }
.callout { .callout {
......
profiles/wcm_base/themes/wcm_omega/sass/components/menus/_global menu.scss
+ 35
− 11
View file @ 0fe94092
#block-menu-menu-global-menu { #block-menu-menu-global-menu {
h2.block_title {
display: none;
}
ul.menu { ul.menu {
float: right; float: right;
...@@ -7,7 +12,8 @@ ...@@ -7,7 +12,8 @@
} }
li, a { li, a {
@include font-size(1.35); @include font-size(1.4);
font-weight: 300;
} }
.leaf { .leaf {
...@@ -16,7 +22,11 @@ ...@@ -16,7 +22,11 @@
&:after { &:after {
content: "|"; content: "|";
margin: 0 0.5em; margin: 0 0.6em;
font-weight: 100;
@include font-size(1.6);
position: relative;
bottom: -0.1em;
} }
&.last { &.last {
...@@ -30,8 +40,7 @@ ...@@ -30,8 +40,7 @@
} }
//mixin for global menu //mixin for global menu
@mixin global-menu($background, $text, $pipe, $text_hover, $text_active, $text_focus) { @mixin global-menu($text, $pipe, $text_hover, $text_active, $text_focus) {
background: $background;
color: $pipe; color: $pipe;
a { a {
color: $text; color: $text;
...@@ -48,22 +57,37 @@ ...@@ -48,22 +57,37 @@
} }
.l-region--global-menu { .l-region--global-menu {
padding-top: 0.5em; padding-top: 0.55em;
padding-bottom: 0.3em; padding-bottom: 0.50em;
&, &.white { &, &.white {
@include global-menu($lt-gray, $dk-gray, $red, $red, $blue, $orange); @include global-menu($dk-gray, $red, $red, $blue, $orange);
@include background-image(linear-gradient(lighten($lt-gray,2%), $lt-gray 75%, darken($lt-gray,2%)));
} }
&.lt-gray { &.lt-gray {
@include global-menu(darken($lt-gray,8%), $dk-gray, $red, $red, $blue, $orange); @include global-menu($dk-gray, $red, $red, $blue, $orange);
@include background-image(linear-gradient(darken($lt-gray,5%), darken($lt-gray,6%) 65%, darken($lt-gray,9%)));
} }
&.md-gray { &.md-gray {
@include global-menu(lighten($md-gray,9%), $white, $lt-gray, darken($lt-gray, 10%), $yellow, $orange); @include global-menu($white, darken($lt-gray, 25%), $green, $yellow, $orange);
@include background-image(linear-gradient(lighten($md-gray,3%), lighten($md-gray,6%) 75%, lighten($md-gray,7%)));
} }
&.dk-gray { &.dk-gray {
@include global-menu(lighten($dk-gray, 8%), $lt-gray, $white, $white, $yellow, $orange); @include global-menu($white, darken($lt-gray, 20%), $blue, $yellow, $orange);
@include background-image(linear-gradient(lighten($dk-gray,2%), lighten($dk-gray,5%) 75%, lighten($dk-gray,6%)));
}
}
//adjustments for mobile
@include breakpoint($small){
.l-region--global-menu {
padding: 0.1em 0;
}
ul.menu {
float: left !important;
} }
} }
......
profiles/wcm_base/themes/wcm_omega/sass/components/panels/_tiles.scss
+ 2
− 2
View file @ 0fe94092
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
} }
.text-areas { .text-areas {
padding: 1.6em 0.4em 0.6em 0.4em; padding: 1.6em 1.2em 1.2em 1.2em;
} }
h2 { h2 {
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
} }
} }
} }
.tile-image-style-icon { .tile-image-style-icon {
display: block; display: block;
padding: 1.4em 1.4em 1em; padding: 1.4em 1.4em 1em;
......
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