Commit 43920742 authored by Serhii Myronets's avatar Serhii Myronets
Browse files

Merge branch '1.2.x' of https://git.drupalcode.org/project/socialblue into...

Merge branch '1.2.x' of https://git.drupalcode.org/project/socialblue into bugfix/issue-3222164-replace-font-files
parents f871a1f5 19fca242
......@@ -205,6 +205,7 @@ fieldset strong {
#edit-author-info,
#edit-tab-settings,
#edit-menu,
#edit-content-translation,
.field--name-field-event-date,
.field--name-field-event-date-end,
.field--type-address,
......@@ -217,6 +218,7 @@ fieldset strong {
#edit-author-info fieldset.card,
#edit-tab-settings fieldset.card,
#edit-menu fieldset.card,
#edit-content-translation fieldset.card,
.field--name-field-event-date fieldset.card,
.field--name-field-event-date-end fieldset.card,
.field--type-address fieldset.card,
......@@ -228,6 +230,7 @@ fieldset strong {
#edit-author-info fieldset.card legend.card__title,
#edit-tab-settings fieldset.card legend.card__title,
#edit-menu fieldset.card legend.card__title,
#edit-content-translation fieldset.card legend.card__title,
.field--name-field-event-date fieldset.card legend.card__title,
.field--name-field-event-date-end fieldset.card legend.card__title,
.field--type-address fieldset.card legend.card__title,
......@@ -244,6 +247,8 @@ fieldset strong {
#edit-tab-settings .card__block,
#edit-menu .card,
#edit-menu .card__block,
#edit-content-translation .card,
#edit-content-translation .card__block,
.field--name-field-event-date .card,
.field--name-field-event-date .card__block,
.field--name-field-event-date-end .card,
......@@ -269,6 +274,9 @@ fieldset strong {
#edit-menu .panel-body,
#edit-menu .card__block,
#edit-menu fieldset:not(.card),
#edit-content-translation .panel-body,
#edit-content-translation .card__block,
#edit-content-translation fieldset:not(.card),
.field--name-field-event-date .panel-body,
.field--name-field-event-date .card__block,
.field--name-field-event-date fieldset:not(.card),
......@@ -291,6 +299,7 @@ fieldset strong {
#edit-author-info fieldset:not(.card),
#edit-tab-settings fieldset:not(.card),
#edit-menu fieldset:not(.card),
#edit-content-translation fieldset:not(.card),
.field--name-field-event-date fieldset:not(.card),
.field--name-field-event-date-end fieldset:not(.card),
.field--type-address fieldset:not(.card),
......@@ -302,6 +311,7 @@ fieldset strong {
#edit-author-info legend:not(.card__title),
#edit-tab-settings legend:not(.card__title),
#edit-menu legend:not(.card__title),
#edit-content-translation legend:not(.card__title),
.field--name-field-event-date legend:not(.card__title),
.field--name-field-event-date-end legend:not(.card__title),
.field--type-address legend:not(.card__title),
......@@ -318,6 +328,7 @@ fieldset strong {
#edit-author-info label,
#edit-tab-settings label,
#edit-menu label,
#edit-content-translation label,
.field--name-field-event-date label,
.field--name-field-event-date-end label,
.field--type-address label,
......@@ -330,6 +341,7 @@ fieldset strong {
#edit-author-info .field--name-uid,
#edit-tab-settings .field--name-uid,
#edit-menu .field--name-uid,
#edit-content-translation .field--name-uid,
.field--name-field-event-date .field--name-uid,
.field--name-field-event-date-end .field--name-uid,
.field--type-address .field--name-uid,
......@@ -341,6 +353,7 @@ fieldset strong {
#edit-author-info .form-inline,
#edit-tab-settings .form-inline,
#edit-menu .form-inline,
#edit-content-translation .form-inline,
.field--name-field-event-date .form-inline,
.field--name-field-event-date-end .form-inline,
.field--type-address .form-inline,
......@@ -355,6 +368,7 @@ fieldset strong {
#edit-author-info .form-inline label,
#edit-tab-settings .form-inline label,
#edit-menu .form-inline label,
#edit-content-translation .form-inline label,
.field--name-field-event-date .form-inline label,
.field--name-field-event-date-end .form-inline label,
.field--type-address .form-inline label,
......@@ -366,6 +380,7 @@ fieldset strong {
#edit-author-info .form-inline > *,
#edit-tab-settings .form-inline > *,
#edit-menu .form-inline > *,
#edit-content-translation .form-inline > *,
.field--name-field-event-date .form-inline > *,
.field--name-field-event-date-end .form-inline > *,
.field--type-address .form-inline > *,
......@@ -380,6 +395,7 @@ fieldset strong {
#edit-author-info .form-inline > *:nth-child(1),
#edit-tab-settings .form-inline > *:nth-child(1),
#edit-menu .form-inline > *:nth-child(1),
#edit-content-translation .form-inline > *:nth-child(1),
.field--name-field-event-date .form-inline > *:nth-child(1),
.field--name-field-event-date-end .form-inline > *:nth-child(1),
.field--type-address .form-inline > *:nth-child(1),
......@@ -394,6 +410,7 @@ fieldset strong {
#edit-author-info .form-inline input[type='text'].form-date,
#edit-tab-settings .form-inline input[type='text'].form-date,
#edit-menu .form-inline input[type='text'].form-date,
#edit-content-translation .form-inline input[type='text'].form-date,
.field--name-field-event-date .form-inline input[type='text'].form-date,
.field--name-field-event-date-end .form-inline input[type='text'].form-date,
.field--type-address .form-inline input[type='text'].form-date,
......@@ -405,6 +422,7 @@ fieldset strong {
#edit-author-info [id*='address-ajax-wrapper'],
#edit-tab-settings [id*='address-ajax-wrapper'],
#edit-menu [id*='address-ajax-wrapper'],
#edit-content-translation [id*='address-ajax-wrapper'],
.field--name-field-event-date [id*='address-ajax-wrapper'],
.field--name-field-event-date-end [id*='address-ajax-wrapper'],
.field--type-address [id*='address-ajax-wrapper'],
......
......@@ -183,6 +183,7 @@ fieldset {
#edit-author-info,
#edit-tab-settings,
#edit-menu,
#edit-content-translation,
.field--name-field-event-date,
.field--name-field-event-date-end,
.field--type-address,
......
# Schema for the configuration files of the Social Blue theme.
socialblue.settings:
type: theme_settings
label: 'socialblue settings'
mapping:
font_primary:
type: string
label: 'Font primary'
card_radius:
type: string
label: 'Card radius'
hero_gradient_opacity:
type: integer
label: 'Hero gradient opacity'
form_control_radius:
type: string
label: 'Form control radius'
button_radius:
type: string
label: 'Button radius'
color_primary:
type: string
label: 'Color primary'
color_secondary:
type: string
label: 'Color secondary'
color_accent:
type: string
label: 'Color accent'
color_accent_text:
type: string
label: 'Color accent text'
color_link:
type: string
label: 'Color link'
color_navbar_bg:
type: string
label: 'Color navbar background'
color_navbar_text:
type: string
label: 'Color navbar text'
color_navbar_active_bg':
type: string
label: 'Color navbar active background'
color_navbar_active_text':
type: string
label: 'Color navbar active text'
color_navbar_sec_bg':
type: string
label: 'Color navbar secondary background'
color_navbar_sec_text':
type: string
label: 'Color navbar secondary text'
content_entity_form_style:
type: string
label: 'Content entity form style'
{
"name": "socialblue",
"version": "1.1.1",
"version": "1.2.0",
"description": "Drupal demo theme for Open Social including styleguide",
"main": "gulpfile.js",
"scripts": {
......
{% if items is not empty %}
<div class="card--content-merged__list">
<h5>{{ label }}</h5>
{% set classes = ['badge', 'badge--pill', 'badge--large', 'badge-default'] %}
<div class="list-item__text">
{% for item in items %}
<div{{ item.attributes.addClass(classes) }}>{{ item.content }}</div>
{% endfor %}
</div>
</div>
{% endif %}
......@@ -171,7 +171,7 @@
<div class="meta-engage">
<div class="hero-footer__list-left">
{% if comment_field_status is not empty %}
<a href="#section-comments" class="badge badge--large"
<a href="{{ url }}#section-comments" class="badge badge--large"
title="{% trans %}Total amount of comments{% endtrans %}">
<span class="badge__container">
<svg class="badge__icon">
......
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