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

7.x-1.5 Release Candidate 1

parent 9f033992
No related branches found
Tags 7.x-1.5-rc1
No related merge requests found
......@@ -253,11 +253,6 @@ function ocio_landing_page_strongarm() {
$strongarm->name = 'panelizer_node:ocio_landing_page_allowed_types';
$strongarm->value = array(
'mm_widgets_live_pane-mm_widgets_live_pane' => TRUE,
'block-wcm_panels_settings-wcm_accordion_filter' => TRUE,
'entity_field_extra-fieldable_panels_pane:title' => TRUE,
'entity_field_extra-node:webform' => TRUE,
'entity_field_extra-file:file' => TRUE,
'entity_field_extra-taxonomy_term:description' => TRUE,
'token-node:source' => TRUE,
'token-node:log' => TRUE,
'token-node:content-type' => TRUE,
......@@ -399,6 +394,13 @@ function ocio_landing_page_strongarm() {
'token-view:machine-name' => TRUE,
'token-view:title' => TRUE,
'token-view:url' => TRUE,
'entity_field_extra-fieldable_panels_pane:title' => TRUE,
'entity_field_extra-node:webform' => TRUE,
'entity_field_extra-file:file' => TRUE,
'entity_field_extra-taxonomy_term:description' => TRUE,
'block-menu_block-custom-1' => TRUE,
'block-menu_block-custom-2' => TRUE,
'block-wcm_panels_settings-wcm_accordion_filter' => TRUE,
'entity_view-file' => TRUE,
'entity_view-fieldable_panels_pane' => FALSE,
'entity_view-node' => FALSE,
......@@ -419,7 +421,6 @@ function ocio_landing_page_strongarm() {
'fieldable_panels_pane-video' => TRUE,
'fieldable_panels_pane-fieldable_panels_pane' => FALSE,
'fieldable_panels_pane-spotlight' => FALSE,
'menu_tree-_active' => TRUE,
'views_panes-calendar-upcoming_pane' => TRUE,
'views_panes-calendar-month_pane' => TRUE,
'views_panes-faq-panel_pane_1' => TRUE,
......@@ -450,12 +451,12 @@ function ocio_landing_page_strongarm() {
$strongarm->value = array(
'entity_view' => 'entity_view',
'fieldable_panels_pane' => 'fieldable_panels_pane',
'block' => 0,
'custom' => 0,
'token' => 0,
'entity_form_field' => 0,
'entity_field' => 0,
'entity_field_extra' => 0,
'entity_form_field' => 0,
'token' => 0,
'custom' => 0,
'block' => 0,
'menu_tree' => 0,
'views_panes' => 0,
'other' => 0,
......
<?php
/**
* @file
* Code for the OCIO Main Menu feature.
*/
include_once 'ocio_main_menu.features.inc';
/**
* Implements hook_menu_block_blocks().
*/
......@@ -9,22 +16,30 @@ function ocio_main_menu_menu_block_blocks() {
'custom-1' => array(
'menu_name' => 'main-menu',
'parent_mlid' => 0,
'title_link' => 0,
'admin_title' => 'Secondary Menu Block',
'title_link' => 1,
'admin_title' => 'Secondary MENU BLOCK',
'level' => 2,
'follow' => '0',
'depth' => 0,
'expanded' => 0,
'sort' => 0,
),
'custom-2' => array(
'menu_name' => 'main-menu',
'parent_mlid' => 0,
'title_link' => 1,
'admin_title' => 'Tertiary MENU BLOCK',
'level' => 3,
'follow' => '0',
'depth' => 0,
'expanded' => 0,
'sort' => 0,
),
);
}
/**
* @file
* Code for the OCIO Main Menu feature.
*/
include_once 'ocio_main_menu.features.inc';
/**
* Implements hook_permission().
......
source diff could not be displayed: it is too large. Options to address this: view the blob.
.sidebar-menu-style {
background: $lt-gray;
padding: 1.2em 1.4em;
h2.block__title,
h2.pane-title {
@include font-size(2.6);
......
......@@ -40,10 +40,19 @@
@mixin tile-colors($background, $text, $text-hover, $small_text) {
.tile-content {
background: $background;
color: $text;
color: $text;
h2.pane-title {
color: $text;
}
a {
color: $text;
h2.pane-title {
color: $text;
}
&:hover {
color: $text-hover;
text-decoration: none;
......@@ -53,6 +62,7 @@
}
}
.field--name-field-tile-text-area {
p, ul, li {
color: $small_text;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment