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

daily build

parent 4a2ab02c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 114 additions and 30 deletions
profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.features.filter.inc
+ 6
− 1
View file @ 41dec866
......@@ -22,7 +22,7 @@ function ocio_wysiwyg_filter_default_formats() {
'weight' => -50,
'status' => 1,
'settings' => array(
'allowed_html' => '<a> <em> <u> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <h2> <h3> <h4> <table> <th> <tr> <td> <hr> <img><div><p><span>',
'allowed_html' => '<a> <em> <u> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <h2> <h3> <h4> <table> <th> <tr> <td> <hr> <img><div><p><span><br>',
'filter_html_help' => 1,
'filter_html_nofollow' => 0,
),
......@@ -41,8 +41,13 @@ function ocio_wysiwyg_filter_default_formats() {
'weight' => 50,
'status' => 1,
'settings' => array(
'settings_source' => 'global',
'local_paths' => '',
'protocol_style' => 'full',
'local_settings' => array(
'protocol_style' => 'full',
'local_paths' => '',
),
),
),
),
......
profiles/wcm_base/modules/custom/wcm_user_contact/wcm_user_contact.views_default.inc
+ 2
− 0
View file @ 41dec866
......@@ -57,6 +57,7 @@ function wcm_user_contact_views_default_views() {
$handler->display->display_options['fields']['realname']['label'] = '';
$handler->display->display_options['fields']['realname']['element_type'] = 'h2';
$handler->display->display_options['fields']['realname']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['realname']['link_to_user'] = FALSE;
/* Field: User: Title */
$handler->display->display_options['fields']['field_job_title']['id'] = 'field_job_title';
$handler->display->display_options['fields']['field_job_title']['table'] = 'field_data_field_job_title';
......@@ -272,6 +273,7 @@ function wcm_user_contact_views_default_views() {
$handler->display->display_options['fields']['realname']['label'] = '';
$handler->display->display_options['fields']['realname']['element_type'] = 'h2';
$handler->display->display_options['fields']['realname']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['realname']['link_to_user'] = FALSE;
/* Field: User: Title */
$handler->display->display_options['fields']['field_job_title']['id'] = 'field_job_title';
$handler->display->display_options['fields']['field_job_title']['table'] = 'field_data_field_job_title';
......
profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
+ 3
− 4
View file @ 41dec866
......@@ -379,7 +379,6 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.l-main {
margin-top: 0 !important;
margin-bottom: 0 !important;
padding-top: 30px !important;
}
.l-main.lt-gray {
......@@ -404,9 +403,9 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.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);
-moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.22);
-webkit-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.22);
box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.22);
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane .title-box .title-text {
......
profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
+ 3
− 4
View file @ 41dec866
......@@ -402,7 +402,6 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.l-main {
margin-top: 0 !important;
margin-bottom: 0 !important;
padding-top: 30px !important;
}
.l-main.lt-gray {
......@@ -427,9 +426,9 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.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);
-moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.22);
-webkit-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.22);
box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.22);
}
.panel-pane.pane-bundle-tile-pane .fieldable-panels-pane .title-box .title-text {
......
profiles/wcm_base/themes/ocio_omega_4/sass/components/_l-main.scss
+ 0
− 1
View file @ 41dec866
.l-main {
margin-top: 0 !important;
margin-bottom: 0 !important;
padding-top: 30px !important;
}
.l-main.lt-gray {
......
profiles/wcm_base/themes/ocio_omega_4/sass/variables/_shadows.scss
+ 2
− 2
View file @ 41dec866
$default-box-shadow-color: rgba($black, 0.18);
$default-box-shadow-color: rgba($black, 0.22);
$default-box-shadow-blur: 1px;
$default-box-shadow-h-offset: 0px;
$default-box-shadow-v-offset: 1px;
$default-box-shadow-spread: 1px;
$default-box-shadow-spread: 0px;
profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
+ 4
− 0
View file @ 41dec866
......@@ -574,6 +574,10 @@ ol ol ol {
margin-bottom: 0.6em;
}
.ui-accordion-content ul {
padding-left: 0.6em;
}
.media-element-container {
margin: 0 1.5em 1em 0;
}
......
profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
+ 4
− 0
View file @ 41dec866
......@@ -573,6 +573,10 @@ ol ol ol {
margin-bottom: 0.6em;
}
.ui-accordion-content ul {
padding-left: 0.6em;
}
.media-element-container {
margin: 0 1.5em 1em 0;
}
......
profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
+ 26
− 5
View file @ 41dec866
......@@ -569,6 +569,10 @@ ol ol ol {
margin-bottom: 0.6em;
}
.ui-accordion-content ul {
padding-left: 0.6em;
}
.media-element-container {
margin: 0 1.5em 1em 0;
}
......@@ -1635,12 +1639,12 @@ h2.pane-title {
}
.panels-row {
padding-top: 2em;
padding-bottom: 2em;
padding-top: 1em;
padding-bottom: 1em;
}
.panels-row.odd, .panels-row.even {
padding-top: 3em;
padding-bottom: 3em;
padding-top: 2em;
padding-bottom: 2em;
}
.panels-row.first {
padding-top: 1em;
......@@ -2252,6 +2256,13 @@ div.workbench-info-block #edit-submit {
bottom: 1.2em;
}
.l-content {
min-height: 4em;
}
.l-content h1 {
margin-top: 1.2em;
}
.l-footer-wrapper {
background: #2d2d2d;
color: #fff;
......@@ -2316,9 +2327,15 @@ div.workbench-info-block #edit-submit {
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-youtube:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-youtube:focus {
background-color: #b00;
}
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-googleplus:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-googleplus:focus {
background-color: #dd4b39;
}
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-photos:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-photos:focus {
background-color: #ff0084;
}
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-instagram:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-instagram:focus {
background-color: #517fa4;
}
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-linkedin:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-linkedin:focus {
background-color: #007bb6;
}
......@@ -3382,6 +3399,10 @@ a#skip:active:hover, a#skip:focus:hover {
margin-bottom: 1em;
}
.page-news .view-id-ocio_news_archive.view-display-id-page {
margin-top: 2.6em;
}
.node--article .field--name-byline {
margin: 0.8em 0 0.6em 0;
font-weight: 600;
......@@ -3426,7 +3447,7 @@ a#skip:active:hover, a#skip:focus:hover {
.view-display-id-page .views-row,
.view-display-id-teasers_pane .views-row {
margin-bottom: 3em;
margin-bottom: 3.6em;
}
.view-display-id-page .views-row h2,
.view-display-id-teasers_pane .views-row h2 {
......
profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
+ 26
− 5
View file @ 41dec866
......@@ -570,6 +570,10 @@ ol ol ol {
margin-bottom: 0.6em;
}
.ui-accordion-content ul {
padding-left: 0.6em;
}
.media-element-container {
margin: 0 1.5em 1em 0;
}
......@@ -1652,12 +1656,12 @@ h2.pane-title {
}
.panels-row {
padding-top: 2em;
padding-bottom: 2em;
padding-top: 1em;
padding-bottom: 1em;
}
.panels-row.odd, .panels-row.even {
padding-top: 3em;
padding-bottom: 3em;
padding-top: 2em;
padding-bottom: 2em;
}
.panels-row.first {
padding-top: 1em;
......@@ -2286,6 +2290,13 @@ div.workbench-info-block #edit-submit {
}
}
.l-content {
min-height: 4em;
}
.l-content h1 {
margin-top: 1.2em;
}
.l-footer-wrapper {
background: #2d2d2d;
color: #fff;
......@@ -2350,9 +2361,15 @@ div.workbench-info-block #edit-submit {
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-youtube:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-youtube:focus {
background-color: #b00;
}
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-googleplus:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-googleplus:focus {
background-color: #dd4b39;
}
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-photos:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-photos:focus {
background-color: #ff0084;
}
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-instagram:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-instagram:focus {
background-color: #517fa4;
}
.l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-linkedin:hover, .l-footer-wrapper .osu-siteinfo-social li .siteinfo-social-link.link-linkedin:focus {
background-color: #007bb6;
}
......@@ -3421,6 +3438,10 @@ a#skip:active:hover, a#skip:focus:hover {
margin-bottom: 1em;
}
.page-news .view-id-ocio_news_archive.view-display-id-page {
margin-top: 2.6em;
}
.node--article .field--name-byline {
margin: 0.8em 0 0.6em 0;
font-weight: 600;
......@@ -3473,7 +3494,7 @@ a#skip:active:hover, a#skip:focus:hover {
.view-display-id-page .views-row,
.view-display-id-teasers_pane .views-row {
margin-bottom: 3em;
margin-bottom: 3.6em;
}
.view-display-id-page .views-row h2,
.view-display-id-teasers_pane .views-row h2 {
......
profiles/wcm_base/themes/ocio_omega_base/sass/base/_lists.scss
+ 6
− 0
View file @ 41dec866
......@@ -45,4 +45,10 @@ ol {
li {
margin-bottom: 0.6em;
}
}
.ui-accordion-content {
ul {
padding-left: 0.6em;
}
}
\ No newline at end of file
profiles/wcm_base/themes/ocio_omega_base/sass/components/_panels.scss
+ 5
− 5
View file @ 41dec866
......@@ -56,12 +56,12 @@ h2.pane-title {
// layout rows
.panels-row {
padding-top: 2em;
padding-bottom: 2em;
padding-top: 1em;
padding-bottom: 1em;
&.odd, &.even {
padding-top: 3em;
padding-bottom: 3em;
padding-top: 2em;
padding-bottom: 2em;
}
&.first {
......@@ -77,7 +77,7 @@ h2.pane-title {
}
}
//all layouts with tiles header panels
//all layouts with tiles
.tiles-header-panel .panel-pane {
margin-top: 0;
margin-bottom: 2.5em;
......
profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_content.scss
+ 7
− 0
View file @ 41dec866
.l-content {
min-height: 4em;
h1 {
margin-top: 1.2em;
}
}
\ No newline at end of file
profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_footer.scss
+ 12
− 0
View file @ 41dec866
......@@ -78,12 +78,24 @@
background-color: $youtube;
}
}
&.link-googleplus {
&:hover, &:focus {
background-color: $googleplus;
}
}
&.link-photos {
&:hover, &:focus {
background-color: $flickr;
}
}
&.link-instagram {
&:hover, &:focus {
background-color: $instagram;
}
}
&.link-linkedin {
&:hover, &:focus {
......
profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_news.scss 0 → 100644
+ 5
− 0
View file @ 41dec866
.page-news {
.view-id-ocio_news_archive.view-display-id-page {
margin-top: 2.6em;
}
}
\ No newline at end of file
profiles/wcm_base/themes/ocio_omega_base/sass/components/views/_news-views.scss
+ 1
− 1
View file @ 41dec866
......@@ -72,7 +72,7 @@
.view-display-id-page,
.view-display-id-teasers_pane {
.views-row {
margin-bottom: 3em;
margin-bottom: 3.6em;
h2 {
@include font-size(3.2);
......
profiles/wcm_base/themes/ocio_omega_base/sass/variables/_colors.scss
+ 1
− 1
View file @ 41dec866
......@@ -15,7 +15,7 @@ $purple: #442369;
// social media colors
$facebook: #3b5998;
$youtube: $red;
$google-plus: #dd4b39;
$googleplus: #dd4b39;
$twitter: #00aced;
$linkedin: #007bb6;
$flickr: #ff0084;
......
profiles/wcm_base/themes/ocio_omega_base/templates/system/html.tpl.php
+ 1
− 1
View file @ 41dec866
......@@ -11,7 +11,7 @@
<?php endif; ?>
<head>
<!-- font awesome -->
<link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet">
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
<!-- code font -->
<script src="//use.edgefonts.net/courier-prime.js"></script>
......
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