From 907c5e95f4499c7e4c31944675b4a436926615ab Mon Sep 17 00:00:00 2001 From: Serhii Myronets <52801-Agami4@users.noreply.drupalcode.org> Date: Tue, 17 Dec 2024 13:26:15 +0000 Subject: [PATCH] Revert "Issue #3480708: Improve link states in the description and comment" --- assets/css/base.css | 48 ++- assets/css/brand.css | 80 ++--- assets/css/ckeditor.css | 75 ++-- assets/css/preview.css | 329 +++++++----------- color/preview.js | 15 +- components/00-config/mixins/_links.scss | 11 +- components/03-molecules/wysiwyg/ckeditor.scss | 9 +- components/brand.scss | 20 +- socialblue.info.yml | 1 - 9 files changed, 246 insertions(+), 342 deletions(-) diff --git a/assets/css/base.css b/assets/css/base.css index aca364f5..320c47a4 100644 --- a/assets/css/base.css +++ b/assets/css/base.css @@ -119,15 +119,59 @@ pre { .hero--dashboard .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn), .certificate-footer .bottom *:not(.badge):not(.section__title) > a:not(.btn), .certificate-header .description *:not(.badge):not(.section__title) > a:not(.btn) { - font-weight: 400; text-decoration: underline; } +.field--name-field-introduction-text *:not(.badge):not(.section__title) > a:not(.btn):hover, .field--name-field-introduction-text *:not(.badge):not(.section__title) > a:not(.btn):focus, +.field--name-field-featured-items-description *:not(.badge):not(.section__title) > a:not(.btn):hover, +.field--name-field-featured-items-description *:not(.badge):not(.section__title) > a:not(.btn):focus, +.field--name-field-featured-description *:not(.badge):not(.section__title) > a:not(.btn):hover, +.field--name-field-featured-description *:not(.badge):not(.section__title) > a:not(.btn):focus, +.field--name-field-accord-description *:not(.badge):not(.section__title) > a:not(.btn):hover, +.field--name-field-accord-description *:not(.badge):not(.section__title) > a:not(.btn):focus, +.field--name-field-accord-item-description *:not(.badge):not(.section__title) > a:not(.btn):hover, +.field--name-field-accord-item-description *:not(.badge):not(.section__title) > a:not(.btn):focus, +.field--name-field-phase-description *:not(.badge):not(.section__title) > a:not(.btn):hover, +.field--name-field-phase-description *:not(.badge):not(.section__title) > a:not(.btn):focus, +.paragraph--type--image-text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):hover, +.paragraph--type--image-text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):focus, +.paragraph--type--text-image .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):hover, +.paragraph--type--text-image .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):focus, +.paragraph--type--text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):hover, +.paragraph--type--text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):focus, +.scorm-form--body *:not(.badge):not(.section__title) > a:not(.btn):hover, +.scorm-form--body *:not(.badge):not(.section__title) > a:not(.btn):focus, +.quiz-form__text *:not(.badge):not(.section__title) > a:not(.btn):hover, +.quiz-form__text *:not(.badge):not(.section__title) > a:not(.btn):focus, +.course-full .card__body *:not(.badge):not(.section__title) > a:not(.btn):hover, +.course-full .card__body *:not(.badge):not(.section__title) > a:not(.btn):focus, +.teaser--course *:not(.badge):not(.section__title) > a:not(.btn):hover, +.teaser--course *:not(.badge):not(.section__title) > a:not(.btn):focus, +.body-text *:not(.badge):not(.section__title) > a:not(.btn):hover, +.body-text *:not(.badge):not(.section__title) > a:not(.btn):focus, +.block--intro-text .block--intro-text__content *:not(.badge):not(.section__title) > a:not(.btn):hover, +.block--intro-text .block--intro-text__content *:not(.badge):not(.section__title) > a:not(.btn):focus, +.block-inline-blockkpi-analytics .field--name-body *:not(.badge):not(.section__title) > a:not(.btn):hover, +.block-inline-blockkpi-analytics .field--name-body *:not(.badge):not(.section__title) > a:not(.btn):focus, +.basic-block .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):hover, +.basic-block .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):focus, +.hero--dashboard .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):hover, +.hero--dashboard .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):focus, +.certificate-footer .bottom *:not(.badge):not(.section__title) > a:not(.btn):hover, +.certificate-footer .bottom *:not(.badge):not(.section__title) > a:not(.btn):focus, +.certificate-header .description *:not(.badge):not(.section__title) > a:not(.btn):hover, +.certificate-header .description *:not(.badge):not(.section__title) > a:not(.btn):focus { + text-decoration: none; +} + .comment__text p a:not(.btn) { - font-weight: 400; text-decoration: underline; } +.comment__text p a:not(.btn):hover, .comment__text p a:not(.btn):focus { + text-decoration: none; +} + blockquote { border-left: 3px solid #29abe2; } diff --git a/assets/css/brand.css b/assets/css/brand.css index c21d5907..2ce6163c 100644 --- a/assets/css/brand.css +++ b/assets/css/brand.css @@ -3,7 +3,6 @@ --secondary-color: #1f80aa; --accent-color: #ffc142; --accent-color--text: #343434; - --link-color: #33b5e5; } [type="radio"]:checked + label:before { @@ -228,52 +227,31 @@ fieldset[disabled] .btn-accent.focus { border-color: #1f80aa; } -.field--name-field-introduction-text *:not(.badge):not(.section__title) > a:not(.btn):hover, .field--name-field-introduction-text *:not(.badge):not(.section__title) > a:not(.btn):focus, -.field--name-field-featured-items-description *:not(.badge):not(.section__title) > a:not(.btn):hover, -.field--name-field-featured-items-description *:not(.badge):not(.section__title) > a:not(.btn):focus, -.field--name-field-featured-description *:not(.badge):not(.section__title) > a:not(.btn):hover, -.field--name-field-featured-description *:not(.badge):not(.section__title) > a:not(.btn):focus, -.field--name-field-accord-description *:not(.badge):not(.section__title) > a:not(.btn):hover, -.field--name-field-accord-description *:not(.badge):not(.section__title) > a:not(.btn):focus, -.field--name-field-accord-item-description *:not(.badge):not(.section__title) > a:not(.btn):hover, -.field--name-field-accord-item-description *:not(.badge):not(.section__title) > a:not(.btn):focus, -.field--name-field-phase-description *:not(.badge):not(.section__title) > a:not(.btn):hover, -.field--name-field-phase-description *:not(.badge):not(.section__title) > a:not(.btn):focus, -.quiz-form__text *:not(.badge):not(.section__title) > a:not(.btn):hover, -.quiz-form__text *:not(.badge):not(.section__title) > a:not(.btn):focus, -.scorm-form--body *:not(.badge):not(.section__title) > a:not(.btn):hover, -.scorm-form--body *:not(.badge):not(.section__title) > a:not(.btn):focus, -.body-text *:not(.badge):not(.section__title) > a:not(.btn):hover, -.body-text *:not(.badge):not(.section__title) > a:not(.btn):focus, -.paragraph--type--image-text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):hover, -.paragraph--type--image-text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):focus, -.paragraph--type--text-image .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):hover, -.paragraph--type--text-image .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):focus, -.paragraph--type--text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):hover, -.paragraph--type--text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):focus, -.course-full .card__body *:not(.badge):not(.section__title) > a:not(.btn):hover, -.course-full .card__body *:not(.badge):not(.section__title) > a:not(.btn):focus, -.teaser--course *:not(.badge):not(.section__title) > a:not(.btn):hover, -.teaser--course *:not(.badge):not(.section__title) > a:not(.btn):focus, -.block--intro-text .block--intro-text__content *:not(.badge):not(.section__title) > a:not(.btn):hover, -.block--intro-text .block--intro-text__content *:not(.badge):not(.section__title) > a:not(.btn):focus, -.block-inline-blockkpi-analytics .field--name-body *:not(.badge):not(.section__title) > a:not(.btn):hover, -.block-inline-blockkpi-analytics .field--name-body *:not(.badge):not(.section__title) > a:not(.btn):focus, -.basic-block .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):hover, -.basic-block .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):focus, -.hero--dashboard .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):hover, -.hero--dashboard .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):focus, -.certificate-footer .bottom *:not(.badge):not(.section__title) > a:not(.btn):hover, -.certificate-footer .bottom *:not(.badge):not(.section__title) > a:not(.btn):focus, -.certificate-header .description *:not(.badge):not(.section__title) > a:not(.btn):hover, -.certificate-header .description *:not(.badge):not(.section__title) > a:not(.btn):focus { - -webkit-text-decoration-color: #33b5e5; - text-decoration-color: #33b5e5; -} - -.comment__text p a:not(.btn):hover, .comment__text p a:not(.btn):focus { - -webkit-text-decoration-color: #33b5e5; - text-decoration-color: #33b5e5; +.field--name-field-introduction-text *:not(.badge):not(.section__title) > a:not(.btn), +.field--name-field-featured-items-description *:not(.badge):not(.section__title) > a:not(.btn), +.field--name-field-featured-description *:not(.badge):not(.section__title) > a:not(.btn), +.field--name-field-accord-description *:not(.badge):not(.section__title) > a:not(.btn), +.field--name-field-accord-item-description *:not(.badge):not(.section__title) > a:not(.btn), +.field--name-field-phase-description *:not(.badge):not(.section__title) > a:not(.btn), +.quiz-form__text *:not(.badge):not(.section__title) > a:not(.btn), +.scorm-form--body *:not(.badge):not(.section__title) > a:not(.btn), +.body-text *:not(.badge):not(.section__title) > a:not(.btn), +.paragraph--type--image-text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn), +.paragraph--type--text-image .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn), +.paragraph--type--text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn), +.course-full .card__body *:not(.badge):not(.section__title) > a:not(.btn), +.teaser--course *:not(.badge):not(.section__title) > a:not(.btn), +.block--intro-text .block--intro-text__content *:not(.badge):not(.section__title) > a:not(.btn), +.block-inline-blockkpi-analytics .field--name-body *:not(.badge):not(.section__title) > a:not(.btn), +.basic-block .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn), +.hero--dashboard .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn), +.certificate-footer .bottom *:not(.badge):not(.section__title) > a:not(.btn), +.certificate-header .description *:not(.badge):not(.section__title) > a:not(.btn) { + color: #33b5e5; +} + +.comment__text p a:not(.btn) { + color: #33b5e5; } blockquote { @@ -824,14 +802,8 @@ body.media-directory .dz-preview .dz-progress .dz-upload { } .ck.ck-content a:not(.btn) { - font-weight: 400; text-decoration: underline; -} - -.ck.ck-content a:not(.btn):hover, .ck.ck-content a:not(.btn):focus { - cursor: pointer; - -webkit-text-decoration-color: #33b5e5; - text-decoration-color: #33b5e5; + color: #33b5e5; } .ck.ck-content blockquote { diff --git a/assets/css/ckeditor.css b/assets/css/ckeditor.css index 97101ab2..b334aa84 100644 --- a/assets/css/ckeditor.css +++ b/assets/css/ckeditor.css @@ -258,29 +258,26 @@ fieldset[disabled] .btn--linkedin.focus { border-color: #0077b5; } -.btn.btn--google { - -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.25); - color: rgba(0, 0, 0, 0.54); - background: url("../../components/02-atoms/button/icons/google_signin_buttons/google-sign-in.svg") no-repeat 9px center; -} - -.btn.btn--google:hover, .btn.btn--google:focus { - outline: 4px solid rgba(66, 133, 244, 0.3); -} - -.btn.btn--google:active { - background-color: #eee; +.btn--google { + color: #fff; + background-color: #d34836; + border-color: #d34836; + fill: #fff; } -.btn.btn--google:disabled, .btn.btn--google[disabled] { - color: rgba(0, 0, 0, 0.4); - background-color: rgba(0, 0, 0, 0.08); - background-image: url("../../components/02-atoms/button/icons/google_signin_buttons/google-sign-in-disabled.svg"); +.btn--google:focus, .btn--google.focus, .btn--google:hover, .btn--google:active, .btn--google.active, +.open > .btn--google.dropdown-toggle { + background-color: #b03626; + border-color: #a73425; + color: #fff; } -.btn.btn--google:disabled:hover, .btn.btn--google:disabled:focus, .btn.btn--google[disabled]:hover, .btn.btn--google[disabled]:focus, .btn.btn--google:active:hover, .btn.btn--google:active:focus { - outline: none; +.btn--google.disabled:hover, .btn--google.disabled:focus, .btn--google.disabled.focus, .btn--google[disabled]:hover, .btn--google[disabled]:focus, .btn--google[disabled].focus, +fieldset[disabled] .btn--google:hover, +fieldset[disabled] .btn--google:focus, +fieldset[disabled] .btn--google.focus { + background-color: #d34836; + border-color: #d34836; } .btn--twitter { @@ -317,6 +314,15 @@ fieldset[disabled] .btn--twitter.focus { border-radius: 10px; } +.meta-addtocal .btn { + margin-right: 5px; + margin-bottom: 3px; + padding: 5px 10px; + border-radius: 5px !important; + font-size: 0.75rem; + line-height: 1.5; +} + body { font-family: "montserrat", sans-serif; font-weight: 400; @@ -324,39 +330,14 @@ body { } a:not(.btn) { - font-weight: 400; text-decoration: underline; - color: #343434; + color: #33b5e5; } -a:not(.btn):hover, a:not(.btn):focus { - cursor: pointer; - -webkit-text-decoration-color: var(--link-color); - text-decoration-color: var(--link-color); +a:not(.btn):hover { + color: #178ab4; } :lang(ar) { font-family: "Almarai", "montserrat", sans-serif; } - -@media (max-width: 599px) { - .social-auth-buttons > .card__block { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; - } - .social-auth-buttons > .card__block .btn { - -webkit-box-ordinal-group: 2; - -ms-flex-order: 1; - order: 1; - } - .social-auth-buttons > .card__block .btn.btn--google { - -webkit-box-ordinal-group: 1; - -ms-flex-order: 0; - order: 0; - } -} diff --git a/assets/css/preview.css b/assets/css/preview.css index 3643bfd2..90ba8210 100644 --- a/assets/css/preview.css +++ b/assets/css/preview.css @@ -119,21 +119,65 @@ pre { .hero--dashboard .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn), .certificate-footer .bottom *:not(.badge):not(.section__title) > a:not(.btn), .certificate-header .description *:not(.badge):not(.section__title) > a:not(.btn) { - font-weight: 400; text-decoration: underline; } +.field--name-field-introduction-text *:not(.badge):not(.section__title) > a:not(.btn):hover, .field--name-field-introduction-text *:not(.badge):not(.section__title) > a:not(.btn):focus, +.field--name-field-featured-items-description *:not(.badge):not(.section__title) > a:not(.btn):hover, +.field--name-field-featured-items-description *:not(.badge):not(.section__title) > a:not(.btn):focus, +.field--name-field-featured-description *:not(.badge):not(.section__title) > a:not(.btn):hover, +.field--name-field-featured-description *:not(.badge):not(.section__title) > a:not(.btn):focus, +.field--name-field-accord-description *:not(.badge):not(.section__title) > a:not(.btn):hover, +.field--name-field-accord-description *:not(.badge):not(.section__title) > a:not(.btn):focus, +.field--name-field-accord-item-description *:not(.badge):not(.section__title) > a:not(.btn):hover, +.field--name-field-accord-item-description *:not(.badge):not(.section__title) > a:not(.btn):focus, +.field--name-field-phase-description *:not(.badge):not(.section__title) > a:not(.btn):hover, +.field--name-field-phase-description *:not(.badge):not(.section__title) > a:not(.btn):focus, +.paragraph--type--image-text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):hover, +.paragraph--type--image-text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):focus, +.paragraph--type--text-image .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):hover, +.paragraph--type--text-image .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):focus, +.paragraph--type--text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):hover, +.paragraph--type--text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):focus, +.scorm-form--body *:not(.badge):not(.section__title) > a:not(.btn):hover, +.scorm-form--body *:not(.badge):not(.section__title) > a:not(.btn):focus, +.quiz-form__text *:not(.badge):not(.section__title) > a:not(.btn):hover, +.quiz-form__text *:not(.badge):not(.section__title) > a:not(.btn):focus, +.course-full .card__body *:not(.badge):not(.section__title) > a:not(.btn):hover, +.course-full .card__body *:not(.badge):not(.section__title) > a:not(.btn):focus, +.teaser--course *:not(.badge):not(.section__title) > a:not(.btn):hover, +.teaser--course *:not(.badge):not(.section__title) > a:not(.btn):focus, +.body-text *:not(.badge):not(.section__title) > a:not(.btn):hover, +.body-text *:not(.badge):not(.section__title) > a:not(.btn):focus, +.block--intro-text .block--intro-text__content *:not(.badge):not(.section__title) > a:not(.btn):hover, +.block--intro-text .block--intro-text__content *:not(.badge):not(.section__title) > a:not(.btn):focus, +.block-inline-blockkpi-analytics .field--name-body *:not(.badge):not(.section__title) > a:not(.btn):hover, +.block-inline-blockkpi-analytics .field--name-body *:not(.badge):not(.section__title) > a:not(.btn):focus, +.basic-block .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):hover, +.basic-block .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):focus, +.hero--dashboard .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):hover, +.hero--dashboard .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):focus, +.certificate-footer .bottom *:not(.badge):not(.section__title) > a:not(.btn):hover, +.certificate-footer .bottom *:not(.badge):not(.section__title) > a:not(.btn):focus, +.certificate-header .description *:not(.badge):not(.section__title) > a:not(.btn):hover, +.certificate-header .description *:not(.badge):not(.section__title) > a:not(.btn):focus { + text-decoration: none; +} + .comment__text p a:not(.btn) { - font-weight: 400; text-decoration: underline; } +.comment__text p a:not(.btn):hover, .comment__text p a:not(.btn):focus { + text-decoration: none; +} + blockquote { border-left: 3px solid #29abe2; } strong { - font-weight: 600; + font-weight: 500; } :lang(ar) { @@ -1040,29 +1084,26 @@ fieldset[disabled] .btn--linkedin.focus { border-color: #0077b5; } -.btn.btn--google { - -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.25); - color: rgba(0, 0, 0, 0.54); - background: url("../../components/02-atoms/button/icons/google_signin_buttons/google-sign-in.svg") no-repeat 9px center; -} - -.btn.btn--google:hover, .btn.btn--google:focus { - outline: 4px solid rgba(66, 133, 244, 0.3); -} - -.btn.btn--google:active { - background-color: #eee; +.btn--google { + color: #fff; + background-color: #d34836; + border-color: #d34836; + fill: #fff; } -.btn.btn--google:disabled, .btn.btn--google[disabled] { - color: rgba(0, 0, 0, 0.4); - background-color: rgba(0, 0, 0, 0.08); - background-image: url("../../components/02-atoms/button/icons/google_signin_buttons/google-sign-in-disabled.svg"); +.btn--google:focus, .btn--google.focus, .btn--google:hover, .btn--google:active, .btn--google.active, +.open > .btn--google.dropdown-toggle { + background-color: #b03626; + border-color: #a73425; + color: #fff; } -.btn.btn--google:disabled:hover, .btn.btn--google:disabled:focus, .btn.btn--google[disabled]:hover, .btn.btn--google[disabled]:focus, .btn.btn--google:active:hover, .btn.btn--google:active:focus { - outline: none; +.btn--google.disabled:hover, .btn--google.disabled:focus, .btn--google.disabled.focus, .btn--google[disabled]:hover, .btn--google[disabled]:focus, .btn--google[disabled].focus, +fieldset[disabled] .btn--google:hover, +fieldset[disabled] .btn--google:focus, +fieldset[disabled] .btn--google.focus { + background-color: #d34836; + border-color: #d34836; } .btn--twitter { @@ -1099,6 +1140,15 @@ fieldset[disabled] .btn--twitter.focus { border-radius: 10px; } +.meta-addtocal .btn { + margin-right: 5px; + margin-bottom: 3px; + padding: 5px 10px; + border-radius: 5px !important; + font-size: 0.75rem; + line-height: 1.5; +} + .card { border-top-left-radius: 10px; border-bottom-left-radius: 10px; @@ -1120,6 +1170,20 @@ fieldset[disabled] .btn--twitter.focus { margin-right: 7px; } +.block--custom-content-list .card__title .content-list__type { + display: none; + /* temporary style */ + width: 14px; + height: 14px; + margin-right: 1rem; + fill: #555; + /* $$gray */ +} + +.block--custom-content-list .card__actionbar { + text-align: center; +} + .region--complementary .card__title, .region--complementary .card__actionbar, .paragraph--block .secondary-col .card__title, @@ -1725,10 +1789,6 @@ fieldset strong { max-width: 375px; } -.field--type-address fieldset.card { - margin-top: 0; -} - .field--name-field-enroll-method { width: auto; max-width: none; @@ -2039,20 +2099,6 @@ fieldset strong { color: #343434; } -.teaser .flag-follow-user { - position: relative; -} - -.teaser .flag-follow-user .js-flag-message { - display: none; -} - -.teaser .flag-follow-user .ajax-throbber { - position: absolute; - top: 4px; - right: 10px; -} - .comments { background: #f3f3f3; border-radius: 10px; @@ -2074,7 +2120,7 @@ fieldset strong { } .photoswipe-gallery-custom .field--item .file-link a { - font-weight: 600; + font-weight: 500; } .cover { @@ -2120,28 +2166,6 @@ fieldset strong { background: white; } -.hero-action-button .dropdown-menu { - left: auto; - right: 0; - margin: 12px 0 0; - padding: 12px 0; - border-radius: 12px; - -webkit-box-shadow: 2px 4px 12px 0 rgba(0, 0, 0, 0.08); - box-shadow: 2px 4px 12px 0 rgba(0, 0, 0, 0.08); -} - -.hero-action-button .dropdown-menu li:not(:last-child) { - margin-bottom: 8px; -} - -.hero-action-button .dropdown-menu li a { - padding: 0 28px; - font-size: 1rem; - font-weight: 500; - line-height: 24px; - color: #343434; -} - .stream-icon-new { background: #1f80aa; } @@ -2186,14 +2210,6 @@ fieldset strong { padding: 0 1rem; } -:root { - --primary-color: #29abe2; - --secondary-color: #1f80aa; - --accent-color: #ffc142; - --accent-color--text: #343434; - --link-color: #33b5e5; -} - [type="radio"]:checked + label:before { border-color: #29abe2; } @@ -2226,7 +2242,6 @@ fieldset strong { } .cover, -.cover.search-grid--hero, .read-indicator, .select2-container--social .select2-results__option--highlighted[aria-selected], .select2-container--social .select2-results__option[aria-selected=true], @@ -2250,19 +2265,6 @@ fieldset strong { fill: #29abe2; } -.search-grid--hero .form-wrapper .btn-group:before { - background: #29abe2; -} - -.search-grid--hero .form-wrapper .btn-group .dropdown-toggle .caret { - border-bottom-color: #29abe2; - border-top-color: #29abe2; -} - -.search-grid--hero .form-wrapper .btn-group .form-submit { - color: #29abe2; -} - .form-control:focus { border-color: #29abe2; -webkit-box-shadow: 0 2px 0 0 #29abe2; @@ -2416,52 +2418,31 @@ fieldset[disabled] .btn-accent.focus { border-color: #1f80aa; } -.field--name-field-introduction-text *:not(.badge):not(.section__title) > a:not(.btn):hover, .field--name-field-introduction-text *:not(.badge):not(.section__title) > a:not(.btn):focus, -.field--name-field-featured-items-description *:not(.badge):not(.section__title) > a:not(.btn):hover, -.field--name-field-featured-items-description *:not(.badge):not(.section__title) > a:not(.btn):focus, -.field--name-field-featured-description *:not(.badge):not(.section__title) > a:not(.btn):hover, -.field--name-field-featured-description *:not(.badge):not(.section__title) > a:not(.btn):focus, -.field--name-field-accord-description *:not(.badge):not(.section__title) > a:not(.btn):hover, -.field--name-field-accord-description *:not(.badge):not(.section__title) > a:not(.btn):focus, -.field--name-field-accord-item-description *:not(.badge):not(.section__title) > a:not(.btn):hover, -.field--name-field-accord-item-description *:not(.badge):not(.section__title) > a:not(.btn):focus, -.field--name-field-phase-description *:not(.badge):not(.section__title) > a:not(.btn):hover, -.field--name-field-phase-description *:not(.badge):not(.section__title) > a:not(.btn):focus, -.quiz-form__text *:not(.badge):not(.section__title) > a:not(.btn):hover, -.quiz-form__text *:not(.badge):not(.section__title) > a:not(.btn):focus, -.scorm-form--body *:not(.badge):not(.section__title) > a:not(.btn):hover, -.scorm-form--body *:not(.badge):not(.section__title) > a:not(.btn):focus, -.body-text *:not(.badge):not(.section__title) > a:not(.btn):hover, -.body-text *:not(.badge):not(.section__title) > a:not(.btn):focus, -.paragraph--type--image-text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):hover, -.paragraph--type--image-text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):focus, -.paragraph--type--text-image .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):hover, -.paragraph--type--text-image .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):focus, -.paragraph--type--text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):hover, -.paragraph--type--text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn):focus, -.course-full .card__body *:not(.badge):not(.section__title) > a:not(.btn):hover, -.course-full .card__body *:not(.badge):not(.section__title) > a:not(.btn):focus, -.teaser--course *:not(.badge):not(.section__title) > a:not(.btn):hover, -.teaser--course *:not(.badge):not(.section__title) > a:not(.btn):focus, -.block--intro-text .block--intro-text__content *:not(.badge):not(.section__title) > a:not(.btn):hover, -.block--intro-text .block--intro-text__content *:not(.badge):not(.section__title) > a:not(.btn):focus, -.block-inline-blockkpi-analytics .field--name-body *:not(.badge):not(.section__title) > a:not(.btn):hover, -.block-inline-blockkpi-analytics .field--name-body *:not(.badge):not(.section__title) > a:not(.btn):focus, -.basic-block .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):hover, -.basic-block .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):focus, -.hero--dashboard .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):hover, -.hero--dashboard .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn):focus, -.certificate-footer .bottom *:not(.badge):not(.section__title) > a:not(.btn):hover, -.certificate-footer .bottom *:not(.badge):not(.section__title) > a:not(.btn):focus, -.certificate-header .description *:not(.badge):not(.section__title) > a:not(.btn):hover, -.certificate-header .description *:not(.badge):not(.section__title) > a:not(.btn):focus { - -webkit-text-decoration-color: #33b5e5; - text-decoration-color: #33b5e5; +.field--name-field-introduction-text *:not(.badge):not(.section__title) > a:not(.btn), +.field--name-field-featured-items-description *:not(.badge):not(.section__title) > a:not(.btn), +.field--name-field-featured-description *:not(.badge):not(.section__title) > a:not(.btn), +.field--name-field-accord-description *:not(.badge):not(.section__title) > a:not(.btn), +.field--name-field-accord-item-description *:not(.badge):not(.section__title) > a:not(.btn), +.field--name-field-phase-description *:not(.badge):not(.section__title) > a:not(.btn), +.quiz-form__text *:not(.badge):not(.section__title) > a:not(.btn), +.scorm-form--body *:not(.badge):not(.section__title) > a:not(.btn), +.body-text *:not(.badge):not(.section__title) > a:not(.btn), +.paragraph--type--image-text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn), +.paragraph--type--text-image .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn), +.paragraph--type--text .field--name-field-text *:not(.badge):not(.section__title) > a:not(.btn), +.course-full .card__body *:not(.badge):not(.section__title) > a:not(.btn), +.teaser--course *:not(.badge):not(.section__title) > a:not(.btn), +.block--intro-text .block--intro-text__content *:not(.badge):not(.section__title) > a:not(.btn), +.block-inline-blockkpi-analytics .field--name-body *:not(.badge):not(.section__title) > a:not(.btn), +.basic-block .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn), +.hero--dashboard .field--name-field-text-block *:not(.badge):not(.section__title) > a:not(.btn), +.certificate-footer .bottom *:not(.badge):not(.section__title) > a:not(.btn), +.certificate-header .description *:not(.badge):not(.section__title) > a:not(.btn) { + color: #33b5e5; } -.comment__text p a:not(.btn):hover, .comment__text p a:not(.btn):focus { - -webkit-text-decoration-color: #33b5e5; - text-decoration-color: #33b5e5; +.comment__text p a:not(.btn) { + color: #33b5e5; } blockquote { @@ -2751,23 +2732,13 @@ html:not(.js) .navbar-default .dropdown:hover > button .navbar-nav__icon { background-color: #ffc142; } -.social-gtranslate-list--mobile { - background-color: #333333; - fill: #ffffff; -} - -.social-gtranslate-list--mobile:hover, .social-gtranslate-list--mobile:focus, .social-gtranslate-list--mobile.open { - fill: #f3f3f3; - background-color: #1f1f1f; -} - -.social-gtranslate-list--desktop { +.social-gtranslate-list--desktop > a { + color: #ffffff; background-color: #333333; } -.social-gtranslate-list--desktop > a { +.social-gtranslate-list--desktop > a:after { color: #ffffff; - background-color: #333333; } .social-gtranslate-list--desktop > a .select-icon { @@ -2780,6 +2751,10 @@ html:not(.js) .navbar-default .dropdown:hover > button .navbar-nav__icon { background-color: #1f1f1f; } +.social-gtranslate-list--desktop > a:focus:after, .social-gtranslate-list--desktop > a:hover:after { + color: #f3f3f3; +} + .social-gtranslate-list--desktop > a:focus .select-icon, .social-gtranslate-list--desktop > a:hover .select-icon { fill: #f3f3f3; } @@ -2790,6 +2765,10 @@ html:not(.js) .navbar-default .dropdown:hover > button .navbar-nav__icon { background-color: #1f1f1f; } +.social-gtranslate-list--desktop.open > a:after { + color: #f3f3f3; +} + .social-gtranslate-list--desktop.open > a .select-icon { fill: #f3f3f3; } @@ -2800,6 +2779,10 @@ html:not(.js) .navbar-default .dropdown:hover > button .navbar-nav__icon { background-color: #1f1f1f; } +.social-gtranslate-list--desktop.open > a:focus:after, .social-gtranslate-list--desktop.open > a:hover:after { + color: #f3f3f3; +} + .social-gtranslate-list--desktop.open > a:focus .select-icon, .social-gtranslate-list--desktop.open > a:hover .select-icon { fill: #f3f3f3; } @@ -2831,6 +2814,10 @@ html:not(.js) .navbar-default .dropdown:hover > button .navbar-nav__icon { fill: #002f67; } +#sliding-popup { + background-color: #1f7ea7 !important; +} + .marker-cluster:after, .marker-cluster-small:after { background: #1f80aa; @@ -2889,8 +2876,7 @@ html:not(.js) .navbar-default .dropdown:hover > button .navbar-nav__icon { fill: #ffc142; } -.badge.badge-primary, -.node--unpublished__label { +.badge.badge-primary { background-color: #29abe2; } @@ -2994,42 +2980,6 @@ html:not(.js) .navbar-default .dropdown:hover > button .navbar-nav__icon { background: #29abe2; } -.addtocal-list li .calendar-link a { - color: #29abe2; -} - -.profile-preview-link:hover:before { - border-color: #29abe2; -} - -body.media-directory .dropzone .dz-message, -body.media-directory .dropzone .dz-preview:not(.dz-error) { - border-color: #29abe2; -} - -body.media-directory .dz-preview .dz-progress .dz-upload { - background: #29abe2; -} - -.ck.ck-content a:not(.btn) { - font-weight: 400; - text-decoration: underline; -} - -.ck.ck-content a:not(.btn):hover, .ck.ck-content a:not(.btn):focus { - cursor: pointer; - -webkit-text-decoration-color: #33b5e5; - text-decoration-color: #33b5e5; -} - -.ck.ck-content blockquote { - border-left-color: #29abe2; -} - -.files-list .active-highlighted:before { - border-color: #29abe2; -} - @media (min-width: 600px) { .teaser__image { border-top-left-radius: inherit; @@ -3076,25 +3026,6 @@ body.media-directory .dz-preview .dz-progress .dz-upload { } @media (max-width: 599px) { - .social-auth-buttons > .card__block { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; - } - .social-auth-buttons > .card__block .btn { - -webkit-box-ordinal-group: 2; - -ms-flex-order: 1; - order: 1; - } - .social-auth-buttons > .card__block .btn.btn--google { - -webkit-box-ordinal-group: 1; - -ms-flex-order: 0; - order: 0; - } .field--name-field-social-collaboration-editors table tbody td .form-type-select, .field--name-field-event-managers table tbody td .form-type-select, .field--name-field-social-idea-coauthors table tbody td .form-type-select, diff --git a/color/preview.js b/color/preview.js index 673d218b..939c4dc5 100644 --- a/color/preview.js +++ b/color/preview.js @@ -78,20 +78,7 @@ $colorPreview.find('.btn-accent, .badge-accent').css('color', $colorPalette.find('input[name="palette[brand-accent-text]"]').val()); // Brand link color. - $colorPreview.find('.body-text a:not(.btn)').css('text-decoration-color', $colorPalette.find('input[name="palette[brand-primary]"]').val()); - $colorPreview.find('.body-text a:not(.btn)') - .hover(function () { - $(this).css('color', $colorPalette.find('input[name="palette[brand-primary]"]').val()); - }).mouseout(function () { - $(this).css('color', 'inherit'); - }); - $colorPreview.find('.body-text a:not(.btn)') - .focus(function () { - console.log(123); - $(this).css('color', $colorPalette.find('input[name="palette[brand-primary]"]').val()); - }).focusout(function () { - $(this).css('color', 'inherit'); - }); + $colorPreview.find('.body-text a:not(.btn)').css('color', $colorPalette.find('input[name="palette[brand-link]"]').val()); // Hero toggle background. var localStorage = window.localStorage; diff --git a/components/00-config/mixins/_links.scss b/components/00-config/mixins/_links.scss index 6dd7242d..d4fd8d2d 100644 --- a/components/00-config/mixins/_links.scss +++ b/components/00-config/mixins/_links.scss @@ -1,6 +1,11 @@ @mixin link-default() { - font-weight: 400; - text-decoration: underline; - @content + text-decoration: underline; + + &:hover, + &:focus { + text-decoration: none; + } + + @content } diff --git a/components/03-molecules/wysiwyg/ckeditor.scss b/components/03-molecules/wysiwyg/ckeditor.scss index bdde6ba7..43541411 100644 --- a/components/03-molecules/wysiwyg/ckeditor.scss +++ b/components/03-molecules/wysiwyg/ckeditor.scss @@ -10,14 +10,11 @@ body { } a:not(.btn) { - font-weight: 400; text-decoration: underline; - color: #343434; + color: $link-color; - &:hover, - &:focus { - cursor: pointer; - text-decoration-color: var(--link-color); + &:hover { + color: $link-hover-color; } } diff --git a/components/brand.scss b/components/brand.scss index 098e6387..633fed92 100644 --- a/components/brand.scss +++ b/components/brand.scss @@ -8,7 +8,7 @@ --accent-color: #{$brand-accent}; --accent-color--text: #{$brand-accent-text}; - --link-color: #{$brand-link}; + //--link-color: #{$brand-link}; //--navbar-default-link-color: #{$navbar-default-link-color}; //--navbar-default-link-active-color: #{$navbar-default-link-active-color}; //--navbar-default-link-active-bg: #{$navbar-default-link-active-bg}; @@ -269,19 +269,13 @@ .certificate-footer .bottom, .certificate-header .description { *:not(.badge):not(.section__title) > a:not(.btn) { - &:hover, - &:focus { - text-decoration-color: $brand-link; - } + color: $brand-link; } } .comment__text p { a:not(.btn) { - &:hover, - &:focus { - text-decoration-color: $brand-link; - } + color: $brand-link; } } @@ -986,14 +980,8 @@ body.media-directory { // Link style a:not(.btn) { - font-weight: 400; text-decoration: underline; - - &:hover, - &:focus { - cursor: pointer; - text-decoration-color: $brand-link; - } + color: $link-color; } // Blockquote diff --git a/socialblue.info.yml b/socialblue.info.yml index 6b7d2d36..04f7ab8c 100644 --- a/socialblue.info.yml +++ b/socialblue.info.yml @@ -83,7 +83,6 @@ libraries-extend: ckeditor_stylesheets: - assets/css/ckeditor.css - - assets/css/brand.css # Special stylesheets for CKEditor5 to use while editing. ckeditor5-stylesheets: false -- GitLab