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
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
......@@ -9466,11 +9466,6 @@ h6 {
}
}
/* line 164, ../assets/sass/layout/_header.scss */
#main-nav-toggle {
display: none;
}
/* line 11, ../assets/sass/layout/_section-background-colors.scss */
.default-bg {
background-color: #1B494C;
......@@ -10624,15 +10619,77 @@ article .field--name-body {
.view-research-project-gallery .control-label {
display: none;
}
/* line 321, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .form-inline .select-wrapper {
/* line 320, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .view-filters {
background: #D8D8D8;
padding: 20px 15px 15px;
}
/* line 325, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .filter-heading {
color: #225D62;
width: 100%;
}
/* line 326, ../assets/sass/components/_filters.scss */
/* line 330, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .filter-spacer {
width: 100%;
margin-top: 15px;
}
/* line 335, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .select-wrapper {
margin-right: 10px;
}
/* line 338, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .select-wrapper select {
min-width: 250px;
}
@media (max-width: 1200px) {
/* line 338, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .select-wrapper select {
margin-top: 10px;
min-width: 273px;
}
}
@media (max-width: 768px) {
/* line 338, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .select-wrapper select {
margin-top: 0;
min-width: 0;
}
}
/* line 352, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .select-wrapper:after {
color: #555555;
font-size: 12px;
}
@media (max-width: 768px) {
/* line 335, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .select-wrapper {
width: 100%;
}
}
/* line 362, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .form-type-textfield {
margin-right: 10px;
}
/* line 365, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .form-type-textfield input {
min-width: 250px;
}
@media (max-width: 768px) {
/* line 362, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .form-type-textfield {
width: 100%;
}
}
/* line 374, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .form-actions {
min-width: 50%;
}
/* line 377, ../assets/sass/components/_filters.scss */
.view-research-project-gallery .form-actions .button {
text-transform: uppercase;
border-radius: 0;
}
/* line 11, ../assets/sass/components/_gallery.scss */
.gallery .field--item {
......@@ -12143,122 +12200,116 @@ article.news-story {
height: 1px;
overflow: hidden;
}
/* line 23, ../assets/sass/components/_research.scss */
.page-node-type-research-landing-page #views-bootstrap-research-project-gallery-block-1 {
margin-bottom: 80px;
}
/* line 26, ../assets/sass/components/_research.scss */
.page-node-type-research-landing-page #views-bootstrap-research-project-gallery-block-1 .row {
display: flex;
margin-bottom: 40px;
}
/* line 28, ../assets/sass/components/_research.scss */
/* line 37, ../assets/sass/components/_research.scss */
.view-research-project-directory table .views-field-title {
width: 35%;
}
/* line 32, ../assets/sass/components/_research.scss */
/* line 41, ../assets/sass/components/_research.scss */
.view-research-project-directory table .views-field-field-research-year {
width: 10%;
}
@media (max-width: 992px) {
/* line 32, ../assets/sass/components/_research.scss */
/* line 41, ../assets/sass/components/_research.scss */
.view-research-project-directory table .views-field-field-research-year {
width: 15%;
}
}
/* line 48, ../assets/sass/components/_research.scss */
/* line 58, ../assets/sass/components/_research.scss */
.page-node-type-research article {
margin-bottom: 16px;
}
/* line 52, ../assets/sass/components/_research.scss */
/* line 62, ../assets/sass/components/_research.scss */
.page-node-type-research .page-header {
display: none;
}
/* line 56, ../assets/sass/components/_research.scss */
/* line 66, ../assets/sass/components/_research.scss */
.page-node-type-research .research-title-wrapper {
padding-left: 0;
}
/* line 60, ../assets/sass/components/_research.scss */
/* line 70, ../assets/sass/components/_research.scss */
.page-node-type-research .research-cont {
padding-left: 0;
}
/* line 63, ../assets/sass/components/_research.scss */
/* line 73, ../assets/sass/components/_research.scss */
.page-node-type-research .research-cont .field--name-field-research-body {
margin: 20px 0 40px;
}
/* line 68, ../assets/sass/components/_research.scss */
/* line 78, ../assets/sass/components/_research.scss */
.page-node-type-research .research-users {
margin-bottom: 15px;
}
/* line 71, ../assets/sass/components/_research.scss */
/* line 81, ../assets/sass/components/_research.scss */
.page-node-type-research .research-users h2 {
line-height: 0;
font-size: 18px;
}
/* line 77, ../assets/sass/components/_research.scss */
/* line 87, ../assets/sass/components/_research.scss */
.page-node-type-research .taxonomy-research-heading {
width: 100%;
padding-top: 15px;
}
/* line 81, ../assets/sass/components/_research.scss */
/* line 91, ../assets/sass/components/_research.scss */
.page-node-type-research .taxonomy-research-heading h3 {
line-height: 0;
font-size: 18px;
}
/* line 91, ../assets/sass/components/_research.scss */
/* line 101, ../assets/sass/components/_research.scss */
.research .field--name-field-research-body {
margin-bottom: 20px;
}
/* line 103, ../assets/sass/components/_research.scss */
.view-research-project-gallery .row {
margin-bottom: 40px;
}
/* line 108, ../assets/sass/components/_research.scss */
.view-research-project-gallery .form-actions .button {
text-transform: uppercase;
border-radius: 0;
}
/* line 114, ../assets/sass/components/_research.scss */
.view-research-project-gallery .view-filters {
background: #D8D8D8;
padding: 10px;
}
/* line 122, ../assets/sass/components/_research.scss */
.page-node-type-research-project-gallery article {
margin-bottom: 16px;
}
/* line 126, ../assets/sass/components/_research.scss */
/* line 118, ../assets/sass/components/_research.scss */
.page-node-type-research-project-gallery .page-header {
display: none;
}
/* line 130, ../assets/sass/components/_research.scss */
/* line 122, ../assets/sass/components/_research.scss */
.page-node-type-research-project-gallery .rgall-title-wrapper {
padding-left: 0;
}
/* line 134, ../assets/sass/components/_research.scss */
/* line 126, ../assets/sass/components/_research.scss */
.page-node-type-research-project-gallery .rgall-cont {
padding-left: 0;
}
/* line 137, ../assets/sass/components/_research.scss */
/* line 129, ../assets/sass/components/_research.scss */
.page-node-type-research-project-gallery .rgall-cont .field--name-body {
margin: 20px 0 40px;
}
/* line 149, ../assets/sass/components/_research.scss */
/* line 141, ../assets/sass/components/_research.scss */
.taxonomy-rgall-heading {
float: left;
width: 100%;
padding-top: 15px;
}
/* line 154, ../assets/sass/components/_research.scss */
/* line 146, ../assets/sass/components/_research.scss */
.taxonomy-rgall-heading h2 {
line-height: 0;
font-size: 18px;
}
/* line 160, ../assets/sass/components/_research.scss */
/* line 152, ../assets/sass/components/_research.scss */
.taxonomy-research-heading {
float: left;
width: 100%;
padding-top: 15px;
}
/* line 165, ../assets/sass/components/_research.scss */
/* line 157, ../assets/sass/components/_research.scss */
.taxonomy-research-heading h2 {
line-height: 0;
font-size: 18px;
......@@ -12401,31 +12452,29 @@ body {
}
/* line 7, ../assets/sass/components/_sidebar-menu.scss */
aside .dropdown-menu {
z-index: 20;
}
/* line 11, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav {
width: 100%;
}
/* line 14, ../assets/sass/components/_sidebar-menu.scss */
/* line 10, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav li {
border-top: 1px #979797 dotted;
line-height: 1.15;
float: left;
width: 100%;
}
/* line 18, ../assets/sass/components/_sidebar-menu.scss */
/* line 16, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav li .link-wrapper {
padding: 8px 0;
}
/* line 22, ../assets/sass/components/_sidebar-menu.scss */
/* line 20, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav li .active-link {
padding-left: 5px;
}
/* line 26, ../assets/sass/components/_sidebar-menu.scss */
/* line 24, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav li a {
display: inline;
}
/* line 32, ../assets/sass/components/_sidebar-menu.scss */
/* line 30, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav ul {
display: none;
position: inherit;
......@@ -12435,106 +12484,110 @@ aside .sidebar-nav ul {
padding: 0;
list-style-type: none;
}
/* line 43, ../assets/sass/components/_sidebar-menu.scss */
/* line 41, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav ul li .link-wrapper {
padding-left: 17px;
}
/* line 47, ../assets/sass/components/_sidebar-menu.scss */
/* line 45, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav ul li a {
color: #000000;
}
/* line 51, ../assets/sass/components/_sidebar-menu.scss */
/* line 49, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav ul li i {
padding: 0 10px;
}
/* line 57, ../assets/sass/components/_sidebar-menu.scss */
/* line 55, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav ul li li .link-wrapper {
padding-left: 27px;
}
/* line 63, ../assets/sass/components/_sidebar-menu.scss */
/* line 61, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav ul li li li .link-wrapper {
padding-left: 37px;
}
/* line 69, ../assets/sass/components/_sidebar-menu.scss */
/* line 67, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav ul li li li li .link-wrapper {
padding-left: 47px;
}
/* line 75, ../assets/sass/components/_sidebar-menu.scss */
/* line 73, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav ul li li li li li .link-wrapper {
padding-left: 57px;
}
/* line 81, ../assets/sass/components/_sidebar-menu.scss */
/* line 79, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav ul li li li li li li .link-wrapper {
padding-left: 67px;
}
/* line 94, ../assets/sass/components/_sidebar-menu.scss */
/* line 92, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav .active-trail ul {
display: inherit;
}
/* line 97, ../assets/sass/components/_sidebar-menu.scss */
/* line 95, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav .active-trail ul .sidebar-nav {
display: none;
}
/* line 101, ../assets/sass/components/_sidebar-menu.scss */
/* line 99, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav .active-trail ul .active-link-ul {
display: block;
}
/* line 105, ../assets/sass/components/_sidebar-menu.scss */
/* line 103, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav .active-trail ul .parent-active-link-ul {
display: block;
}
/* line 111, ../assets/sass/components/_sidebar-menu.scss */
/* line 109, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav .active-trail .active-link-li ul {
display: block;
}
/* line 114, ../assets/sass/components/_sidebar-menu.scss */
/* line 112, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav .active-trail .active-link-li ul ul {
display: none;
}
/* line 121, ../assets/sass/components/_sidebar-menu.scss */
/* line 119, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav i {
float: right;
padding: 2px 10px;
cursor: pointer;
}
/* line 127, ../assets/sass/components/_sidebar-menu.scss */
/* line 125, ../assets/sass/components/_sidebar-menu.scss */
aside .sidebar-nav:nth-last-child(1) {
border-top: none;
}
/* line 133, ../assets/sass/components/_sidebar-menu.scss */
/* line 131, ../assets/sass/components/_sidebar-menu.scss */
aside .dropdown-menu {
z-index: 20;
}
/* line 135, ../assets/sass/components/_sidebar-menu.scss */
aside .nav > li > a:hover, aside .nav > li > a:focus {
background-color: transparent;
}
/* line 137, ../assets/sass/components/_sidebar-menu.scss */
/* line 139, ../assets/sass/components/_sidebar-menu.scss */
aside .active-link {
background-color: #ffffff;
border-left: solid #D0021B 3px;
padding-left: 5px;
margin-left: -8px;
}
/* line 145, ../assets/sass/components/_sidebar-menu.scss */
/* line 147, ../assets/sass/components/_sidebar-menu.scss */
aside ul .active-link {
margin-left: -5px;
}
/* line 150, ../assets/sass/components/_sidebar-menu.scss */
/* line 152, ../assets/sass/components/_sidebar-menu.scss */
aside ul ul .active-link {
margin-left: -2px;
}
/* line 155, ../assets/sass/components/_sidebar-menu.scss */
/* line 157, ../assets/sass/components/_sidebar-menu.scss */
aside ul ul ul .active-link {
margin-left: 0;
}
/* line 163, ../assets/sass/components/_sidebar-menu.scss */
/* line 165, ../assets/sass/components/_sidebar-menu.scss */
aside h2.active-link {
background-color: transparent;
border-left: none;
padding-left: 0;
}
/* line 171, ../assets/sass/components/_sidebar-menu.scss */
/* line 173, ../assets/sass/components/_sidebar-menu.scss */
aside h2 a {
color: #000000;
}
/* line 176, ../assets/sass/components/_sidebar-menu.scss */
/* line 178, ../assets/sass/components/_sidebar-menu.scss */
aside .nav {
border-bottom: 1px #979797 dotted;
}
......@@ -12546,7 +12599,7 @@ aside .nav {
}
@media (max-width: 768px) {
/* line 186, ../assets/sass/components/_sidebar-menu.scss */
/* line 188, ../assets/sass/components/_sidebar-menu.scss */
.region-sidebar-menu {
display: none;
}
......@@ -12927,8 +12980,9 @@ article.page {
background: #F5F5F5;
}
/* line 154, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header {
/* line 155, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header,
.view-display-id-block_2 .view-header {
text-transform: uppercase;
float: left;
width: 100%;
......@@ -12936,49 +12990,60 @@ article.page {
padding-bottom: 0;
border-bottom: 1px solid #979797;
}
/* line 162, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-re-news {
/* line 163, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-re-news,
.view-display-id-block_2 .view-header .txt-re-news {
text-align: left;
padding: 0;
}
/* line 166, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-re-news h2 {
/* line 167, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-re-news h2,
.view-display-id-block_2 .view-header .txt-re-news h2 {
color: #851E5E;
font-size: 22px;
}
/* line 172, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-more-news-head {
/* line 173, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-more-news-head,
.view-display-id-block_2 .view-header .txt-more-news-head {
text-align: right;
padding: 0;
}
/* line 176, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-more-news-head h3, .view-display-id-block_1 .view-header .txt-more-news-head a {
/* line 177, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-more-news-head h3, .view-display-id-block_1 .view-header .txt-more-news-head a,
.view-display-id-block_2 .view-header .txt-more-news-head h3,
.view-display-id-block_2 .view-header .txt-more-news-head a {
color: #851E5E;
font-size: 22px;
}
/* line 180, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-more-news-head h3 svg, .view-display-id-block_1 .view-header .txt-more-news-head a svg {
/* line 181, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-more-news-head h3 svg, .view-display-id-block_1 .view-header .txt-more-news-head a svg,
.view-display-id-block_2 .view-header .txt-more-news-head h3 svg,
.view-display-id-block_2 .view-header .txt-more-news-head a svg {
font-size: 20px;
}
@media (max-width: 768px) {
/* line 172, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-more-news-head {
/* line 173, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-more-news-head,
.view-display-id-block_2 .view-header .txt-more-news-head {
display: none;
}
}
/* line 191, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-content {
/* line 192, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-content,
.view-display-id-block_2 .view-content {
float: left;
width: 100%;
}
@media (max-width: 768px) {
/* line 196, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-content .row {
/* line 197, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-content .row,
.view-display-id-block_2 .view-content .row {
margin-bottom: 0;
}
}
/* line 202, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer {
/* line 203, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer,
.view-display-id-block_2 .view-footer {
text-transform: uppercase;
float: left;
width: 100%;
......@@ -12986,43 +13051,49 @@ article.page {
border-bottom: 1px solid #979797;
display: none;
}
/* line 210, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer .txt-more-news-foot {
/* line 211, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer .txt-more-news-foot,
.view-display-id-block_2 .view-footer .txt-more-news-foot {
text-align: right;
padding: 0;
}
/* line 214, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer .txt-more-news-foot h3, .view-display-id-block_1 .view-footer .txt-more-news-foot a {
/* line 215, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer .txt-more-news-foot h3, .view-display-id-block_1 .view-footer .txt-more-news-foot a,
.view-display-id-block_2 .view-footer .txt-more-news-foot h3,
.view-display-id-block_2 .view-footer .txt-more-news-foot a {
color: #851E5E;
font-size: 22px;
}
/* line 218, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer .txt-more-news-foot h3 svg, .view-display-id-block_1 .view-footer .txt-more-news-foot a svg {
/* line 219, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer .txt-more-news-foot h3 svg, .view-display-id-block_1 .view-footer .txt-more-news-foot a svg,
.view-display-id-block_2 .view-footer .txt-more-news-foot h3 svg,
.view-display-id-block_2 .view-footer .txt-more-news-foot a svg {
font-size: 20px;
}
@media (max-width: 768px) {
/* line 202, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer {
/* line 203, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer,
.view-display-id-block_2 .view-footer {
display: block;
}
}
/* line 233, ../assets/sass/pages/_landing-page.scss */
/* line 234, ../assets/sass/pages/_landing-page.scss */
#views-bootstrap-people-directory-block-1 .people-row .inner-people-grid {
background: #ffffff;
}
/* line 239, ../assets/sass/pages/_landing-page.scss */
/* line 240, ../assets/sass/pages/_landing-page.scss */
.views-field-field-evt-image .field--name-field-media-image {
padding-bottom: 0;
}
/* line 245, ../assets/sass/pages/_landing-page.scss */
/* line 246, ../assets/sass/pages/_landing-page.scss */
.views-field-field-news-image2 .field--name-field-media-image {
padding-bottom: 0;
}
/* line 251, ../assets/sass/pages/_landing-page.scss */
/* line 252, ../assets/sass/pages/_landing-page.scss */
.inner-people-grid .views-field-nothing-1 {
margin-bottom: 10px;
}
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