Skip to content
Snippets Groups Projects
Unverified Commit 6fd824cf authored by weaver299's avatar weaver299 Committed by GitHub
Browse files

Merge pull request #79 from ASCWebServices/canini 

asc_bootstrap - sass updates, link and heading colors for accordions …
parents 41360177 5e4e49d5
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 230 additions and 139 deletions
web/themes/asc_bootstrap/assets/sass/components/_paragraphs.scss
+ 8
− 0
View file @ 6fd824cf
......@@ -25,6 +25,13 @@
padding: 20px;
}
.para_2_col, .para_3_col {
h2, h3, h4, h5, h6 {
margin-top: 0;
line-height: 20px;
}
}
.paragraph__column {
width: $full;
float: left;
......@@ -227,6 +234,7 @@
p {
font-size: 18px;
margin: 25px 0;
color: $gray-dark;
@media (max-width: 768px) {
display: none;
......
web/themes/asc_bootstrap/assets/sass/layout/_section-background-colors.scss
+ 31
− 0
View file @ 6fd824cf
......@@ -163,6 +163,11 @@
a {
color: $white;
text-decoration: underline;
}
h1, h2, h3, h4, h5, h6 {
color: $white;
}
.tab-header {
......@@ -202,6 +207,7 @@
a {
color: $white;
text-decoration: underline;
}
.tab-header {
......@@ -241,6 +247,11 @@
a {
color: $white;
text-decoration: underline;
}
h1, h2, h3, h4, h5, h6 {
color: $white;
}
.tab-header {
......@@ -280,6 +291,11 @@
a {
color: $white;
text-decoration: underline;
}
h1, h2, h3, h4, h5, h6 {
color: $white;
}
.tab-header {
......@@ -319,6 +335,11 @@
a {
color: $white;
text-decoration: underline;
}
h1, h2, h3, h4, h5, h6 {
color: $white;
}
.tab-header {
......@@ -358,6 +379,11 @@
a {
color: $white;
text-decoration: underline;
}
h1, h2, h3, h4, h5, h6 {
color: $white;
}
.tab-header {
......@@ -397,6 +423,11 @@
a {
color: $white;
text-decoration: underline;
}
h1, h2, h3, h4, h5, h6 {
color: $white;
}
.tab-header {
......
web/themes/asc_bootstrap/css/style.css
+ 153
− 115
View file @ 6fd824cf
This diff is collapsed.
web/themes/asc_bootstrap/templates/field/field--field-slides.html.twig
+ 15
− 9
View file @ 6fd824cf
......@@ -38,12 +38,13 @@
#}
<div id="carousel" class="carousel slide" data-ride="false" data-interval="0">
<!-- Indicators -->
{% if items|length > 1 %}
<ol class="carousel-indicators">
{%- for item in items -%}
<li data-target="#carousel" data-slide-to="{{ loop.index0 }}" class="{% if loop.first %}active{% endif %}"></li>
{%- endfor -%}
</ol>
{% endif %}
<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
......@@ -59,14 +60,19 @@
<!-- Controls -->
<a class="left carousel-control" href="#carousel" role="button" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="right carousel-control" href="#carousel" role="button" data-slide="next">
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
{% if items|length > 1 %}
<a class="left carousel-control" href="#carousel" role="button" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="right carousel-control" href="#carousel" role="button" data-slide="next">
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
{% endif %}
{# Shapes bottom div to form arrow #}
<div id="half-t-left"></div>
<div id="half-t-right"></div>
{# END #}
</div>
web/themes/asc_bootstrap/templates/field/field--field-slides2.html.twig
+ 17
− 9
View file @ 6fd824cf
......@@ -38,12 +38,13 @@
#}
<div id="carousel" class="carousel slide" data-ride="false" data-interval="0" style="width: 100%">
<!-- Indicators -->
{% if items|length > 1 %}
<ol class="carousel-indicators">
{%- for item in items -%}
<li data-target="#carousel" data-slide-to="{{ loop.index0 }}" class="{% if loop.first %}active{% endif %}"></li>
{%- endfor -%}
</ol>
{% endif %}
<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
......@@ -59,14 +60,21 @@
<!-- Controls -->
<a class="left carousel-control" href="#carousel" role="button" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="right carousel-control" href="#carousel" role="button" data-slide="next">
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
{% if items|length > 1 %}
<a class="left carousel-control" href="#carousel" role="button" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="right carousel-control" href="#carousel" role="button" data-slide="next">
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
{% endif %}
{# Shapes bottom div to form arrow #}
<div id="half-t-left"></div>
<div id="half-t-right"></div>
{# END #}
</div>
web/themes/asc_bootstrap/templates/paragraph/paragraph--accordion.html.twig
+ 4
− 4
View file @ 6fd824cf
......@@ -52,19 +52,19 @@
{% endif %}
{# Prints Accordion template. #}
<div{{ attributes.addClass(classes).setAttribute('id', paragraph_id) }} role="tablist" aria-multiselectable="true">
<div{{ attributes.addClass(classes).setAttribute('id', paragraph_id) }} aria-multiselectable="true">
<div class="card panel panel-default">
{# Loop through all of the accordion sections. #}
{% for key, item in content.field_accordion_section if key|first != '#' %}
{% set rand = random(56748) %}
<div class="card-header panel-heading hov" role="tab" id="heading-{{ key + 1 }}-{{ rand }}">
<button class="panel-title" data-toggle="collapse" data-parent="{{ paragraph_id }}" href="#collapse-{{ key + 1 }}-{{ rand }}" aria-expanded="true" aria-controls="collapse-{{ key + 1 }}-{{ rand }}" role="heading" aria-level="3">
<div class="card-header panel-heading hov" id="heading-{{ key + 1 }}-{{ rand }}">
<button class="panel-title" data-toggle="collapse" data-parent="heading-{{ key + 1 }}-{{ rand }}" href="#collapse-{{ key + 1 }}-{{ rand }}" aria-controls="collapse-{{ key + 1 }}-{{ rand }}" role="button" href="#collapse-{{ key + 1 }}-{{ rand }}">
{# Print the accordion section title. #}
{{ item['#paragraph'].field_accordion_section_title.value }} <i class="fa fa-angle-down" aria-hidden="true"></i>
</div>
<div id="collapse-{{ key + 1 }}-{{ rand }}" class="card-block panel-collapse collapse" role="tabpanel" aria-labelledby="heading-{{ key + 1 }}-{{ rand }}">
<div id="collapse-{{ key + 1 }}-{{ rand }}" class="card-block panel-collapse collapse" aria-labelledby="heading-{{ key + 1 }}-{{ rand }}">
{# Loop through all of the accordion section bodies. #}
{% for body_key, body_item in item['#paragraph'].field_accordion_section_body %}
{# Use the same render array as item and set the '#paragraph'. #}
......
web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_three.html.twig
+ 1
− 1
View file @ 6fd824cf
......@@ -81,7 +81,7 @@
{# Prints div with classes, and content without Width and Background. #}
<div{{ attributes.addClass(classes) }}>
<div class="paragraph__column {{ bgcolor }}">
<div class="paragraph__column {{ bgcolor }} para_3_col">
{% if page_content_type == 'landing_page' %}
<div class="container">
......
web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_two.html.twig
+ 1
− 1
View file @ 6fd824cf
......@@ -73,7 +73,7 @@
{# Prints div with classes, and content without Width and Background. #}
<div{{ attributes.addClass(classes) }}>
<div class="paragraph__column {{ bgcolor }}">
<div class="paragraph__column {{ bgcolor }} para_2_col">
{% if page_content_type == 'landing_page' %}
<div class="container">
......
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