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

Merge pull request #191 from ASCWebServices/canini 

research gallery and style updates
parents 3e0ca2d5 63c4811e
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 301 additions and 155 deletions
web/themes/asc_bootstrap/asc_bootstrap.info.yml
+ 1
− 0
View file @ e13536b7
......@@ -12,6 +12,7 @@ regions:
content: 'Content'
events: 'Events'
news: 'News'
research: 'Research Projects'
people: 'People'
sidebar_menu: 'Sidebar Menu'
sidebar_second: 'Right Sidebar'
......
web/themes/asc_bootstrap/asc_bootstrap.theme
+ 24
− 6
View file @ e13536b7
......@@ -72,12 +72,6 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $
if (
($form['#id'] == 'views-exposed-form-events-page-1')
|| ($form['#id'] == 'views-exposed-form-news-page-1')
|| ($form['#id'] == 'views-exposed-form-research-project-directory-page-1')
|| ($form['#id'] == 'views-exposed-form-research-project-gallery-page-1')
|| ($form['#id'] == 'views-exposed-form-research-project-directory-mobile-page-1')
|| ($form['#id'] == 'views-exposed-form-research-project-directory-block-1')
|| ($form['#id'] == 'views-exposed-form-research-project-gallery-block-1')
|| ($form['#id'] == 'views-exposed-form-research-project-directory-mobile-block-1')
) {
/*
* add new HTML content to filters (headers and spacer)
......@@ -107,6 +101,30 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $
$form['keys']['#weight'] = 5;
$form['keys']['#attributes']['placeholder'] = t('Search Keywords');
}
/*
* research filters
*/
if (
($form['#id'] == 'views-exposed-form-research-project-directory-page-1')
|| ($form['#id'] == 'views-exposed-form-research-project-gallery-page-1')
|| ($form['#id'] == 'views-exposed-form-research-project-directory-mobile-page-1')
|| ($form['#id'] == 'views-exposed-form-research-project-directory-block-1')
|| ($form['#id'] == 'views-exposed-form-research-project-gallery-block-1')
|| ($form['#id'] == 'views-exposed-form-research-project-directory-mobile-block-1')
) {
$form['spacer'] = array(
'#markup' => '<div class="filter-spacer"></div>',
'#weight' => 1.5,
);
/*
* setting up weights for form elements
*/
$form['keys']['#weight'] = 5;
$form['keys']['#attributes']['placeholder'] = t('Search Keywords');
}
/*
* checking if taxonomy has vocabulary - if not, don't display field
*/
......
web/themes/asc_bootstrap/assets/sass/components/_filters.scss
+ 57
− 5
View file @ e13536b7
......@@ -317,15 +317,67 @@
display: none;
}
.form-inline {
.select-wrapper {
.view-filters {
background: #D8D8D8;
padding: 20px 15px 15px;
}
.filter-heading {
color: #225D62;
width: 100%;
}
.filter-spacer {
width: 100%;
margin-top: 15px;
}
.select-wrapper {
margin-right: 10px;
select {
min-width: 250px;
@media (max-width: 1200px) {
margin-top: 10px;
min-width: 273px;
}
@media (max-width: 768px) {
margin-top: 0;
min-width: 0;
}
}
&:after {
color: #555555;
font-size: 12px;
}
@media (max-width: 768px) {
width: 100%;
}
}
.select-wrapper:after {
color: #555555;
font-size: 12px;
.form-type-textfield {
margin-right: 10px;
input {
min-width: 250px;
}
@media (max-width: 768px) {
width: 100%;
}
}
.form-actions {
min-width: 50%;
.button {
text-transform: uppercase;
border-radius: 0;
}
}
}
web/themes/asc_bootstrap/assets/sass/components/_research.scss
+ 10
− 18
View file @ e13536b7
......@@ -19,6 +19,15 @@
overflow: hidden;
}
}
#views-bootstrap-research-project-gallery-block-1 {
margin-bottom: 80px;
.row {
display: flex;
margin-bottom: 40px;
}
}
}
.view-research-project-directory {
......@@ -39,6 +48,7 @@
}
}
// --------------------------------------------------
//## Research Article.
......@@ -98,24 +108,6 @@
// --------------------------------------------------
//## Research Project Gallery.
.view-research-project-gallery {
.row {
margin-bottom: 40px;
}
.form-actions {
.button {
text-transform: uppercase;
border-radius: 0;
}
}
.view-filters {
background: #D8D8D8;
padding: 10px;
}
}
.page-node-type-research-project-gallery {
......
web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss
+ 6
− 4
View file @ e13536b7
......@@ -4,16 +4,14 @@
aside {
.dropdown-menu {
z-index: 20;
}
.sidebar-nav {
width: 100%;
li {
border-top: 1px #979797 dotted;
line-height: 1.15;
float: left;
width: 100%;
.link-wrapper {
padding: 8px 0;
......@@ -130,6 +128,10 @@ aside {
}
.dropdown-menu {
z-index: 20;
}
.nav > li > a:hover, .nav > li > a:focus {
background-color: transparent;
}
......
web/themes/asc_bootstrap/assets/sass/layout/_header.scss
+ 0
− 8
View file @ e13536b7
......@@ -156,11 +156,3 @@
}
}
// --------------------------------------------------
//## Mobile Nav.
#main-nav-toggle {
display: none;
}
web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss
+ 2
− 1
View file @ e13536b7
......@@ -150,7 +150,8 @@
}
}
.view-display-id-block_1 {
.view-display-id-block_1,
.view-display-id-block_2 {
.view-header {
text-transform: uppercase;
float: left;
......
web/themes/asc_bootstrap/css/style.css
+ 181
− 110
View file @ e13536b7
This diff is collapsed.
web/themes/asc_bootstrap/js/scripts.js
+ 4
− 0
View file @ e13536b7
......@@ -14,6 +14,10 @@ jQuery(document).ready(function(){
jQuery(".page-node-type-newsletter-article .main-container aside").css({'min-height':(jQuery(".page-node-type-newsletter-article .main-container section").height()+'px')});
}
if(jQuery(".page-node-type-research .main-container section").height() > jQuery(".page-node-type-research aside").height()) {
jQuery(".page-node-type-research .main-container aside").css({'min-height':(jQuery(".page-node-type-research .main-container section").height()+'px')});
}
//show/hide decription for accessibility menu
jQuery("#superfish-main > li:first-child").focusin(function(){
jQuery("#main-nav-menubar-instructions").css("display", "block");
......
web/themes/asc_bootstrap/templates/node/node--research.html.twig
+ 3
− 3
View file @ e13536b7
......@@ -104,11 +104,11 @@
</div>
</div>
<div class="col-sm-4 col-sm-push-8 research-img">
{# <div class="col-sm-4 col-sm-push-8 research-img">
{{ content.field_research_image }}
</div>
</div> #}
<div{{ content_attributes.addClass('content') }}>
<div class="col-sm-8 col-sm-pull-4 research-cont">
<div class="col-sm-12 research-cont">
{% if (content.field_research_user.0 != '') or (content.field_research_additional.0 != '') %}
<div class="research-users">
<h2>Investigators:</h2>
......
web/themes/asc_bootstrap/templates/system/page--front.html.twig
+ 2
− 0
View file @ e13536b7
......@@ -33,6 +33,7 @@
* - page.content: 'Content'
* - page.events: 'Events'
* - page.news: 'News'
* - page.research: 'Research Projects'
* - page.people: 'People'
* - page.sidebar_first: 'Left Siderbar'
* - page.sidebar_second: 'Right Siderbar'
......@@ -65,6 +66,7 @@
<div class="block-wrapper">
{{ page.events }}
{{ page.news }}
{{ page.research }}
{{ page.people }}
</div>
</div>{# /.layout-content #}
......
web/themes/asc_bootstrap/templates/system/page--landing-page.html.twig
+ 2
− 0
View file @ e13536b7
......@@ -33,6 +33,7 @@
* - page.content: 'Content'
* - page.events: 'Events'
* - page.news: 'News'
* - page.research: 'Research Projects'
* - page.people: 'People'
* - page.sidebar_first: 'Left Siderbar'
* - page.sidebar_second: 'Right Siderbar'
......@@ -76,6 +77,7 @@
<div class="block-wrapper">
{{ page.events }}
{{ page.news }}
{{ page.research }}
{{ page.people }}
</div>
</div>{# /.layout-content #}
......
web/themes/asc_bootstrap/templates/system/page.html.twig
+ 9
− 0
View file @ e13536b7
......@@ -33,6 +33,7 @@
* - page.content: 'Content'
* - page.events: 'Events'
* - page.news: 'News'
* - page.research: 'Research Projects'
* - page.people: 'People'
* - page.sidebar_first: 'Left Siderbar'
* - page.sidebar_second: 'Right Siderbar'
......@@ -111,6 +112,14 @@
{% endblock %}
{% endif %}
{# Research #}
{% if research %}
{% block research %}
<a id="main-research"></a>
{{ page.research }}
{% endblock %}
{% endif %}
{# People #}
{% if people %}
{% block people %}
......
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