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

Merge pull request #58 from ASCWebServices/canini 

 asc_bootstrap - sass and temp updates, fixing event and news filter d...
parents 5fa2eb6b 068abdb9
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 587 additions and 157 deletions
web/themes/asc_bootstrap/asc_bootstrap.theme
+ 43
− 0
View file @ d62a39b0
......@@ -51,3 +51,46 @@ function asc_bootstrap_preprocess_paragraph(&$variables) {
function asc_bootstrap_preprocess_block(&$vars) {
$vars['site_mail'] = \Drupal::config('system.site')->get('mail');
}
/*
* alters news and events filters so that AJAX doesn't remove headings, etc. upon request
*/
function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
if (($form['#id'] == 'views-exposed-form-events-page-1')||($form['#id'] == '#views-exposed-form-news-page-1')) {
/*
* add new HTML content to filters (headers and spacer)
* and setting weights for where they should appear in the form hierarchy
*/
$form['filter_heading'] = array(
'#markup' => '<h3 class="filter-heading">Filter</h3>',
'#weight' => -10,
);
$form['filter_search_heading'] = array(
'#markup' => '<h3 class="filter-heading search-heading">Search</h3>',
'#weight' => 4,
);
$form['spacer'] = array(
'#markup' => '<div class="filter-spacer"></div>',
'#weight' => 1.5,
);
/*
* setting up weights for form elements
*/
$form['field_evt_date_range_value']['#weight'] = 1;
$form['field_evt_taxonomy_target_id_1']['#weight'] = 2;
$form['field_evt_taxonomy_target_id']['#weight'] = 3;
$form['keys']['#weight'] = 5;
$form['keys']['#attributes']['placeholder'] = t('Search Keywords');
/*
* checking if taxonomy has vocabulary - if not, don't display field
*/
if(count($form['field_evt_taxonomy_target_id']['#options']) == 1) {
$form['field_evt_taxonomy_target_id']['#access'] = FALSE;
}
if(count($form['field_evt_taxonomy_target_id_1']['#options']) == 1) {
$form['field_evt_taxonomy_target_id_1']['#access'] = FALSE;
}
}
}
web/themes/asc_bootstrap/assets/sass/components/_filters.scss
+ 2
− 2
View file @ d62a39b0
......@@ -15,7 +15,7 @@
padding: 10px 20px;
}
.evt-filter-heading {
.filter-heading {
color: #225D62;
width: 100%;
}
......@@ -84,7 +84,7 @@
padding: 10px;
}
.news-filter-heading {
.filter-heading {
color: #225D62;
width: 100%;
}
......
web/themes/asc_bootstrap/assets/sass/components/_paragraphs.scss
+ 31
− 12
View file @ d62a39b0
......@@ -28,7 +28,6 @@
.paragraph__column {
width: $full;
float: left;
padding: 20px 0;
.col-l {
padding-left: 0;
......@@ -142,6 +141,10 @@
.btn-par {
font-weight: 600;
text-transform: uppercase;
.fa-angle-right {
margin-left: 10px;
}
}
......@@ -234,12 +237,17 @@
width: 25%;
margin: 0 10px;
background: $brand-red;
padding: 10px;
display: inline-block;
color: $white;
text-transform: uppercase;
border: 0;
border-radius: 0;
padding: 5px;
.btn-primary {
background-color: transparent;
border-color: transparent;
border: 0;
border-radius: 0;
}
svg, i {
padding-top: 1px;
......@@ -252,7 +260,7 @@
@media (max-width: 768px) {
display: block;
width: 100%;
margin: 10px 0;
margin: 0;
font-weight: 700;
}
}
......@@ -267,12 +275,17 @@
width: 40%;
margin: 0 10px;
background: $brand-red;
padding: 10px;
display: inline-block;
color: $white;
text-transform: uppercase;
border: 0;
border-radius: 0;
padding: 5px;
.btn-primary {
background-color: transparent;
border-color: transparent;
border: 0;
border-radius: 0;
}
svg, i {
padding-top: 1px;
......@@ -285,7 +298,7 @@
@media (max-width: 768px) {
display: block;
width: 100%;
margin: 10px 0;
margin: 0;
font-weight: 700;
}
}
......@@ -300,12 +313,17 @@
width: 50%;
margin: 0 10px;
background: $brand-red;
padding: 10px;
display: inline-block;
color: $white;
text-transform: uppercase;
border: 0;
border-radius: 0;
padding: 5px;
.btn-primary {
background-color: transparent;
border-color: transparent;
border: 0;
border-radius: 0;
}
svg, i {
padding-top: 1px;
......@@ -318,6 +336,7 @@
@media (max-width: 768px) {
display: block;
width: 100%;
margin: 0;
font-weight: 700;
}
}
......
web/themes/asc_bootstrap/assets/sass/layout/_aside.scss
+ 16
− 11
View file @ d62a39b0
......@@ -32,17 +32,22 @@ aside {
ul {
width: $full;
.menu {
position: relative;
background-color: transparent;
z-index: 0;
display: block;
float: none;
border: 0;
border-radius: 0;
-webkit-box-shadow: none;
box-shadow: none;
}
.menu {
position: relative;
background-color: transparent;
z-index: 0;
display: block;
float: none;
border: 0;
border-radius: 0;
-webkit-box-shadow: none;
box-shadow: none;
}
li {
width: $full;
}
}
}
}
......
web/themes/asc_bootstrap/assets/sass/layout/_default.scss
+ 9
− 0
View file @ d62a39b0
......@@ -229,3 +229,12 @@ h5, h6 {
#contact-message-feedback-form {
margin-bottom: 20px;
}
// --------------------------------------------------
//## User login form.
.user-login-form {
margin-bottom: 40px;
}
web/themes/asc_bootstrap/assets/sass/layout/_section-background-colors.scss
+ 165
− 0
View file @ d62a39b0
......@@ -12,6 +12,10 @@
background-color: #1B494C;
}
.transparent-bg {
padding: 20px 0;
}
// --------------------------------------------------
// Light Colors
......@@ -20,6 +24,11 @@
.lgray-bg {
background-color: #f5f5f5;
color: $black-base;
padding: 20px 15px;
.panel {
background-color: transparent;
}
.paragraph--type--tabs a:hover {
color: $gray;
......@@ -33,6 +42,11 @@
.lblue-bg {
background-color: #e9eff7;
color: $black-base;
padding: 20px 15px;
.panel {
background-color: transparent;
}
.paragraph--type--tabs a:hover {
color: $gray;
......@@ -46,6 +60,11 @@
.lviolet-bg {
background-color: #f3e9ef;
color: $black-base;
padding: 20px 15px;
.panel {
background-color: transparent;
}
.paragraph--type--tabs a:hover {
color: $gray;
......@@ -59,6 +78,11 @@
.ltaupe-bg {
background-color: #f5f5ee;
color: $black-base;
padding: 20px 15px;
.panel {
background-color: transparent;
}
.paragraph--type--tabs a:hover {
color: $gray;
......@@ -72,6 +96,11 @@
.lturquoise-bg {
background-color: #f1f8f7;
color: $black-base;
padding: 20px 15px;
.panel {
background-color: transparent;
}
.paragraph--type--tabs a:hover {
color: $gray;
......@@ -85,6 +114,11 @@
.lteal-bg {
background-color: #eaf0f1;
color: $black-base;
padding: 20px 15px;
.panel {
background-color: transparent;
}
.paragraph--type--tabs a:hover {
color: $gray;
......@@ -98,6 +132,11 @@
.lyellow-bg {
background-color: #f6f9da;
color: $black-base;
padding: 20px 15px;
.panel {
background-color: transparent;
}
.paragraph--type--tabs a:hover {
color: $gray;
......@@ -116,6 +155,7 @@
.dgray-bg {
background-color: $brand-gray;
color: $white;
padding: 20px 15px;
p {
color: $white;
......@@ -125,6 +165,23 @@
color: $white;
}
.tab-header {
color: $white;
}
.accordion-header {
color: $white;
}
.panel {
background-color: transparent;
}
.field--name-field-pull-quote {
border-top-color: $white;
border-bottom-color: $white;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......@@ -137,6 +194,7 @@
.dscarlet-bg {
background-color: #830000;
color: $white;
padding: 20px 15px;
p {
color: $white;
......@@ -146,6 +204,23 @@
color: $white;
}
.tab-header {
color: $white;
}
.accordion-header {
color: $white;
}
.panel {
background-color: transparent;
}
.field--name-field-pull-quote {
border-top-color: $white;
border-bottom-color: $white;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......@@ -158,6 +233,7 @@
.dviolet-bg {
background-color: #5d1542;
color: $white;
padding: 20px 15px;
p {
color: $white;
......@@ -167,6 +243,23 @@
color: $white;
}
.tab-header {
color: $white;
}
.accordion-header {
color: $white;
}
.panel {
background-color: transparent;
}
.field--name-field-pull-quote {
border-top-color: $white;
border-bottom-color: $white;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......@@ -179,6 +272,7 @@
.dteal-bg {
background-color: #1b494c;
color: $white;
padding: 20px 15px;
p {
color: $white;
......@@ -188,6 +282,23 @@
color: $white;
}
.tab-header {
color: $white;
}
.accordion-header {
color: $white;
}
.panel {
background-color: transparent;
}
.field--name-field-pull-quote {
border-top-color: $white;
border-bottom-color: $white;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......@@ -200,6 +311,7 @@
.dpurple-bg {
background-color: #442369;
color: $white;
padding: 20px 15px;
p {
color: $white;
......@@ -209,6 +321,23 @@
color: $white;
}
.tab-header {
color: $white;
}
.accordion-header {
color: $white;
}
.panel {
background-color: transparent;
}
.field--name-field-pull-quote {
border-top-color: $white;
border-bottom-color: $white;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......@@ -221,6 +350,7 @@
.dgreen-bg {
background-color: #565b22;
color: $white;
padding: 20px 15px;
p {
color: $white;
......@@ -230,6 +360,23 @@
color: $white;
}
.tab-header {
color: $white;
}
.accordion-header {
color: $white;
}
.panel {
background-color: transparent;
}
.field--name-field-pull-quote {
border-top-color: $white;
border-bottom-color: $white;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......@@ -242,6 +389,7 @@
.dorange-bg {
background-color: #953d1c;
color: $white;
padding: 20px 15px;
p {
color: $white;
......@@ -251,6 +399,23 @@
color: $white;
}
.tab-header {
color: $white;
}
.accordion-header {
color: $white;
}
.panel {
background-color: transparent;
}
.field--name-field-pull-quote {
border-top-color: $white;
border-bottom-color: $white;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......
web/themes/asc_bootstrap/css/style.css
+ 307
− 113
View file @ d62a39b0
This diff is collapsed.
web/themes/asc_bootstrap/js/scripts.js
+ 1
− 16
View file @ d62a39b0
......@@ -98,20 +98,5 @@ jQuery(document).ready(function(){
jQuery('#header-logos-mobile .dep-logo img').replaceWith('<img src="/themes/asc_bootstrap/images/logos/demo-logos/department-logo-mobile.svg"/>');
});
//filters
if((jQuery('.view-events')[0])) {
jQuery('.form-item-keys').before('<h3 class="evt-filter-heading evt-search-heading">Search</h3>');
jQuery(".form-item-keys .form-control").attr("placeholder", "Search Keywords");
jQuery('#views-exposed-form-events-page-1').before('<h3 class="evt-filter-heading">Filter</h3>');
jQuery('.form-item-field-evt-date-range-value').after('<div class="filter-spacer"></div>');
}
if((jQuery('.view-news')[0])) {
jQuery('.form-item-keys').before('<h3 class="news-filter-heading news-search-heading">Search</h3>');
jQuery(".form-item-keys .form-control").attr("placeholder", "Search Keywords");
jQuery('#views-exposed-form-news-page-1').before('<h3 class="news-filter-heading">Filter</h3>');
jQuery('.form-item-created-1').after('<div class="filter-spacer"></div>');
}
});
web/themes/asc_bootstrap/templates/paragraph/paragraph--button.html.twig
+ 2
− 2
View file @ d62a39b0
......@@ -36,9 +36,9 @@
*/
#}
{% if content.field_button.0 %}
<a href="{{ content.field_button[0]['#url'] }}" title="{{ content.field_button.0['#title'] }}">
<a href="{{ content.field_button[0]['#url'] }}" title="{{ content.field_button.0['#title'] }}" class="btn-wrapper">
<div class="btn-wrapper btn btn-primary btn-par">
<div class="btn btn-primary btn-par">
{{ content.field_button.0['#title'] }} <i class="fa fa-angle-right"></i>
</div>
......
web/themes/asc_bootstrap/templates/paragraph/paragraph--column_one.html.twig
+ 4
− 0
View file @ d62a39b0
......@@ -40,6 +40,10 @@
{# Setting up variable that determines the background color for section #}
{% set bgcolor = content.field_background_color['#items'].getString() %}
{% if bgcolor == ''%}
{% set bgcolor = 'transparent-bg' %}
{% endif %}
{# Prints div with classes, and content without Width and Background. #}
<div{{ attributes.addClass(classes) }}>
......
web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_three.html.twig
+ 3
− 0
View file @ d62a39b0
......@@ -75,6 +75,9 @@
{# Setting up variable that determines the background color for section #}
{% set bgcolor = content.field_background_color['#items'].getString() %}
{% if bgcolor == ''%}
{% set bgcolor = 'transparent-bg' %}
{% endif %}
{# Prints div with classes, and content without Width and Background. #}
<div{{ attributes.addClass(classes) }}>
......
web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_two.html.twig
+ 3
− 0
View file @ d62a39b0
......@@ -67,6 +67,9 @@
{# Setting up variable that determines the background color for section #}
{% set bgcolor = content.field_background_color['#items'].getString() %}
{% if bgcolor == ''%}
{% set bgcolor = 'transparent-bg' %}
{% endif %}
{# Prints div with classes, and content without Width and Background. #}
<div{{ attributes.addClass(classes) }}>
......
web/themes/asc_bootstrap/templates/views/views-view-summary-unformatted.html.twig
+ 1
− 1
View file @ d62a39b0
......@@ -19,7 +19,7 @@
*/
#}
{% set counter = 1 %}
{% set counter = 0 %}
{% set max = rows|length %}
<span class="upper">
......
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