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

Merge pull request #50 from ASCWebServices/canini 

asc_bootstrap - sass updates, contactinfo and paragraph btn temp upda…
parents d0681960 0f94ba50
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 278 additions and 118 deletions
web/themes/asc_bootstrap/assets/sass/components/_filters.scss
+ 62
− 1
View file @ 773de122
......@@ -83,6 +83,67 @@
background: #D8D8D8;
padding: 10px;
}
.news-filter-heading {
color: #225D62;
width: 100%;
}
.filter-spacer {
display: none;
@media (max-width: 1200px) {
display: block;
}
}
.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%;
}
}
.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;
}
}
}
.ui-datepicker {
......@@ -90,7 +151,7 @@
}
#views-exposed-form-events-page-1 {
#views-exposed-form-events-page-1, #views-exposed-form-news-page-1 {
.control-label {
border: 0;
clip: rect(0 0 0 0);
......
web/themes/asc_bootstrap/assets/sass/components/_paragraphs.scss
+ 47
− 35
View file @ 773de122
......@@ -134,45 +134,14 @@
margin-bottom: 0 !important;
}
// --------------------------------------------------
//## Tabs.
.paragraph--type--tabs .field {
padding: 20px;
}
// --------------------------------------------------
//## Video.
.paragraph--type--video iframe {
width: 100% !important;
}
// --------------------------------------------------
//## Twitter.
.para_1_col .field--name-field-media-twitter {
margin: $center-margin;
width: 60%;
.col-xs-12 {
padding: 0;
}
}
// ---------------------------------------------------
//## Special
//## Buttons
.paragraph--type--tagline {
margin: 20px 0;
float: left;
.btn-par {
font-weight: 600;
text-transform: uppercase;
}
......@@ -320,3 +289,46 @@
}
// ---------------------------------------------------
//## Special
.paragraph--type--tagline {
margin: 20px 0;
float: left;
}
// --------------------------------------------------
//## Tabs.
.paragraph--type--tabs .field {
padding: 20px;
}
// --------------------------------------------------
//## Twitter.
.para_1_col .field--name-field-media-twitter {
margin: $center-margin;
width: 60%;
.col-xs-12 {
padding: 0;
}
}
// --------------------------------------------------
//## Video.
.paragraph--type--video iframe {
width: 100% !important;
}
web/themes/asc_bootstrap/assets/sass/layout/_header.scss
+ 0
− 1
View file @ 773de122
......@@ -8,7 +8,6 @@
.page-header {
margin: 0 20px 20px;
border-bottom: none;
text-transform: capitalize;
}
#header-logos {
......
web/themes/asc_bootstrap/css/style.css
+ 152
− 76
View file @ 773de122
......@@ -2164,10 +2164,9 @@ h5, h6 {
.page-header {
margin: 0 20px 20px;
border-bottom: none;
text-transform: capitalize;
}
/* line 14, ../assets/sass/layout/_header.scss */
/* line 13, ../assets/sass/layout/_header.scss */
#header-logos {
padding: 0 15px;
width: 100%;
......@@ -2175,100 +2174,100 @@ h5, h6 {
height: 150px;
line-height: 150px;
}
/* line 21, ../assets/sass/layout/_header.scss */
/* line 20, ../assets/sass/layout/_header.scss */
#header-logos .dep-logo {
float: left;
width: 60%;
height: inherit;
}
/* line 26, ../assets/sass/layout/_header.scss */
/* line 25, ../assets/sass/layout/_header.scss */
#header-logos .dep-logo img {
max-width: 100%;
max-height: inherit;
}
/* line 32, ../assets/sass/layout/_header.scss */
/* line 31, ../assets/sass/layout/_header.scss */
#header-logos .osu-logo {
float: right;
width: 30%;
height: inherit;
text-align: right;
}
/* line 38, ../assets/sass/layout/_header.scss */
/* line 37, ../assets/sass/layout/_header.scss */
#header-logos .osu-logo img {
max-width: 100%;
max-height: inherit;
}
@media (max-width: 768px) {
/* line 14, ../assets/sass/layout/_header.scss */
/* line 13, ../assets/sass/layout/_header.scss */
#header-logos {
display: none;
}
}
/* line 50, ../assets/sass/layout/_header.scss */
/* line 49, ../assets/sass/layout/_header.scss */
#header-logos-mobile {
display: none;
text-align: center;
}
/* line 54, ../assets/sass/layout/_header.scss */
/* line 53, ../assets/sass/layout/_header.scss */
#header-logos-mobile .dep-logo {
width: 100%;
height: inherit;
}
/* line 58, ../assets/sass/layout/_header.scss */
/* line 57, ../assets/sass/layout/_header.scss */
#header-logos-mobile .dep-logo img {
margin: 0 0 30px;
max-width: 100%;
max-height: inherit;
}
/* line 65, ../assets/sass/layout/_header.scss */
/* line 64, ../assets/sass/layout/_header.scss */
#header-logos-mobile .osu-logo {
width: 100%;
height: inherit;
}
/* line 69, ../assets/sass/layout/_header.scss */
/* line 68, ../assets/sass/layout/_header.scss */
#header-logos-mobile .osu-logo img {
margin: 20px 0 30px;
max-width: 100%;
max-height: inherit;
}
@media (max-width: 768px) {
/* line 50, ../assets/sass/layout/_header.scss */
/* line 49, ../assets/sass/layout/_header.scss */
#header-logos-mobile {
display: block;
}
}
/* line 81, ../assets/sass/layout/_header.scss */
/* line 80, ../assets/sass/layout/_header.scss */
.logo2 {
margin-top: 5px;
}
/* line 91, ../assets/sass/layout/_header.scss */
/* line 90, ../assets/sass/layout/_header.scss */
.search-block-form {
display: none;
width: 50%;
float: right;
}
/* line 96, ../assets/sass/layout/_header.scss */
/* line 95, ../assets/sass/layout/_header.scss */
.search-block-form .input-group {
width: 100%;
}
/* line 99, ../assets/sass/layout/_header.scss */
/* line 98, ../assets/sass/layout/_header.scss */
.search-block-form .input-group .form-control:first-child {
border-bottom-right-radius: 4px;
border-top-right-radius: 4px;
}
/* line 105, ../assets/sass/layout/_header.scss */
/* line 104, ../assets/sass/layout/_header.scss */
.search-block-form .button {
display: none;
}
/* line 109, ../assets/sass/layout/_header.scss */
/* line 108, ../assets/sass/layout/_header.scss */
.search-block-form .help-block {
display: none;
}
@media (max-width: 768px) {
/* line 91, ../assets/sass/layout/_header.scss */
/* line 90, ../assets/sass/layout/_header.scss */
.search-block-form {
width: 100%;
padding: 15px 10px 0px;
......@@ -2277,41 +2276,41 @@ h5, h6 {
}
}
/* line 121, ../assets/sass/layout/_header.scss */
/* line 120, ../assets/sass/layout/_header.scss */
.search-icon {
float: right !important;
cursor: pointer;
}
/* line 125, ../assets/sass/layout/_header.scss */
/* line 124, ../assets/sass/layout/_header.scss */
.search-icon .active-search {
min-height: 40px;
}
@media (max-width: 768px) {
/* line 121, ../assets/sass/layout/_header.scss */
/* line 120, ../assets/sass/layout/_header.scss */
.search-icon {
display: none;
}
}
/* line 134, ../assets/sass/layout/_header.scss */
/* line 133, ../assets/sass/layout/_header.scss */
.search-icon-mobile {
display: none;
float: right;
font-size: 24px;
margin: 5px 15px;
}
/* line 140, ../assets/sass/layout/_header.scss */
/* line 139, ../assets/sass/layout/_header.scss */
.search-icon-mobile a {
color: #ffffff;
}
@media (max-width: 768px) {
/* line 134, ../assets/sass/layout/_header.scss */
/* line 133, ../assets/sass/layout/_header.scss */
.search-icon-mobile {
display: block;
}
}
/* line 154, ../assets/sass/layout/_header.scss */
/* line 153, ../assets/sass/layout/_header.scss */
.breadcrumb {
background-color: transparent;
}
......@@ -6192,14 +6191,85 @@ article .field--name-body {
background: #D8D8D8;
padding: 10px;
}
/* line 87, ../assets/sass/components/_filters.scss */
.view-news .news-filter-heading {
color: #225D62;
width: 100%;
}
/* line 92, ../assets/sass/components/_filters.scss */
.view-news .filter-spacer {
display: none;
}
@media (max-width: 1200px) {
/* line 92, ../assets/sass/components/_filters.scss */
.view-news .filter-spacer {
display: block;
}
}
/* line 100, ../assets/sass/components/_filters.scss */
.view-news .select-wrapper {
margin-right: 10px;
}
/* line 103, ../assets/sass/components/_filters.scss */
.view-news .select-wrapper select {
min-width: 250px;
}
@media (max-width: 1200px) {
/* line 103, ../assets/sass/components/_filters.scss */
.view-news .select-wrapper select {
margin-top: 10px;
min-width: 273px;
}
}
@media (max-width: 768px) {
/* line 103, ../assets/sass/components/_filters.scss */
.view-news .select-wrapper select {
margin-top: 0;
min-width: 0;
}
}
/* line 117, ../assets/sass/components/_filters.scss */
.view-news .select-wrapper:after {
color: #555555;
font-size: 12px;
}
@media (max-width: 768px) {
/* line 100, ../assets/sass/components/_filters.scss */
.view-news .select-wrapper {
width: 100%;
}
}
/* line 127, ../assets/sass/components/_filters.scss */
.view-news .form-type-textfield {
margin-right: 10px;
}
/* line 130, ../assets/sass/components/_filters.scss */
.view-news .form-type-textfield input {
min-width: 250px;
}
@media (max-width: 768px) {
/* line 127, ../assets/sass/components/_filters.scss */
.view-news .form-type-textfield {
width: 100%;
}
}
/* line 139, ../assets/sass/components/_filters.scss */
.view-news .form-actions {
min-width: 50%;
}
/* line 142, ../assets/sass/components/_filters.scss */
.view-news .form-actions .button {
text-transform: uppercase;
border-radius: 0;
}
/* line 88, ../assets/sass/components/_filters.scss */
/* line 149, ../assets/sass/components/_filters.scss */
.ui-datepicker {
z-index: 200 !important;
}
/* line 94, ../assets/sass/components/_filters.scss */
#views-exposed-form-events-page-1 .control-label {
/* line 155, ../assets/sass/components/_filters.scss */
#views-exposed-form-events-page-1 .control-label, #views-exposed-form-news-page-1 .control-label {
border: 0;
clip: rect(0 0 0 0);
height: 1px;
......@@ -6643,33 +6713,13 @@ article .field--name-body {
margin-bottom: 0 !important;
}
/* line 141, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--tabs .field {
padding: 20px;
}
/* line 150, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--video iframe {
width: 100% !important;
}
/* line 159, ../assets/sass/components/_paragraphs.scss */
.para_1_col .field--name-field-media-twitter {
margin: 0 auto;
width: 60%;
}
/* line 163, ../assets/sass/components/_paragraphs.scss */
.para_1_col .field--name-field-media-twitter .col-xs-12 {
padding: 0;
}
/* line 173, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--tagline {
margin: 20px 0;
float: left;
/* line 142, ../assets/sass/components/_paragraphs.scss */
.btn-par {
font-weight: 600;
text-transform: uppercase;
}
/* line 183, ../assets/sass/components/_paragraphs.scss */
/* line 152, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container {
width: 100%;
position: absolute;
......@@ -6678,7 +6728,7 @@ article .field--name-body {
z-index: 100;
height: 100%;
}
/* line 191, ../assets/sass/components/_paragraphs.scss */
/* line 160, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt {
background-color: rgba(255, 255, 255, 0.7);
padding: 20px;
......@@ -6690,14 +6740,14 @@ article .field--name-body {
transform: perspective(1px) translateY(-50%);
}
@media (max-width: 768px) {
/* line 191, ../assets/sass/components/_paragraphs.scss */
/* line 160, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt {
width: 80%;
top: 45%;
height: 100%;
}
}
/* line 207, ../assets/sass/components/_paragraphs.scss */
/* line 176, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt h2 {
font-size: 36px;
text-transform: uppercase;
......@@ -6705,29 +6755,29 @@ article .field--name-body {
color: #333333;
}
@media (max-width: 768px) {
/* line 207, ../assets/sass/components/_paragraphs.scss */
/* line 176, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt h2 {
font-size: 18px;
}
}
/* line 218, ../assets/sass/components/_paragraphs.scss */
/* line 187, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt p {
font-size: 18px;
margin: 25px 0;
}
@media (max-width: 768px) {
/* line 218, ../assets/sass/components/_paragraphs.scss */
/* line 187, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt p {
display: none;
}
}
/* line 227, ../assets/sass/components/_paragraphs.scss */
/* line 196, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-19 {
width: 100%;
margin: 0 auto;
font-size: 18px;
}
/* line 232, ../assets/sass/components/_paragraphs.scss */
/* line 201, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-19 .btn-wrapper {
width: 25%;
margin: 0 10px;
......@@ -6737,16 +6787,16 @@ article .field--name-body {
color: #ffffff;
text-transform: uppercase;
}
/* line 241, ../assets/sass/components/_paragraphs.scss */
/* line 210, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-19 .btn-wrapper svg, .slide-txt-container .slide-txt .btn-links-19 .btn-wrapper i {
padding-top: 1px;
}
/* line 245, ../assets/sass/components/_paragraphs.scss */
/* line 214, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-19 .btn-wrapper:hover {
background: #8E0101;
}
@media (max-width: 768px) {
/* line 232, ../assets/sass/components/_paragraphs.scss */
/* line 201, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-19 .btn-wrapper {
display: block;
width: 100%;
......@@ -6754,13 +6804,13 @@ article .field--name-body {
font-weight: 700;
}
}
/* line 258, ../assets/sass/components/_paragraphs.scss */
/* line 227, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-18 {
width: 100%;
margin: 0 auto;
font-size: 18px;
}
/* line 263, ../assets/sass/components/_paragraphs.scss */
/* line 232, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-18 .btn-wrapper {
width: 40%;
margin: 0 10px;
......@@ -6770,16 +6820,16 @@ article .field--name-body {
color: #ffffff;
text-transform: uppercase;
}
/* line 272, ../assets/sass/components/_paragraphs.scss */
/* line 241, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-18 .btn-wrapper svg, .slide-txt-container .slide-txt .btn-links-18 .btn-wrapper i {
padding-top: 1px;
}
/* line 276, ../assets/sass/components/_paragraphs.scss */
/* line 245, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-18 .btn-wrapper:hover {
background: #8E0101;
}
@media (max-width: 768px) {
/* line 263, ../assets/sass/components/_paragraphs.scss */
/* line 232, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-18 .btn-wrapper {
display: block;
width: 100%;
......@@ -6787,13 +6837,13 @@ article .field--name-body {
font-weight: 700;
}
}
/* line 289, ../assets/sass/components/_paragraphs.scss */
/* line 258, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-17 {
width: 100%;
margin: 0 auto;
font-size: 18px;
}
/* line 294, ../assets/sass/components/_paragraphs.scss */
/* line 263, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-17 .btn-wrapper {
width: 50%;
margin: 0 10px;
......@@ -6803,16 +6853,16 @@ article .field--name-body {
color: #ffffff;
text-transform: uppercase;
}
/* line 303, ../assets/sass/components/_paragraphs.scss */
/* line 272, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-17 .btn-wrapper svg, .slide-txt-container .slide-txt .btn-links-17 .btn-wrapper i {
padding-top: 1px;
}
/* line 307, ../assets/sass/components/_paragraphs.scss */
/* line 276, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-17 .btn-wrapper:hover {
background: #8E0101;
}
@media (max-width: 768px) {
/* line 294, ../assets/sass/components/_paragraphs.scss */
/* line 263, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-17 .btn-wrapper {
display: block;
width: 100%;
......@@ -6820,6 +6870,32 @@ article .field--name-body {
}
}
/* line 298, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--tagline {
margin: 20px 0;
float: left;
}
/* line 308, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--tabs .field {
padding: 20px;
}
/* line 318, ../assets/sass/components/_paragraphs.scss */
.para_1_col .field--name-field-media-twitter {
margin: 0 auto;
width: 60%;
}
/* line 322, ../assets/sass/components/_paragraphs.scss */
.para_1_col .field--name-field-media-twitter .col-xs-12 {
padding: 0;
}
/* line 332, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--video iframe {
width: 100% !important;
}
/* line 11, ../assets/sass/components/_people.scss */
.view-people-directory h3 {
text-transform: uppercase;
......
web/themes/asc_bootstrap/js/scripts.js
+ 6
− 0
View file @ 773de122
......@@ -107,5 +107,11 @@ jQuery(document).ready(function(){
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/block/block--contactinfo.html.twig
+ 2
− 2
View file @ 773de122
......@@ -49,11 +49,11 @@
<h3>Contact Us</h3>
<p>
{% if content.field_address1.0 %}
{{ content.field_address1.0 }}<br/>
{{ content.field_address_line1.0 }}<br/>
{% endif %}
{% if content.field_address2.0 %}
{{ content.field_address2.0 }}<br/>
{{ content.field_address_line2.0 }}<br/>
{% endif %}
{% if content.field_city.0 %}
......
web/themes/asc_bootstrap/templates/paragraph/paragraph--button.html.twig
+ 9
− 3
View file @ 773de122
......@@ -37,8 +37,14 @@
#}
{% if content.field_button.0 %}
<a href="{{ content.field_button[0]['#url'] }}" title="{{ content.field_button.0['#title'] }}">
<div class="btn-wrapper">
{{ content.field_button.0['#title'] }} <i class="fa fa-angle-right"></i>
</div>
{% if page_content_type == 'landing_page' %}
<div class="btn-wrapper">
{{ content.field_button.0['#title'] }} <i class="fa fa-angle-right"></i>
</div>
{% else %}
<div class="btn-wrapper btn btn-primary btn-par">
{{ content.field_button.0['#title'] }} <i class="fa fa-angle-right"></i>
</div>
{% endif %}
</a>
{% endif %}
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