From 4143616252fd54c0d76288a9cf2138bde64ef7bc Mon Sep 17 00:00:00 2001 From: Brian Canini <canini.16@osu.edu> Date: Mon, 31 Jan 2022 15:16:53 -0500 Subject: [PATCH] style and template updates for academic program content type --- .../sass/components/_academic-programs.scss | 27 +++++- web/themes/asc_bootstrap/css/style.css | 86 ++++++++++++------- .../node/node--academic-programs.html.twig | 10 +++ 3 files changed, 88 insertions(+), 35 deletions(-) diff --git a/web/themes/asc_bootstrap/assets/sass/components/_academic-programs.scss b/web/themes/asc_bootstrap/assets/sass/components/_academic-programs.scss index 56803afda4..071195784c 100644 --- a/web/themes/asc_bootstrap/assets/sass/components/_academic-programs.scss +++ b/web/themes/asc_bootstrap/assets/sass/components/_academic-programs.scss @@ -8,6 +8,26 @@ //## view grid. .view-academic-programs { + .view-content { + + h3 { + margin: 0; + padding: 15px 15px 0; + + &:nth-of-type(odd) { + background: $brand-lgray; + } + } + + .views-view-grid { + padding: 0 15px 15px; + + &:nth-of-type(odd) { + background: $brand-lgray; + } + } + } + .btn-programs { padding: 0; margin-bottom: 60px; @@ -151,12 +171,15 @@ text-transform: uppercase; } + h1 { + margin-bottom: 0 + } + .ap-title-program { - font-size: 20px; + font-size: 16px; vertical-align: baseline; text-transform: uppercase; font-weight: 500; - padding-left: 20px; } } diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css index 86825c71f2..ff3aa5b7d8 100644 --- a/web/themes/asc_bootstrap/css/style.css +++ b/web/themes/asc_bootstrap/css/style.css @@ -10217,17 +10217,34 @@ figcaption { z-index: -1; } -/* line 11, ../assets/sass/components/_academic-programs.scss */ +/* line 13, ../assets/sass/components/_academic-programs.scss */ +.view-academic-programs .view-content h3 { + margin: 0; + padding: 15px 15px 0; +} +/* line 17, ../assets/sass/components/_academic-programs.scss */ +.view-academic-programs .view-content h3:nth-of-type(odd) { + background: #EFF1F2; +} +/* line 22, ../assets/sass/components/_academic-programs.scss */ +.view-academic-programs .view-content .views-view-grid { + padding: 0 15px 15px; +} +/* line 25, ../assets/sass/components/_academic-programs.scss */ +.view-academic-programs .view-content .views-view-grid:nth-of-type(odd) { + background: #EFF1F2; +} +/* line 31, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .btn-programs { padding: 0; margin-bottom: 60px; } -/* line 15, ../assets/sass/components/_academic-programs.scss */ +/* line 35, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .btn-programs li { display: inline; padding: 20px 10px 20px 0; } -/* line 19, ../assets/sass/components/_academic-programs.scss */ +/* line 39, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .btn-programs li .degree-btn { border: #707070; padding: 5px 10px; @@ -10236,7 +10253,7 @@ figcaption { font-weight: 600; } @media (max-width: 768px) { - /* line 19, ../assets/sass/components/_academic-programs.scss */ + /* line 39, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .btn-programs li .degree-btn { width: 100%; display: block; @@ -10244,79 +10261,79 @@ figcaption { padding: 10px; } } -/* line 34, ../assets/sass/components/_academic-programs.scss */ +/* line 54, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .btn-programs li .majors-btn { background: #851E5E; } -/* line 38, ../assets/sass/components/_academic-programs.scss */ +/* line 58, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .btn-programs li .minors-btn { background: #235D62; } -/* line 42, ../assets/sass/components/_academic-programs.scss */ +/* line 62, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .btn-programs li .certs-btn { background: #442369; } -/* line 46, ../assets/sass/components/_academic-programs.scss */ +/* line 66, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .btn-programs li .grads-btn { background: #453831; } @media (max-width: 768px) { - /* line 15, ../assets/sass/components/_academic-programs.scss */ + /* line 35, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .btn-programs li { display: block; padding: 10px; } } -/* line 58, ../assets/sass/components/_academic-programs.scss */ +/* line 78, ../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 67, ../assets/sass/components/_academic-programs.scss */ +/* line 87, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .bef-exposed-form { background: #D8D8D8; margin-bottom: 35px; } -/* line 71, ../assets/sass/components/_academic-programs.scss */ +/* line 91, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .bef-exposed-form .form-item-combine { width: 75%; padding: 10px 20px; } -/* line 75, ../assets/sass/components/_academic-programs.scss */ +/* line 95, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .bef-exposed-form .form-item-combine .input-group { width: 100%; } @media (max-width: 768px) { - /* line 75, ../assets/sass/components/_academic-programs.scss */ + /* line 95, ../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 */ + /* line 101, ../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 */ +/* line 110, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .bef-exposed-form .form-item-combine .input-group-addon { display: none; } -/* line 95, ../assets/sass/components/_academic-programs.scss */ +/* line 115, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .bef-exposed-form button { text-transform: uppercase; border-radius: 0; } -/* line 100, ../assets/sass/components/_academic-programs.scss */ +/* line 120, ../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; } @media (max-width: 768px) { - /* line 100, ../assets/sass/components/_academic-programs.scss */ + /* line 120, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .bef-exposed-form button#edit-submit-academic-programs { float: none; width: 100%; @@ -10324,67 +10341,70 @@ figcaption { } } @media (max-width: 768px) { - /* line 113, ../assets/sass/components/_academic-programs.scss */ + /* line 133, ../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 */ + /* line 138, ../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 */ +/* line 144, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .view-content { margin-bottom: 60px; } -/* line 127, ../assets/sass/components/_academic-programs.scss */ +/* line 147, ../assets/sass/components/_academic-programs.scss */ .view-academic-programs .view-content a { text-decoration: underline; } -/* line 141, ../assets/sass/components/_academic-programs.scss */ +/* line 161, ../assets/sass/components/_academic-programs.scss */ .page-node-type-academic-programs .page-header { display: none; } -/* line 146, ../assets/sass/components/_academic-programs.scss */ +/* line 166, ../assets/sass/components/_academic-programs.scss */ .ap-main-cont { margin-bottom: 60px; } -/* line 149, ../assets/sass/components/_academic-programs.scss */ +/* line 169, ../assets/sass/components/_academic-programs.scss */ .ap-main-cont .btn { margin-bottom: 20px; text-transform: uppercase; } -/* line 154, ../assets/sass/components/_academic-programs.scss */ +/* line 174, ../assets/sass/components/_academic-programs.scss */ +.ap-main-cont h1 { + margin-bottom: 0; +} +/* line 178, ../assets/sass/components/_academic-programs.scss */ .ap-main-cont .ap-title-program { - font-size: 20px; + font-size: 16px; vertical-align: baseline; text-transform: uppercase; font-weight: 500; - padding-left: 20px; } -/* line 165, ../assets/sass/components/_academic-programs.scss */ +/* line 188, ../assets/sass/components/_academic-programs.scss */ .views-field-field-ap-dep-centers ul { list-style: none; padding-inline-start: 0; } -/* line 169, ../assets/sass/components/_academic-programs.scss */ +/* line 192, ../assets/sass/components/_academic-programs.scss */ .views-field-field-ap-dep-centers ul li { margin-bottom: 10px; } @media (max-width: 768px) { - /* line 177, ../assets/sass/components/_academic-programs.scss */ + /* line 200, ../assets/sass/components/_academic-programs.scss */ .page-node-type-academic-programs aside { min-height: auto; float: none; } } @media (max-width: 768px) { - /* line 184, ../assets/sass/components/_academic-programs.scss */ + /* line 207, ../assets/sass/components/_academic-programs.scss */ .page-node-type-academic-programs aside .region-sidebar-menu { display: block; float: none; diff --git a/web/themes/asc_bootstrap/templates/node/node--academic-programs.html.twig b/web/themes/asc_bootstrap/templates/node/node--academic-programs.html.twig index f78ebaa28c..8fd315d944 100644 --- a/web/themes/asc_bootstrap/templates/node/node--academic-programs.html.twig +++ b/web/themes/asc_bootstrap/templates/node/node--academic-programs.html.twig @@ -78,6 +78,16 @@ <article{{ attributes.addClass(classes) }}> <div class="ap-main-cont"> + <h1 class="ap-title"> + {{ label }} + </h1> + {% if content.field_ap_program.0 != '' %} + {% set ap_program %} + {{ content.field_ap_program }} + {% endset %} + <p><span class="ap-title-program">{{ ap_program|striptags }}</span></p> + {% endif %} + {% if content.field_ap_unit_website.0 != '' %} <a href="{{ content.field_ap_unit_website.0 }}"> <button class="btn btn-primary"> -- GitLab