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

Merge pull request #65 from ASCWebServices/canini 

asc_bootstrap - adding people taxonomy to hook_form_alter, sass updat…
parents f64c9512 21cb8654
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
web/themes/asc_bootstrap/asc_bootstrap.theme
+ 10
− 0
View file @ cd2cc20d
......@@ -50,6 +50,7 @@ function asc_bootstrap_preprocess_paragraph(&$variables) {
function asc_bootstrap_preprocess_block(&$vars) {
$vars['site_mail'] = \Drupal::config('system.site')->get('mail');
$vars['site_name'] = \Drupal::config('system.site')->get('name');
}
/*
......@@ -107,4 +108,13 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $
$form['field_news_terms_1_target_id_1']['#access'] = FALSE;
}
}
if($form['#id'] == 'views-exposed-form-people-directory-page-1') {
if(count($form['field_appointment_target_id']['#options']) == 0) {
$form['field_appointment_target_id']['#access'] = FALSE;
}
if(count($form['field_research_interests_target_id']['#options']) == 0) {
$form['field_research_interests_target_id']['#access'] = FALSE;
}
}
}
web/themes/asc_bootstrap/assets/sass/layout/_default.scss
+ 5
− 12
View file @ cd2cc20d
/* General Demo Style */
@import url(https://fonts.googleapis.com/css?family=Lato:300,400,700);
@font-face {
font-family: 'fontawesome';
src:url('../fonts/fontawesome.eot');
src:url('../fonts/fontawesome.eot?#iefix') format('embedded-opentype'),
url('../fonts/fontawesome.svg#fontawesome') format('svg'),
url('../fonts/fontawesome.woff') format('woff'),
url('../fonts/fontawesome.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
body, html { font-size: 100%; padding: 0; margin: 0;}
/* Reset */
......@@ -233,8 +222,12 @@ h5, h6 {
// --------------------------------------------------
//## User login form.
//## User forms.
.user-login-form {
margin-bottom: 40px;
}
#user-form {
margin-bottom: 40px;
}
web/themes/asc_bootstrap/assets/sass/pages/_basic-page.scss
+ 5
− 0
View file @ cd2cc20d
......@@ -5,6 +5,11 @@
// Basic Page
// --------------------------------------------------
article.page {
margin-bottom: 20px;
}
//## Carousel.
.page-node-type-page .carousel {
......
web/themes/asc_bootstrap/css/style.css
+ 48
− 45
View file @ cd2cc20d
......@@ -8845,14 +8845,7 @@ aside .region-sidebar-menu nav ul li {
}
/* General Demo Style */
@font-face {
font-family: 'fontawesome';
src: url("../fonts/fontawesome.eot");
src: url("../fonts/fontawesome.eot?#iefix") format("embedded-opentype"), url("../fonts/fontawesome.svg#fontawesome") format("svg"), url("../fonts/fontawesome.woff") format("woff"), url("../fonts/fontawesome.ttf") format("truetype");
font-weight: normal;
font-style: normal;
}
/* line 15, ../assets/sass/layout/_default.scss */
/* line 4, ../assets/sass/layout/_default.scss */
body, html {
font-size: 100%;
padding: 0;
......@@ -8860,7 +8853,7 @@ body, html {
}
/* Reset */
/* line 18, ../assets/sass/layout/_default.scss */
/* line 7, ../assets/sass/layout/_default.scss */
*,
*:after,
*:before {
......@@ -8870,19 +8863,19 @@ body, html {
}
/* Clearfix hack by Nicolas Gallagher: http://nicolasgallagher.com/micro-clearfix-hack/ */
/* line 27, ../assets/sass/layout/_default.scss */
/* line 16, ../assets/sass/layout/_default.scss */
.clearfix:before,
.clearfix:after {
content: " ";
display: table;
}
/* line 33, ../assets/sass/layout/_default.scss */
/* line 22, ../assets/sass/layout/_default.scss */
.clearfix:after {
clear: both;
}
/* line 37, ../assets/sass/layout/_default.scss */
/* line 26, ../assets/sass/layout/_default.scss */
.container > header {
width: 90%;
max-width: 70em;
......@@ -8890,12 +8883,12 @@ body, html {
padding: 0 1.875em 3.125em 1.875em;
}
/* line 44, ../assets/sass/layout/_default.scss */
/* line 33, ../assets/sass/layout/_default.scss */
.container > header {
padding: 2.875em 1.875em 1.875em;
}
/* line 48, ../assets/sass/layout/_default.scss */
/* line 37, ../assets/sass/layout/_default.scss */
.container > header h1 {
font-size: 2.125em;
line-height: 1.3;
......@@ -8904,7 +8897,7 @@ body, html {
font-weight: 400;
}
/* line 56, ../assets/sass/layout/_default.scss */
/* line 45, ../assets/sass/layout/_default.scss */
.container > header span {
display: block;
font-weight: 700;
......@@ -8913,12 +8906,12 @@ body, html {
padding: 0 0 0.6em 0.1em;
}
/* line 64, ../assets/sass/layout/_default.scss */
/* line 53, ../assets/sass/layout/_default.scss */
.container > header nav {
float: right;
}
/* line 68, ../assets/sass/layout/_default.scss */
/* line 57, ../assets/sass/layout/_default.scss */
.container > header nav a {
display: block;
float: left;
......@@ -8933,7 +8926,7 @@ body, html {
text-indent: -8000px;
}
/* line 82, ../assets/sass/layout/_default.scss */
/* line 71, ../assets/sass/layout/_default.scss */
.container > header nav a:after {
content: attr(data-info);
color: #47a3da;
......@@ -8946,17 +8939,17 @@ body, html {
pointer-events: none;
}
/* line 94, ../assets/sass/layout/_default.scss */
/* line 83, ../assets/sass/layout/_default.scss */
.container > header nav a:hover:after {
opacity: 1;
}
/* line 98, ../assets/sass/layout/_default.scss */
/* line 87, ../assets/sass/layout/_default.scss */
.container > header nav a:hover {
background: #47a3da;
}
/* line 102, ../assets/sass/layout/_default.scss */
/* line 91, ../assets/sass/layout/_default.scss */
.icon-drop:before,
.icon-arrow-left:before {
font-family: 'fontawesome';
......@@ -8975,54 +8968,54 @@ body, html {
padding-left: 8px;
}
/* line 120, ../assets/sass/layout/_default.scss */
/* line 109, ../assets/sass/layout/_default.scss */
.container > header nav a:hover:before {
color: #fff;
}
/* line 124, ../assets/sass/layout/_default.scss */
/* line 113, ../assets/sass/layout/_default.scss */
.icon-drop:before {
content: "\e000";
}
/* line 128, ../assets/sass/layout/_default.scss */
/* line 117, ../assets/sass/layout/_default.scss */
.icon-arrow-left:before {
content: "\f060";
}
/* line 132, ../assets/sass/layout/_default.scss */
/* line 121, ../assets/sass/layout/_default.scss */
.img-responsive {
width: auto;
}
/* line 136, ../assets/sass/layout/_default.scss */
/* line 125, ../assets/sass/layout/_default.scss */
.hov {
cursor: pointer;
}
/* line 140, ../assets/sass/layout/_default.scss */
/* line 129, ../assets/sass/layout/_default.scss */
.upper {
text-transform: uppercase;
}
/* line 144, ../assets/sass/layout/_default.scss */
/* line 133, ../assets/sass/layout/_default.scss */
.mobile-only {
display: none;
}
@media (max-width: 768px) {
/* line 144, ../assets/sass/layout/_default.scss */
/* line 133, ../assets/sass/layout/_default.scss */
.mobile-only {
display: block;
}
}
/* line 157, ../assets/sass/layout/_default.scss */
/* line 146, ../assets/sass/layout/_default.scss */
p, a, ul, ol, li {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
/* line 162, ../assets/sass/layout/_default.scss */
/* line 151, ../assets/sass/layout/_default.scss */
p {
font-family: "proximanova", Helvetica, Arial, sans-serif;
font-weight: 400;
......@@ -9030,64 +9023,69 @@ p {
color: #666666;
}
/* line 174, ../assets/sass/layout/_default.scss */
/* line 163, ../assets/sass/layout/_default.scss */
h1, h2, h3, h4, h5, h6 {
margin: 11px 0;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
/* line 180, ../assets/sass/layout/_default.scss */
/* line 169, ../assets/sass/layout/_default.scss */
h1 {
font-weight: bold;
line-height: 33px;
}
/* line 185, ../assets/sass/layout/_default.scss */
/* line 174, ../assets/sass/layout/_default.scss */
h2 {
line-height: 26px;
}
/* line 189, ../assets/sass/layout/_default.scss */
/* line 178, ../assets/sass/layout/_default.scss */
h3 {
line-height: 22px;
}
/* line 193, ../assets/sass/layout/_default.scss */
/* line 182, ../assets/sass/layout/_default.scss */
h4 {
line-height: 17px;
}
/* line 197, ../assets/sass/layout/_default.scss */
/* line 186, ../assets/sass/layout/_default.scss */
h5, h6 {
line-height: 15px;
}
/* line 206, ../assets/sass/layout/_default.scss */
/* line 195, ../assets/sass/layout/_default.scss */
.field--name-field-media-image {
padding-bottom: 15px;
}
/* line 212, ../assets/sass/layout/_default.scss */
/* line 201, ../assets/sass/layout/_default.scss */
.align-left .field--name-field-media-image {
padding: 0 15px 0 0;
}
/* line 219, ../assets/sass/layout/_default.scss */
/* line 208, ../assets/sass/layout/_default.scss */
.align-right .field--name-field-media-image {
padding: 0 0 0 15px;
}
/* line 229, ../assets/sass/layout/_default.scss */
/* line 218, ../assets/sass/layout/_default.scss */
#contact-message-feedback-form {
margin-bottom: 20px;
}
/* line 238, ../assets/sass/layout/_default.scss */
/* line 227, ../assets/sass/layout/_default.scss */
.user-login-form {
margin-bottom: 40px;
}
/* line 231, ../assets/sass/layout/_default.scss */
#user-form {
margin-bottom: 40px;
}
/* line 8, ../assets/sass/layout/_footer.scss */
.footer {
background: #173E41;
......@@ -11359,17 +11357,22 @@ body {
display: flex;
}
/* line 10, ../assets/sass/pages/_basic-page.scss */
/* line 9, ../assets/sass/pages/_basic-page.scss */
article.page {
margin-bottom: 20px;
}
/* line 15, ../assets/sass/pages/_basic-page.scss */
.page-node-type-page .carousel {
height: auto;
overflow: hidden;
}
/* line 14, ../assets/sass/pages/_basic-page.scss */
/* line 19, ../assets/sass/pages/_basic-page.scss */
.page-node-type-page .carousel .field--name-field-media-image {
padding-bottom: 0;
}
@media (max-width: 1030px) {
/* line 10, ../assets/sass/pages/_basic-page.scss */
/* line 15, ../assets/sass/pages/_basic-page.scss */
.page-node-type-page .carousel {
height: auto;
}
......
web/themes/asc_bootstrap/templates/block/block--contactinfo.html.twig
+ 5
− 1
View file @ cd2cc20d
......@@ -72,7 +72,11 @@
</div>
<div class="footer-email">
<p>E-Mail: <a href"{{ site_mail }}">{{ site_mail }}</a></p>
<p>E-Mail:
<a href="mailto:{{ site_mail }}" title="Email {{ site_name }}">
{{ site_mail }}
</a>
</p>
</div>
{% if content.field_phone.0 or content.field_fax.0 %}
......
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