Skip to content
Snippets Groups Projects
Unverified Commit b1aa9db6 authored by Michael Lee's avatar Michael Lee Committed by GitHub
Browse files

Merge pull request #447 from ASCWebServices/canini-2 

Style and template adjustments for ASC Main
parents e9ee467d b4185dc2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
web/themes/asc_bootstrap/assets/sass/components/_academic-programs.scss
+ 52
− 1
View file @ b1aa9db6
......@@ -22,6 +22,13 @@
color: $white;
text-transform: uppercase;
font-weight: 600;
@media (max-width: 768px) {
width: 100%;
display: block;
text-align: center;
padding: 10px;
}
}
.majors-btn {
......@@ -39,6 +46,11 @@
.grads-btn {
background: #453831;
}
@media (max-width: 768px) {
display: block;
padding: 10px;
}
}
.active {
......@@ -62,6 +74,17 @@
.input-group {
width: 100%;
@media (max-width: 768px) {
display: block;
input {
width: 100%;
display: block;
padding: 20px 10px;
}
}
}
.input-group-addon {
......@@ -78,6 +101,23 @@
background-color: #26686d;
border-color: #225d62;
float: right;
@media (max-width: 768px) {
float: none;
width: 100%;
padding: 10px;
}
}
@media (max-width: 768px) {
.form-item {
width: 100%;
padding: 20px;
}
.form-actions {
padding: 30px 20px 10px;
}
}
}
......@@ -100,8 +140,19 @@
margin-bottom: 60px;
.btn {
margin-top: 20px;
margin-bottom: 20px;
text-transform: uppercase;
}
}
.views-field-field-ap-dep-centers {
ul {
list-style: none;
padding-inline-start: 0;
li {
margin-bottom: 10px;
}
}
}
web/themes/asc_bootstrap/assets/sass/components/_departments-centers.scss
+ 20
− 0
View file @ b1aa9db6
......@@ -27,6 +27,7 @@
@media (max-width: 768px) {
display: block;
width: 100%;
}
}
......@@ -88,6 +89,12 @@
.input-group {
width: 100%;
}
@media (max-width: 768px) {
width: 100%;
padding: 20px;
margin-bottom: 0;
}
}
button {
......@@ -99,6 +106,19 @@
background-color: #26686d;
border-color: #225d62;
float: right;
@media (max-width: 768px) {
float: none;
width: 100%;
padding: 10px;
}
}
@media (max-width: 768px) {
.form-actions {
padding: 0 20px 5px;
}
}
}
......
web/themes/asc_bootstrap/css/style.css
+ 118
− 38
View file @ b1aa9db6
......@@ -10234,77 +10234,134 @@ figcaption {
text-transform: uppercase;
font-weight: 600;
}
/* line 27, ../assets/sass/components/_academic-programs.scss */
@media (max-width: 768px) {
/* line 19, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .btn-programs li .degree-btn {
width: 100%;
display: block;
text-align: center;
padding: 10px;
}
}
/* line 34, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .btn-programs li .majors-btn {
background: #851E5E;
}
/* line 31, ../assets/sass/components/_academic-programs.scss */
/* line 38, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .btn-programs li .minors-btn {
background: #235D62;
}
/* line 35, ../assets/sass/components/_academic-programs.scss */
/* line 42, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .btn-programs li .certs-btn {
background: #442369;
}
/* line 39, ../assets/sass/components/_academic-programs.scss */
/* line 46, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .btn-programs li .grads-btn {
background: #453831;
}
/* line 46, ../assets/sass/components/_academic-programs.scss */
@media (max-width: 768px) {
/* line 15, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .btn-programs li {
display: block;
padding: 10px;
}
}
/* line 58, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .btn-programs .active a {
background: #D4DF47;
color: #3D3D3D;
border-left: 2px solid #ABB33C;
border-top: 2px solid #ABB33C;
}
/* line 55, ../assets/sass/components/_academic-programs.scss */
/* line 67, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .bef-exposed-form {
background: #D8D8D8;
margin-bottom: 35px;
}
/* line 59, ../assets/sass/components/_academic-programs.scss */
/* line 71, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .bef-exposed-form .form-item-combine {
width: 75%;
padding: 10px 20px;
}
/* line 63, ../assets/sass/components/_academic-programs.scss */
/* line 75, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .bef-exposed-form .form-item-combine .input-group {
width: 100%;
}
/* line 67, ../assets/sass/components/_academic-programs.scss */
@media (max-width: 768px) {
/* line 75, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .bef-exposed-form .form-item-combine .input-group {
display: block;
}
/* line 81, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .bef-exposed-form .form-item-combine .input-group input {
width: 100%;
display: block;
padding: 20px 10px;
}
}
/* line 90, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .bef-exposed-form .form-item-combine .input-group-addon {
display: none;
}
/* line 72, ../assets/sass/components/_academic-programs.scss */
/* line 95, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .bef-exposed-form button {
text-transform: uppercase;
border-radius: 0;
}
/* line 77, ../assets/sass/components/_academic-programs.scss */
/* line 100, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .bef-exposed-form button#edit-submit-academic-programs {
background-color: #26686d;
border-color: #225d62;
float: right;
}
/* line 84, ../assets/sass/components/_academic-programs.scss */
@media (max-width: 768px) {
/* line 100, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .bef-exposed-form button#edit-submit-academic-programs {
float: none;
width: 100%;
padding: 10px;
}
}
@media (max-width: 768px) {
/* line 113, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .bef-exposed-form .form-item {
width: 100%;
padding: 20px;
}
/* line 118, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .bef-exposed-form .form-actions {
padding: 30px 20px 10px;
}
}
/* line 124, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .view-content {
margin-bottom: 60px;
}
/* line 87, ../assets/sass/components/_academic-programs.scss */
/* line 127, ../assets/sass/components/_academic-programs.scss */
.view-academic-programs .view-content a {
text-decoration: underline;
}
/* line 99, ../assets/sass/components/_academic-programs.scss */
/* line 139, ../assets/sass/components/_academic-programs.scss */
.ap-main-cont {
margin-bottom: 60px;
}
/* line 102, ../assets/sass/components/_academic-programs.scss */
/* line 142, ../assets/sass/components/_academic-programs.scss */
.ap-main-cont .btn {
margin-top: 20px;
margin-bottom: 20px;
text-transform: uppercase;
}
/* line 150, ../assets/sass/components/_academic-programs.scss */
.views-field-field-ap-dep-centers ul {
list-style: none;
padding-inline-start: 0;
}
/* line 154, ../assets/sass/components/_academic-programs.scss */
.views-field-field-ap-dep-centers ul li {
margin-bottom: 10px;
}
/* line 1, ../assets/sass/components/_cbpmenu.scss */
.cbp-hrmenu {
width: 100%;
......@@ -10515,9 +10572,10 @@ figcaption {
/* line 25, ../assets/sass/components/_departments-centers.scss */
.view-departments-centers .row {
display: block;
width: 100%;
}
}
/* line 33, ../assets/sass/components/_departments-centers.scss */
/* line 34, ../assets/sass/components/_departments-centers.scss */
.view-departments-centers .col {
flex: 1;
background: #EEE;
......@@ -10526,70 +10584,92 @@ figcaption {
padding: 0;
max-width: 33.33333%;
}
/* line 41, ../assets/sass/components/_departments-centers.scss */
/* line 42, ../assets/sass/components/_departments-centers.scss */
.view-departments-centers .col .views-field-fieldset {
height: 100%;
}
/* line 44, ../assets/sass/components/_departments-centers.scss */
/* line 45, ../assets/sass/components/_departments-centers.scss */
.view-departments-centers .col .views-field-fieldset .inner-dc-grid {
height: 100%;
}
/* line 47, ../assets/sass/components/_departments-centers.scss */
/* line 48, ../assets/sass/components/_departments-centers.scss */
.view-departments-centers .col .views-field-fieldset .inner-dc-grid div {
height: 100%;
}
/* line 50, ../assets/sass/components/_departments-centers.scss */
/* line 51, ../assets/sass/components/_departments-centers.scss */
.view-departments-centers .col .views-field-fieldset .inner-dc-grid div .dc-block-wrap {
height: 100%;
}
/* line 53, ../assets/sass/components/_departments-centers.scss */
/* line 54, ../assets/sass/components/_departments-centers.scss */
.view-departments-centers .col .views-field-fieldset .inner-dc-grid div .dc-block-wrap a {
display: block;
height: inherit;
}
/* line 57, ../assets/sass/components/_departments-centers.scss */
/* line 58, ../assets/sass/components/_departments-centers.scss */
.view-departments-centers .col .views-field-fieldset .inner-dc-grid div .dc-block-wrap a .dc-block {
display: inherit;
padding: 10px 20px 20px 20px;
}
/* line 61, ../assets/sass/components/_departments-centers.scss */
/* line 62, ../assets/sass/components/_departments-centers.scss */
.view-departments-centers .col .views-field-fieldset .inner-dc-grid div .dc-block-wrap a .dc-block strong {
font-weight: 600;
}
@media (max-width: 768px) {
/* line 33, ../assets/sass/components/_departments-centers.scss */
/* line 34, ../assets/sass/components/_departments-centers.scss */
.view-departments-centers .col {
max-width: 100%;
}
}
/* line 80, ../assets/sass/components/_departments-centers.scss */
/* line 81, ../assets/sass/components/_departments-centers.scss */
#views-exposed-form-departments-centers-page-1 {
background: #D8D8D8;
margin-bottom: 35px;
}
/* line 84, ../assets/sass/components/_departments-centers.scss */
/* line 85, ../assets/sass/components/_departments-centers.scss */
#views-exposed-form-departments-centers-page-1 .form-item-combine {
width: 75%;
padding: 10px 20px;
}
/* line 88, ../assets/sass/components/_departments-centers.scss */
/* line 89, ../assets/sass/components/_departments-centers.scss */
#views-exposed-form-departments-centers-page-1 .form-item-combine .input-group {
width: 100%;
}
/* line 93, ../assets/sass/components/_departments-centers.scss */
@media (max-width: 768px) {
/* line 85, ../assets/sass/components/_departments-centers.scss */
#views-exposed-form-departments-centers-page-1 .form-item-combine {
width: 100%;
padding: 20px;
margin-bottom: 0;
}
}
/* line 100, ../assets/sass/components/_departments-centers.scss */
#views-exposed-form-departments-centers-page-1 button {
text-transform: uppercase;
border-radius: 0;
}
/* line 98, ../assets/sass/components/_departments-centers.scss */
/* line 105, ../assets/sass/components/_departments-centers.scss */
#views-exposed-form-departments-centers-page-1 button#edit-submit-departments-centers {
background-color: #26686d;
border-color: #225d62;
float: right;
}
@media (max-width: 768px) {
/* line 105, ../assets/sass/components/_departments-centers.scss */
#views-exposed-form-departments-centers-page-1 button#edit-submit-departments-centers {
float: none;
width: 100%;
padding: 10px;
}
}
@media (max-width: 768px) {
/* line 119, ../assets/sass/components/_departments-centers.scss */
#views-exposed-form-departments-centers-page-1 .form-actions {
padding: 0 20px 5px;
}
}
/* line 113, ../assets/sass/components/_departments-centers.scss */
/* line 133, ../assets/sass/components/_departments-centers.scss */
.dc-main-cont {
background: #F9F9F9;
padding: 20px;
......@@ -10597,39 +10677,39 @@ figcaption {
width: 100%;
margin-bottom: 40px;
}
/* line 120, ../assets/sass/components/_departments-centers.scss */
/* line 140, ../assets/sass/components/_departments-centers.scss */
.dc-main-cont .dc-main-cont-lcol {
width: 50%;
float: left;
}
/* line 124, ../assets/sass/components/_departments-centers.scss */
/* line 144, ../assets/sass/components/_departments-centers.scss */
.dc-main-cont .dc-main-cont-lcol .btn {
text-transform: uppercase;
margin: 5px 0 15px;
}
/* line 129, ../assets/sass/components/_departments-centers.scss */
/* line 149, ../assets/sass/components/_departments-centers.scss */
.dc-main-cont .dc-main-cont-lcol .dc-social {
list-style-type: none;
font-size: 30px;
padding: 0;
}
/* line 134, ../assets/sass/components/_departments-centers.scss */
/* line 154, ../assets/sass/components/_departments-centers.scss */
.dc-main-cont .dc-main-cont-lcol .dc-social li {
display: inline;
}
/* line 138, ../assets/sass/components/_departments-centers.scss */
/* line 158, ../assets/sass/components/_departments-centers.scss */
.dc-main-cont .dc-main-cont-lcol .dc-social a {
color: #373535;
text-decoration: none;
}
/* line 145, ../assets/sass/components/_departments-centers.scss */
/* line 165, ../assets/sass/components/_departments-centers.scss */
.dc-main-cont .dc-main-cont-rcol {
width: 40%;
display: inline-block;
float: right;
}
/* line 152, ../assets/sass/components/_departments-centers.scss */
/* line 172, ../assets/sass/components/_departments-centers.scss */
.dc-add-cont {
margin-bottom: 40px;
}
......
web/themes/asc_bootstrap/templates/node/node--academic-programs.html.twig
+ 8
− 8
View file @ b1aa9db6
......@@ -78,14 +78,6 @@
<article{{ attributes.addClass(classes) }}>
<div class="ap-main-cont">
{% if content.field_ap_overview.0 != '' %}
{{ content.field_ap_overview }}
{% endif %}
{% if content.field_ap_advanced.0 != '' %}
{{ content.field_ap_advanced }}
{% endif %}
{% if content.field_ap_unit_website.0 != '' %}
<a href="{{ content.field_ap_unit_website.0 }}">
<button class="btn btn-primary">
......@@ -94,6 +86,14 @@
</a>
{% endif %}
{% if content.field_ap_overview.0 != '' %}
{{ content.field_ap_overview }}
{% endif %}
{% if content.field_ap_advanced.0 != '' %}
{{ content.field_ap_advanced }}
{% endif %}
<hr/>
{% if node.field_ap_social_share.value == 1 %}
{{ content.field_ap_social_share }}
......
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