Commit 1711d258 authored by Martin Leblanc's avatar Martin Leblanc Committed by Kevin Paxman
Browse files

additional changes to the views css and stucture

parent dfa94fad
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
/**
* @file
* Ckeditor Modal.
*/
(function ($, Drupal) {
if ($.ui && $.ui.dialog) {
orig_allowInteraction = $.ui.dialog.prototype._allowInteraction;
$.ui.dialog.prototype._allowInteraction = function (event) {
if ($(event.target).closest('.cke_dialog').length) {
return true;
}
return orig_allowInteraction.apply(this, arguments);
};
}
})(jQuery, Drupal);
/**
* @file
*/
......@@ -390,6 +373,23 @@ else {
};
})(jQuery);
/**
* @file
* Ckeditor Modal.
*/
(function ($, Drupal) {
if ($.ui && $.ui.dialog) {
orig_allowInteraction = $.ui.dialog.prototype._allowInteraction;
$.ui.dialog.prototype._allowInteraction = function (event) {
if ($(event.target).closest('.cke_dialog').length) {
return true;
}
return orig_allowInteraction.apply(this, arguments);
};
}
})(jQuery, Drupal);
/**
* @file
*/
......
......@@ -15,7 +15,10 @@
.uw-content-moderation__wrapper,
form {
@include uw-contained-width;
padding: rem(gesso-spacing(sm)) 0;
padding: rem(gesso-spacing(sm));
@include xl {
padding: rem(gesso-spacing(sm)) 0;
}
}
// Reset padding
.uw-content-moderation__wrapper{
......
......@@ -21,11 +21,12 @@
.card__body {
background:gesso-brand(org-default,uw-white,primary);
}
.card__header {
@include uw-contained-width;
background:gesso-brand(org-default,uw-white,primary);
.card__title {
font-size: gesso-font-size(8);
......@@ -92,13 +93,15 @@
}
.uw-node__with-image {
.card {
> .card__body {@include uw-contained-width;}
.card__header {
@include uw-contained-width;
}
.card__body {
margin-top: -10rem;
margin-top: -7rem;
}
.card__header {
margin-bottom: 7rem;
margin-bottom: 1rem;
padding-bottom: 4rem;
.card__title {
padding: gesso-spacing(xs) gesso-spacing(md);
......
......@@ -103,7 +103,7 @@ $details-font-family: gesso-font-family(primary);
.details__description,
.seven-details__description{
color: $details-text-color;
font-size: rem(gesso-font-size(0));
font-size: rem(gesso-font-size(-1));
margin-bottom: rem(gesso-spacing(sm));
> :last-child {
......
// @file
// Styles for an icon.
.icon {
display: inline-block;
fill: currentColor;
height: 1em;
position: relative;
top: -2px;
transition: none;
vertical-align: middle;
width: 1em;
.uw-icon {
background-position: left; // LTR
background-repeat: no-repeat;
background-size:cover;
color: gesso-brand(org-default,uw-black,'primary');
display:inline-block;
// Fixes delayed transitions in Chrome.
* {
transition: none;
}
&.is-spaced-before {
margin-left: 0.25em;
&-link{
display:inline-block;
}
&.is-spaced-after {
margin-right: 0.25em;
&__messages-status{
@include svg-background(messages-status);
height:2rem;
width:2rem;
}
&__messages-warning{
@include svg-background(messages-warning);
height:2rem;
width:2rem;
}
&__messages-error{
@include svg-background(messages-error);
height:2rem;
width:2rem;
}
}
{% if is_demo %}
{% set icons = [
'facebook',
'linkedin',
'twitter',
] %}
{% for icon in icons %}
<p>
<svg class="icon {{ modifier_classes }}"{% if is_hidden %} aria-hidden="true"{% endif %}>
<use xlink:href="../../../images/icons.svg#{{ icon }}"></use>
</svg>
{{ icon }}
</p>
{% if icon.url %}
<a href="{{ icon.url }}" class="uw-icon-link">
{% endif %}
<i class="uw-icon uw-icon__{{ icon.text|lower }}"></i>
<span {% if icon.is_hidden %} class="off-screen" {% endif %}>
{{ icon.text|lower }}
</span>
{% if icon.url %}
</a>
{% endif %}
{% endfor %}
{%- else -%}
{% spaceless %}
<svg class="c-icon {{ modifier_classes }}"{% if is_hidden %} aria-hidden="true"{% endif %}>
<use xlink:href="../../../images/icons.svg#{{ icon_name }}"></use>
</svg>
{% endspaceless %}
{%- endif -%}
{% else %}
{% if icon.url %}
<a href="{{ icon.url }}" class="uw-icon-link">
{% endif %}
<i class="uw-icon uw-icon__{{ icon.text|lower }}"></i>
<span {% if icon.is_hidden %} class="off-screen" {% endif %}>
{{ icon.text|lower }}
</span>
{% if icon.url %}
</a>
{% endif %}
{% endif %}
---
is_demo: true
is_hidden: false
modifier_classes: ''
icon_name: ''
icons:
- text: 'messages-status'
url: '#'
is_hidden: false
- text: 'messages-warning'
url: '#'
is_hidden: false
- text: 'messages-error'
url: '#'
is_hidden: false
- text: 'facebook'
url: '#'
is_hidden: false
<div class="view-content">
<div class="view-content" data-uuid="{{ uuid }}">
{% if rows %}
{{ rows }}
{% endif %}
......
......@@ -16,8 +16,22 @@
}
}
form {
ul,li{
list-style: none;
margin:0;
padding:0;
}
.option{
font-family:gesso-font-family(book);
font-size:gesso-font-size(-1);
font-weight:200;
letter-spacing:inherit;
padding-left:0.25rem;
}
width: 100%;
select{
width:inherit;
}
.button,
.image-button {
margin: 0;
......
<div class="view-interact">
{% if exposed %}
{# Print button when filters are present #}
{% include '@components/button/button.twig' with {
'is_button_tag': false,
'is_demo': false,
'url': '#view-filters',
'btn_id': 'offcanvasbutton',
'text': 'Filters',
'modifier_classes': 'button--icon icon--filters view-filters__open',
} %}
{% endif %}
{% if calendar %}
{% include '@components/button/button.twig' with {
'is_button_tag': false,
'is_demo': false,
'url': '#',
'text': 'Calendar',
'modifier_classes': 'button--icon icon--calendar',
} %}
{% endif %}
{% if rss_feed %}
{% include '@components/button/button.twig' with {
'is_button_tag': false,
'is_demo': false,
'url': '#',
'text': 'rss',
'modifier_classes': 'button--icon icon--rss',
} %}
{% endif %}
{% if feed_icons %}
<div class="feed-icons">
{{ feed_icons }}
</div>
{% endif %}
</div>
exposed: true
calendar: 'http://uwat.com'
rss_feed: 'http:uwat.com'
......@@ -9,39 +9,8 @@
]
%}
{% if exposed or feed_icons %}
<div class="view-interact">
{% if exposed %}
{# Print button when filters are present #}
{% include '@components/button/button.twig' with {
'is_button_tag': false,
'is_demo': false,
'url': '#view-filters',
'btn_id': 'offcanvasbutton',
'text': 'Filters',
'modifier_classes': 'button--icon icon--filters view-filters__open',
} %}
{% endif %}
{% include '@components/button/button.twig' with {
'is_button_tag': false,
'is_demo': false,
'url': '#',
'text': 'Calendar',
'modifier_classes': 'button--icon icon--calendar',
} %}
{% include '@components/button/button.twig' with {
'is_button_tag': false,
'is_demo': false,
'url': '#',
'text': 'rss',
'modifier_classes': 'button--icon icon--rss',
} %}
{% if feed_icons %}
<div class="feed-icons">
{{ feed_icons }}
</div>
{% endif %}
</div>
{% if exposed or rss_feed or calendar or feed_icons %}
{% include '@components/view/view-interact/view-interact.twig' %}
{% endif %}
{% if exp_col_all %}
......@@ -74,11 +43,13 @@
{% if rows %}
{% if exp_col_all %}
<div class="uw-exp-col-all" data-uuid="{{ uuid }}">
{# <div class="uw-exp-col-all" data-uuid="{{ uuid }}">#}
{% endif %}
{% include '@components/view/view-content/view-content.twig' %}
{% include '@components/view/view-content/view-content.twig' with {
uuid:uuid,
} %}
{% if exp_col_all %}
</div>
{# </div>#}
{% endif %}
{% else %}
<div class="view-content--message">
......
Supports Markdown
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