From 5dfe97288d9839bc526b3844066ddd20e6cc7263 Mon Sep 17 00:00:00 2001 From: bcanini <canini.16@osu.edu> Date: Tue, 5 Mar 2019 10:29:46 -0500 Subject: [PATCH] asc_bootstrap - updating callout box styles, fixing padding and line-height on sidebar menus --- .../assets/sass/components/_sidebar-menu.scss | 20 ++- .../assets/sass/pages/_landing-page.scss | 23 ++-- web/themes/asc_bootstrap/css/style.css | 119 ++++++++++-------- 3 files changed, 95 insertions(+), 67 deletions(-) diff --git a/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss b/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss index 89cbc627bb..2b80b9d7b6 100644 --- a/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss +++ b/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss @@ -8,10 +8,18 @@ li { border-top: 1px #979797 dotted; + line-height: 1.15; + + .link-wrapper { + padding: 8px 0; + } + + .active-link { + padding-left: 5px; + } a { display: inline; - padding: 0 14px; } } @@ -27,9 +35,12 @@ li { + .link-wrapper { + padding-left: 35px; + } + a { color: $black-base; - padding: 0px 5px 0px 35px; } i { @@ -38,8 +49,8 @@ li { - a { - padding: 0px 5px 0px 55px; + .link-wrapper { + padding-left: 55px; } } } @@ -70,6 +81,7 @@ .active-link { background-color: $white; border-left: solid #D0021B 3px; + padding-left: 5px; } .link-wrapper { diff --git a/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss b/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss index 6c722167c7..7105ac094f 100644 --- a/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss +++ b/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss @@ -112,36 +112,37 @@ .img-link-wrapper:hover + .field--type-link a { color: $brand-red; - text-decoration: none; + text-decoration: underline; } .field--item:hover > a { color: $brand-red; - text-decoration: none; + text-decoration: underline; } a { - color: $black-base; + color: #444444; font-size: 20px; padding-top: 5px; - font-weight: 600; + font-weight: 500; &:hover { color: $brand-red; - text-decoration: none; + text-decoration: underline; } } .field--type-link { - position: absolute; - bottom: 0; - margin-bottom: 15px; width: 100%; + margin-bottom: 15px; .field--item { padding: 15px; - margin-right: 30px; - background: rgba(255,255,255,0.7); + background: $brand-lgray; + } + + @media (max-width: 768px) { + margin-bottom: 0; } } } @@ -160,7 +161,7 @@ text-decoration: none; &:hover { - text-decoration: none; + text-decoration: underline; } } } diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css index 93670ab6e0..c59bf15f82 100644 --- a/web/themes/asc_bootstrap/css/style.css +++ b/web/themes/asc_bootstrap/css/style.css @@ -11688,13 +11688,21 @@ body { /* line 9, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav li { border-top: 1px #979797 dotted; + line-height: 1.15; } -/* line 12, ../assets/sass/components/_sidebar-menu.scss */ +/* line 13, ../assets/sass/components/_sidebar-menu.scss */ +#block-mainnavigation-2 .navbar-nav li .link-wrapper { + padding: 8px 0; +} +/* line 17, ../assets/sass/components/_sidebar-menu.scss */ +#block-mainnavigation-2 .navbar-nav li .active-link { + padding-left: 5px; +} +/* line 21, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav li a { display: inline; - padding: 0 14px; } -/* line 19, ../assets/sass/components/_sidebar-menu.scss */ +/* line 27, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav ul { display: none; position: inherit; @@ -11704,44 +11712,48 @@ body { padding: 0; list-style-type: none; } -/* line 30, ../assets/sass/components/_sidebar-menu.scss */ +/* line 38, ../assets/sass/components/_sidebar-menu.scss */ +#block-mainnavigation-2 .navbar-nav ul li .link-wrapper { + padding-left: 35px; +} +/* line 42, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav ul li a { color: #000000; - padding: 0px 5px 0px 35px; } -/* line 35, ../assets/sass/components/_sidebar-menu.scss */ +/* line 46, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav ul li i { padding: 0 10px; } -/* line 41, ../assets/sass/components/_sidebar-menu.scss */ -#block-mainnavigation-2 .navbar-nav ul li li a { - padding: 0px 5px 0px 55px; +/* line 52, ../assets/sass/components/_sidebar-menu.scss */ +#block-mainnavigation-2 .navbar-nav ul li li .link-wrapper { + padding-left: 55px; } -/* line 48, ../assets/sass/components/_sidebar-menu.scss */ +/* line 59, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav .active-trail ul { display: inherit; } -/* line 53, ../assets/sass/components/_sidebar-menu.scss */ +/* line 64, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav i { float: right; padding: 2px 10px; cursor: pointer; } -/* line 59, ../assets/sass/components/_sidebar-menu.scss */ +/* line 70, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav:nth-last-child(1) { border-bottom: 1px #979797 dotted; border-top: none; } -/* line 66, ../assets/sass/components/_sidebar-menu.scss */ +/* line 77, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .nav > li > a:hover, #block-mainnavigation-2 .nav > li > a:focus { background-color: transparent; } -/* line 70, ../assets/sass/components/_sidebar-menu.scss */ +/* line 81, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .active-link { background-color: #ffffff; border-left: solid #D0021B 3px; + padding-left: 5px; } -/* line 77, ../assets/sass/components/_sidebar-menu.scss */ +/* line 89, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .link-wrapper:hover { background-color: #ffffff; } @@ -11931,40 +11943,43 @@ article.page { /* line 113, ../assets/sass/pages/_landing-page.scss */ .call-out-container .img-link-wrapper:hover + .field--type-link a { color: #BB0000; - text-decoration: none; + text-decoration: underline; } /* line 118, ../assets/sass/pages/_landing-page.scss */ .call-out-container .field--item:hover > a { color: #BB0000; - text-decoration: none; + text-decoration: underline; } /* line 123, ../assets/sass/pages/_landing-page.scss */ .call-out-container a { - color: #000000; + color: #444444; font-size: 20px; padding-top: 5px; - font-weight: 600; + font-weight: 500; } /* line 129, ../assets/sass/pages/_landing-page.scss */ .call-out-container a:hover { color: #BB0000; - text-decoration: none; + text-decoration: underline; } /* line 135, ../assets/sass/pages/_landing-page.scss */ .call-out-container .field--type-link { - position: absolute; - bottom: 0; - margin-bottom: 15px; width: 100%; + margin-bottom: 15px; } -/* line 141, ../assets/sass/pages/_landing-page.scss */ +/* line 139, ../assets/sass/pages/_landing-page.scss */ .call-out-container .field--type-link .field--item { padding: 15px; - margin-right: 30px; - background: rgba(255, 255, 255, 0.7); + background: #F5F5F5; +} +@media (max-width: 768px) { + /* line 135, ../assets/sass/pages/_landing-page.scss */ + .call-out-container .field--type-link { + margin-bottom: 0; + } } -/* line 159, ../assets/sass/pages/_landing-page.scss */ +/* line 160, ../assets/sass/pages/_landing-page.scss */ .dgray-bg .call-out-container a, .dscarlet-bg .call-out-container a, .dviolet-bg .call-out-container a, @@ -11974,7 +11989,7 @@ article.page { .dorange-bg .call-out-container a { text-decoration: none; } -/* line 162, ../assets/sass/pages/_landing-page.scss */ +/* line 163, ../assets/sass/pages/_landing-page.scss */ .dgray-bg .call-out-container a:hover, .dscarlet-bg .call-out-container a:hover, .dviolet-bg .call-out-container a:hover, @@ -11982,10 +11997,10 @@ article.page { .dpurple-bg .call-out-container a:hover, .dgreen-bg .call-out-container a:hover, .dorange-bg .call-out-container a:hover { - text-decoration: none; + text-decoration: underline; } -/* line 171, ../assets/sass/pages/_landing-page.scss */ +/* line 172, ../assets/sass/pages/_landing-page.scss */ .page-node-type-landing-page #half-t-left { position: absolute; z-index: 2; @@ -11996,12 +12011,12 @@ article.page { border-right: 20px solid transparent; } @media (max-width: 768px) { - /* line 171, ../assets/sass/pages/_landing-page.scss */ + /* line 172, ../assets/sass/pages/_landing-page.scss */ .page-node-type-landing-page #half-t-left { bottom: -2px; } } -/* line 184, ../assets/sass/pages/_landing-page.scss */ +/* line 185, ../assets/sass/pages/_landing-page.scss */ .page-node-type-landing-page #half-t-right { position: absolute; z-index: 2; @@ -12013,18 +12028,18 @@ article.page { border-left: 20px solid transparent; } @media (max-width: 768px) { - /* line 184, ../assets/sass/pages/_landing-page.scss */ + /* line 185, ../assets/sass/pages/_landing-page.scss */ .page-node-type-landing-page #half-t-right { bottom: -2px; } } -/* line 206, ../assets/sass/pages/_landing-page.scss */ +/* line 207, ../assets/sass/pages/_landing-page.scss */ .block-wrapper .region:nth-child(odd) { background: #F5F5F5; } -/* line 212, ../assets/sass/pages/_landing-page.scss */ +/* line 213, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-header { text-transform: uppercase; float: left; @@ -12033,48 +12048,48 @@ article.page { padding-bottom: 0; border-bottom: 1px solid #979797; } -/* line 220, ../assets/sass/pages/_landing-page.scss */ +/* line 221, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-header .txt-re-news { text-align: left; padding: 0; } -/* line 224, ../assets/sass/pages/_landing-page.scss */ +/* line 225, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-header .txt-re-news h2 { color: #851E5E; font-size: 22px; } -/* line 230, ../assets/sass/pages/_landing-page.scss */ +/* line 231, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-header .txt-more-news-head { text-align: right; padding: 0; } -/* line 234, ../assets/sass/pages/_landing-page.scss */ +/* line 235, ../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 { color: #851E5E; font-size: 22px; } -/* line 238, ../assets/sass/pages/_landing-page.scss */ +/* line 239, ../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 { font-size: 20px; } @media (max-width: 768px) { - /* line 230, ../assets/sass/pages/_landing-page.scss */ + /* line 231, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-header .txt-more-news-head { display: none; } } -/* line 249, ../assets/sass/pages/_landing-page.scss */ +/* line 250, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-content { float: left; width: 100%; } @media (max-width: 768px) { - /* line 254, ../assets/sass/pages/_landing-page.scss */ + /* line 255, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-content .row { margin-bottom: 0; } } -/* line 260, ../assets/sass/pages/_landing-page.scss */ +/* line 261, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-footer { text-transform: uppercase; float: left; @@ -12083,43 +12098,43 @@ article.page { border-bottom: 1px solid #979797; display: none; } -/* line 268, ../assets/sass/pages/_landing-page.scss */ +/* line 269, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-footer .txt-more-news-foot { text-align: right; padding: 0; } -/* line 272, ../assets/sass/pages/_landing-page.scss */ +/* line 273, ../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 { color: #851E5E; font-size: 22px; } -/* line 276, ../assets/sass/pages/_landing-page.scss */ +/* line 277, ../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 { font-size: 20px; } @media (max-width: 768px) { - /* line 260, ../assets/sass/pages/_landing-page.scss */ + /* line 261, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-footer { display: block; } } -/* line 291, ../assets/sass/pages/_landing-page.scss */ +/* line 292, ../assets/sass/pages/_landing-page.scss */ #views-bootstrap-people-directory-block-1 .people-row .inner-people-grid { background: #ffffff; } -/* line 297, ../assets/sass/pages/_landing-page.scss */ +/* line 298, ../assets/sass/pages/_landing-page.scss */ .views-field-field-evt-image .field--name-field-media-image { padding-bottom: 0; } -/* line 303, ../assets/sass/pages/_landing-page.scss */ +/* line 304, ../assets/sass/pages/_landing-page.scss */ .views-field-field-news-image2 .field--name-field-media-image { padding-bottom: 0; } -/* line 309, ../assets/sass/pages/_landing-page.scss */ +/* line 310, ../assets/sass/pages/_landing-page.scss */ .inner-people-grid .views-field-nothing-1 { margin-bottom: 10px; } -- GitLab