diff --git a/css/ckeditor-iframe.css b/css/ckeditor-iframe.css deleted file mode 100755 index 22ec3d4..0000000 --- a/css/ckeditor-iframe.css +++ /dev/null @@ -1,39 +0,0 @@ -@charset "UTF-8"; -/** - * @file - * Approximate CLF's style in CKEditor instances on the Drupal back-end. - */ -/* Captions */ -.caption > * { - background: #f3f3f3; - padding: 0.5ex; - border: 1px solid #ccc; -} - -.caption > figcaption { - border: 1px solid #ccc; - border-top: none; - padding-top: 0.5ex; - font-size: small; - text-align: center; -} - -/* Override clf's default blockquote and pre styles when captioned. */ -.caption-pre > pre, -.caption-blockquote > blockquote { - margin: 0; -} - -.caption-blockquote > figcaption::before { - content: "— "; -} - -.caption-blockquote > figcaption { - text-align: left; -} - -[dir=rtl] .caption-blockquote > figcaption { - text-align: right; -} - -/*# sourceMappingURL=ckeditor-iframe.css.map */ diff --git a/css/ckeditor5-iframe.css b/css/ckeditor5.css similarity index 84% rename from css/ckeditor5-iframe.css rename to css/ckeditor5.css index 8f48feb..3312028 100644 --- a/css/ckeditor5-iframe.css +++ b/css/ckeditor5.css @@ -4,10 +4,6 @@ * Approximate CLF's style in CKEditor instances on the Drupal back-end. */ .ck-content { - /** - * @file - * Approximate CLF's style in CKEditor instances on the Drupal back-end. - */ /* Captions */ /* Override clf's default blockquote and pre styles when captioned. */ } @@ -37,4 +33,4 @@ text-align: right; } -/*# sourceMappingURL=ckeditor5-iframe.css.map */ +/*# sourceMappingURL=ckeditor5.css.map */ diff --git a/css/components/action-links.css b/css/components/action-links.css index 274d798..7e648df 100644 --- a/css/components/action-links.css +++ b/css/components/action-links.css @@ -29,13 +29,13 @@ text-decoration: none; line-height: 160%; } -.button-action:before { +.button-action::before { margin-left: -0.1em; /* LTR */ padding-right: 0.2em; /* LTR */ content: "+"; font-weight: 900; } -[dir="rtl"] .button-action:before { +[dir="rtl"] .button-action::before { margin-right: -0.1em; margin-left: 0; padding-right: 0; diff --git a/css/components/book-navigation.css b/css/components/book-navigation.css deleted file mode 100644 index 08728e2..0000000 --- a/css/components/book-navigation.css +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @file - * Styling for the Book module. - */ - -.book-navigation .menu { - padding-top: 1em; - padding-bottom: 0; -} -.book-navigation .book-pager { - overflow: auto; - margin: 0; - padding: 0.5em 0; -} -.book-pager__item { - display: inline-block; - list-style-type: none; - vertical-align: top; -} -.book-pager__item--previous { - width: 45%; - text-align: left; /* LTR */ -} -[dir="rtl"] .book-pager__item--previous { - float: right; - text-align: right; -} -.book-pager__item--center { - width: 8%; - text-align: center; -} -.book-pager__item--next { - float: right; /* LTR */ - width: 45%; - text-align: right; /* LTR */ -} -[dir="rtl"] .book-pager__item--next { - float: left; - text-align: left; -} diff --git a/css/components/breadcrumb.css b/css/components/breadcrumb.css index 1e6a7fa..1a20eaf 100644 --- a/css/components/breadcrumb.css +++ b/css/components/breadcrumb.css @@ -21,9 +21,9 @@ list-style-type: none; } /* IE8 does not support :not() and :last-child. */ -.breadcrumb li:before { +.breadcrumb li::before { content: " \BB "; } -.breadcrumb li:first-child:before { +.breadcrumb li:first-child::before { content: none; } diff --git a/css/components/collapse-processed.css b/css/components/collapse-processed.css deleted file mode 100644 index aca4c29..0000000 --- a/css/components/collapse-processed.css +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file - * Visual styles for collapsible fieldsets. - */ - -.collapse-processed > summary { - padding-right: 0.5em; - padding-left: 0.5em; -} -.collapse-processed > summary:before { - float: left; /* LTR */ - width: 1em; - height: 1em; - content: ""; - background: url(../../img/misc/menu-expanded.png) 0 100% no-repeat; /* LTR */ -} -[dir="rtl"] .collapse-processed > summary:before { - float: right; - background-position: 100% 100%; -} -.collapse-processed:not([open]) > summary:before { - -ms-transform: rotate(-90deg); - -webkit-transform: rotate(-90deg); - transform: rotate(-90deg); - background-position: 25% 35%; /* LTR */ -} -[dir="rtl"] .collapse-processed:not([open]) > summary:before { - -ms-transform: rotate(90deg); - -webkit-transform: rotate(90deg); - transform: rotate(90deg); - background-position: 75% 35%; -} diff --git a/css/components/container-inline.css b/css/components/container-inline.css index 64b78f6..1a91f17 100644 --- a/css/components/container-inline.css +++ b/css/components/container-inline.css @@ -3,12 +3,12 @@ * Inline items. */ -.container-inline label:after, -.container-inline .label:after { +.container-inline label::after, +.container-inline .label::after { content: ":"; } -.form-type-radios .container-inline label:after, -.form-type-checkboxes .container-inline label:after { +.form-type-radios .container-inline label::after, +.form-type-checkboxes .container-inline label::after { content: ""; } .form-type-radios .container-inline .form-type-radio, diff --git a/css/components/details.css b/css/components/details.css index a546363..b4165dc 100644 --- a/css/components/details.css +++ b/css/components/details.css @@ -14,9 +14,6 @@ details { details > .details-wrapper { padding: 0.5em 1.5em; } -/* @todo Regression: The summary of uncollapsible details are no longer - vertically aligned with the .details-wrapper in browsers without native - details support. */ summary { padding: 0.2em 0.5em; cursor: pointer; diff --git a/css/components/dialog.css b/css/components/dialog.css index 1afb1db..700b1a2 100644 --- a/css/components/dialog.css +++ b/css/components/dialog.css @@ -13,7 +13,8 @@ background: #fff; } -@media all and (max-width: 48em) { /* 768px */ +@media all and (max-width: 48em) { + /* 768px */ .ui-dialog { width: 92% !important; } @@ -62,7 +63,7 @@ opacity: 0.9; border-radius: 7px; background-color: #232323; - background-image: url(../../img/misc/loading-small.gif); + background-image: url(../../img/icons/loading-small.gif); background-repeat: no-repeat; background-position: center center; } diff --git a/css/components/form.css b/css/components/form.css index d4cdcb0..e3dced1 100644 --- a/css/components/form.css +++ b/css/components/form.css @@ -70,7 +70,7 @@ label.option { .marker { color: #e00; } -.form-required:after { +.form-required::after { display: inline-block; width: 6px; height: 6px; @@ -78,7 +78,7 @@ label.option { content: ""; vertical-align: super; /* Use a background image to prevent screen readers from announcing the text. */ - background-image: url(../../img/icons/ee0000/required.svg); + background-image: url(../../img/icons/required.svg); background-repeat: no-repeat; background-size: 6px 6px; } @@ -93,12 +93,12 @@ abbr.ajax-changed { } /* Inline error messages. */ -.form-item--error-message:before { +.form-item--error-message::before { display: inline-block; width: 14px; height: 14px; content: ""; vertical-align: sub; - background: url(../../img/icons/e32700/error.svg) no-repeat; + background: url(../../img/icons/error.svg) no-repeat; background-size: contain; } diff --git a/css/components/forum.css b/css/components/forum.css deleted file mode 100644 index 824cd27..0000000 --- a/css/components/forum.css +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @file - * Styling for the Forum module. - */ - -.forum__description { - margin: 0.5em; - font-size: 0.9em; -} -.forum__icon { - float: left; /* LTR */ - width: 24px; - height: 24px; - margin: 0 9px 0 0; /* LTR */ - background-image: url(../../img/icons/forum-icons.png); - background-repeat: no-repeat; -} -[dir="rtl"] .forum__icon { - float: right; - margin: 0 0 0 9px; -} -.forum__title { - overflow: hidden; -} -.forum .indented { - margin-left: 20px; /* LTR */ -} -[dir="rtl"] .forum .indented { - margin-right: 20px; - margin-left: 0; -} -.forum__topic-status--new { - background-position: -24px 0; -} -.forum__topic-status--hot { - background-position: -48px 0; -} -.forum__topic-status--hot-new { - background-position: -72px 0; -} -.forum__topic-status--sticky { - background-position: -96px 0; -} -.forum__topic-status--closed { - background-position: -120px 0; -} diff --git a/css/components/icons.css b/css/components/icons.css index bed1bc9..c83cc44 100644 --- a/css/components/icons.css +++ b/css/components/icons.css @@ -5,7 +5,7 @@ .icon-help { padding: 1px 0 1px 20px; /* LTR */ - background: url(../../img/misc/help.png) 0 50% no-repeat; /* LTR */ + background: url(../../img/icons/help.png) 0 50% no-repeat; /* LTR */ } [dir="rtl"] .icon-help { padding: 1px 20px 1px 0; @@ -17,5 +17,5 @@ width: 16px; height: 16px; text-indent: -9999px; - background: url(../../img/misc/feed.svg) no-repeat; + background: url(../../img/icons/feed.svg) no-repeat; } diff --git a/css/components/image-widget.css b/css/components/image-widget.css index 56777c4..72e52a2 100644 --- a/css/components/image-widget.css +++ b/css/components/image-widget.css @@ -1,17 +1,6 @@ /** * @file * Image upload widget. - * - * This CSS file is not used in this theme (Classy). It was intended to be used, - * but due to a bug, Drupal 8 shipped with it not being used. To not break - * backwards compatibility, we continue to not load it in Classy. Every - * subtheme of Classy is encouraged to use it, by attaching the - * classy/image-widget asset library in their image-widget.html.twig file. - * - * @see core/themes/seven/templates/content-edit/image-widget.html.twig. - * - * @todo In Drupal 9, let core/themes/classy/templates/content-edit/image-widget.html.twig - * attach the classy/image-widget asset library. */ .image-preview { diff --git a/css/components/media-embed-error.css b/css/components/media-embed-error.css deleted file mode 100644 index 1125d5e..0000000 --- a/css/components/media-embed-error.css +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * Media Embed filter: default styling for media embed errors. - */ - -/** - * The caption filter's styling overrides ours, so add a more specific selector - * to account for that. - */ -.media-embed-error, -.caption > .media-embed-error { - max-width: 200px; - padding: 100px 20px 20px; - text-align: center; - background-color: #ebebeb; - background-image: url(../../img/icons/no-thumbnail.png); - background-repeat: no-repeat; - background-position: center top; - background-size: 100px 100px; -} diff --git a/css/components/menu.css b/css/components/menu.css index 8cf72a6..a0783e3 100644 --- a/css/components/menu.css +++ b/css/components/menu.css @@ -16,14 +16,14 @@ ul.menu { } .menu-item--expanded { list-style-type: circle; - list-style-image: url(../../img/misc/menu-expanded.png); + list-style-image: url(../../img/icons/menu-expanded.png); } .menu-item--collapsed { list-style-type: disc; - list-style-image: url(../../img/misc/menu-collapsed.png); /* LTR */ + list-style-image: url(../../img/icons/menu-collapsed.png); /* LTR */ } [dir="rtl"] .menu-item--collapsed { - list-style-image: url(../../img/misc/menu-collapsed-rtl.png); + list-style-image: url(../../img/icons/menu-collapsed-rtl.png); } .menu-item { margin: 0; diff --git a/css/components/messages.css b/css/components/messages.css index bc7c1e2..c4f5d2c 100644 --- a/css/components/messages.css +++ b/css/components/messages.css @@ -7,9 +7,9 @@ padding: 15px 20px 15px 35px; /* LTR */ word-wrap: break-word; border: 1px solid; - border-width: 1px 1px 1px 0; /* LTR */ + border-width: 1px 1px 1px 0; /* LTR */ border-radius: 2px; - background: no-repeat 10px 17px; /* LTR */ + background: no-repeat 10px 17px; /* LTR */ overflow-wrap: break-word; } [dir="rtl"] .messages { @@ -30,12 +30,11 @@ .messages__item + .messages__item { margin-top: 0.769em; } -/* See .color-success in Seven's colors.css */ .messages--status { color: #325e1c; - border-color: #c9e1bd #c9e1bd #c9e1bd transparent; /* LTR */ + border-color: #c9e1bd #c9e1bd #c9e1bd transparent; /* LTR */ background-color: #f3faef; - background-image: url(../../img/icons/73b355/check.svg); + background-image: url(../../img/icons/check.svg); box-shadow: -8px 0 0 #77b259; /* LTR */ } [dir="rtl"] .messages--status { @@ -43,24 +42,22 @@ border-color: #c9e1bd transparent #c9e1bd #c9e1bd; box-shadow: 8px 0 0 #77b259; } -/* See .color-warning in Seven's colors.css */ .messages--warning { color: #734c00; - border-color: #f4daa6 #f4daa6 #f4daa6 transparent; /* LTR */ + border-color: #f4daa6 #f4daa6 #f4daa6 transparent; /* LTR */ background-color: #fdf8ed; - background-image: url(../../img/icons/e29700/warning.svg); + background-image: url(../../img/icons/warning.svg); box-shadow: -8px 0 0 #e09600; /* LTR */ } [dir="rtl"] .messages--warning { border-color: #f4daa6 transparent #f4daa6 #f4daa6; box-shadow: 8px 0 0 #e09600; } -/* See .color-error in Seven's colors.css */ .messages--error { color: #a51b00; - border-color: #f9c9bf #f9c9bf #f9c9bf transparent; /* LTR */ + border-color: #f9c9bf #f9c9bf #f9c9bf transparent; /* LTR */ background-color: #fcf4f2; - background-image: url(../../img/icons/e32700/error.svg); + background-image: url(../../img/icons/error.svg); box-shadow: -8px 0 0 #e62600; /* LTR */ } [dir="rtl"] .messages--error { diff --git a/css/components/progress.css b/css/components/progress.css index 47da889..f8561b2 100644 --- a/css/components/progress.css +++ b/css/components/progress.css @@ -9,7 +9,6 @@ border-color: #b3b3b3; border-radius: 10em; background-color: #f2f1eb; - background-image: -webkit-linear-gradient(#e7e7df, #f0f0f0); background-image: linear-gradient(#e7e7df, #f0f0f0); box-shadow: inset 0 1px 3px hsla(0, 0%, 0%, 0.16); } @@ -21,23 +20,16 @@ -webkit-transition: width 0.5s ease-out; transition: width 0.5s ease-out; -webkit-animation: animate-stripes 3s linear infinite; - -moz-animation: animate-stripes 3s linear infinite; border: 1px #07629a solid; border-radius: 10em; background: #057ec9; - background-image: - -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15)), - -webkit-linear-gradient(left top, #0094f0 0%, #0094f0 25%, #007ecc 25%, #007ecc 50%, #0094f0 50%, #0094f0 75%, #0094f0 100%); - background-image: - linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15)), - linear-gradient(to right bottom, #0094f0 0%, #0094f0 25%, #007ecc 25%, #007ecc 50%, #0094f0 50%, #0094f0 75%, #0094f0 100%); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15)), linear-gradient(to right bottom, #0094f0 0%, #0094f0 25%, #007ecc 25%, #007ecc 50%, #0094f0 50%, #0094f0 75%, #0094f0 100%); background-size: 40px 40px; } [dir="rtl"] .progress__bar { margin-right: -1px; margin-left: 0; -webkit-animation-direction: reverse; - -moz-animation-direction: reverse; animation-direction: reverse; } @@ -46,24 +38,21 @@ -webkit-transition: none; transition: none; -webkit-animation: none; - -moz-animation: none; } } /** * Progress bar animations. */ -@-webkit-keyframes animate-stripes { - 0% { background-position: 0 0, 0 0; } - 100% { background-position: 0 0, -80px 0; } -} - -@-ms-keyframes animate-stripes { - 0% { background-position: 0 0, 0 0; } - 100% { background-position: 0 0, -80px 0; } -} - @keyframes animate-stripes { - 0% { background-position: 0 0, 0 0; } - 100% { background-position: 0 0, -80px 0; } + 0% { + background-position: + 0 0, + 0 0; + } + 100% { + background-position: + 0 0, + -80px 0; + } } diff --git a/css/components/ui-dialog.css b/css/components/ui-dialog.css index 476c21f..164ca86 100644 --- a/css/components/ui-dialog.css +++ b/css/components/ui-dialog.css @@ -1,6 +1,6 @@ /** * @file - * Styles for Classy's modal windows. + * Styles for modal windows. */ .ui-dialog--narrow { diff --git a/css/components/user.css b/css/components/user.css index 8baa8f8..7892fd6 100644 --- a/css/components/user.css +++ b/css/components/user.css @@ -29,7 +29,8 @@ .password-confirm, .password-field, .password-strength, -.password-confirm-match { +.password-confirm-match, +.password-confirm-message { width: 55%; } diff --git a/css/layout/media-library.css b/css/layout/media-library.css deleted file mode 100644 index 84dee10..0000000 --- a/css/layout/media-library.css +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @file - * Contains minimal layout styling for the media library. - */ - -.media-library-wrapper { - display: flex; -} - -.media-library-menu { - flex-basis: 20%; - flex-shrink: 0; -} - -.media-library-content { - flex-grow: 1; -} - -.media-library-views-form { - display: flex; - flex-wrap: wrap; -} - -.media-library-views-form .media-library-item { - justify-content: space-between; - max-width: 23%; - margin: 1%; -} diff --git a/css/local-tasks.css b/css/local-tasks.css old mode 100755 new mode 100644 diff --git a/css/maintenance-page.css b/css/maintenance-page.css old mode 100755 new mode 100644 diff --git a/galactus.info.yml b/galactus.info.yml index 4e7ec22..cfbce7b 100644 --- a/galactus.info.yml +++ b/galactus.info.yml @@ -3,10 +3,12 @@ type: theme 'base theme': false description: 'Galactus is a Drupal base theme that provides integration with the UBC CLF (Common Look and Feel) for UBC-branded units. We recommend against using this theme for any customizations or modifications. If you require a customized UBC CLF theme, please consider the Drupal CLF theme' package: ubc-web-services -version: '2.1.0' -core_version_requirement: ^9.4 || ^10 -generator: 'starterkit_theme:9.5.1' +version: '3.0.0' +core_version_requirement: '>=10' + +generator: 'starterkit_theme:11.0.1' starterkit: true + libraries: - galactus/messages - core/normalize @@ -23,17 +25,9 @@ libraries-extend: - galactus/file core/drupal.progress: - galactus/progress - media/media_embed_ckeditor_theme: - - galactus/media_embed_ckeditor_theme - media_library/view: - - galactus/media_library - media_library/widget: - - galactus/media_library -ckeditor_stylesheets: - - css/components/media-embed-error.css - - css/ckeditor-iframe.css + ckeditor5-stylesheets: - - css/ckeditor5-iframe.css + - css/ckeditor5.css regions: primary_menu: 'Primary menu' diff --git a/galactus.libraries.yml b/galactus.libraries.yml index 6f1af6e..3a5423e 100644 --- a/galactus.libraries.yml +++ b/galactus.libraries.yml @@ -1,12 +1,9 @@ -# galactus.libraries.yml - base: css: component: css/components/action-links.css: {} css/components/breadcrumb.css: {} css/components/button.css: {} - css/components/collapse-processed.css: {} css/components/container-inline.css: {} css/components/details.css: {} css/components/exposed-filters.css: {} @@ -26,10 +23,7 @@ base: css/components/tabs.css: {} css/components/textarea.css: {} css/components/ui-dialog.css: {} -book-navigation: - css: - component: - css/components/book-navigation.css: {} + dialog: css: component: @@ -42,10 +36,6 @@ file: css: component: css/components/file.css: {} -forum: - css: - component: - css/components/forum.css: {} image-widget: css: component: @@ -54,10 +44,6 @@ indented: css: component: css/components/indented.css: {} -media_library: - css: - layout: - css/layout/media-library.css: {} messages: css: component: @@ -78,13 +64,6 @@ user: css: component: css/components/user.css: {} -media_embed_error: - css: - component: - css/components/media-embed-error.css: {} -media_embed_ckeditor_theme: - js: - js/media_embed_ckeditor.theme.js: {} ### Global Styles & Scripts ### global: diff --git a/galactus.theme b/galactus.theme index 1c42125..cb9ca10 100644 --- a/galactus.theme +++ b/galactus.theme @@ -438,3 +438,36 @@ function galactus_preprocess_image_widget(array &$variables) { unset($data['preview']); } } + +/** + * Implements template_preprocess_HOOK() for fieldset. + */ +function galactus_preprocess_fieldset(&$variables) { + $element = $variables['element']; + $composite_types = ['checkboxes', 'radios']; + + if (!empty($element['#type']) && in_array($element['#type'], $composite_types) && !empty($variables['element']['#children_errors'])) { + $variables['legend_span']['attributes']->addClass('has-error'); + } + + if (!empty($element['#disabled'])) { + $variables['legend_span']['attributes']->addClass('is-disabled'); + + if (!empty($variables['description']) && !empty($variables['description']['attributes'])) { + $variables['description']['attributes']->addClass('is-disabled'); + } + } + + // Remove 'container-inline' class from the main attributes and add a flag + // instead. + // @todo Remove this after https://www.drupal.org/node/3059593 has been + // resolved. + if (!empty($variables['attributes']['class'])) { + $container_inline_key = array_search('container-inline', $variables['attributes']['class']); + + if ($container_inline_key !== FALSE) { + unset($variables['attributes']['class'][$container_inline_key]); + $variables['inline_items'] = TRUE; + } + } +} diff --git a/img/icons/73b355/check.svg b/img/icons/check.svg similarity index 100% rename from img/icons/73b355/check.svg rename to img/icons/check.svg diff --git a/img/icons/e32700/error.svg b/img/icons/error.svg similarity index 100% rename from img/icons/e32700/error.svg rename to img/icons/error.svg diff --git a/img/misc/feed.svg b/img/icons/feed.svg similarity index 100% rename from img/misc/feed.svg rename to img/icons/feed.svg diff --git a/img/misc/help.png b/img/icons/help.png similarity index 100% rename from img/misc/help.png rename to img/icons/help.png diff --git a/img/misc/loading-small.gif b/img/icons/loading-small.gif similarity index 100% rename from img/misc/loading-small.gif rename to img/icons/loading-small.gif diff --git a/img/misc/menu-collapsed-rtl.png b/img/icons/menu-collapsed-rtl.png similarity index 100% rename from img/misc/menu-collapsed-rtl.png rename to img/icons/menu-collapsed-rtl.png diff --git a/img/misc/menu-collapsed.png b/img/icons/menu-collapsed.png similarity index 100% rename from img/misc/menu-collapsed.png rename to img/icons/menu-collapsed.png diff --git a/img/misc/menu-expanded.png b/img/icons/menu-expanded.png similarity index 100% rename from img/misc/menu-expanded.png rename to img/icons/menu-expanded.png diff --git a/img/icons/ee0000/required.svg b/img/icons/required.svg similarity index 100% rename from img/icons/ee0000/required.svg rename to img/icons/required.svg diff --git a/img/icons/e29700/warning.svg b/img/icons/warning.svg similarity index 100% rename from img/icons/e29700/warning.svg rename to img/icons/warning.svg diff --git a/js/media_embed_ckeditor.theme.es6.js b/js/media_embed_ckeditor.theme.es6.js deleted file mode 100644 index a33d18f..0000000 --- a/js/media_embed_ckeditor.theme.es6.js +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file - * Classy theme overrides for the Media Embed CKEditor plugin. - */ - -((Drupal) => { - /** - * Themes the error displayed when the media embed preview fails. - * - * @param {string} error - * The error message to display - * - * @return {string} - * A string representing a DOM fragment. - * - * @see media-embed-error.html.twig - */ - Drupal.theme.mediaEmbedPreviewError = () => - `
`; -})(Drupal); diff --git a/js/media_embed_ckeditor.theme.js b/js/media_embed_ckeditor.theme.js deleted file mode 100644 index 0b9d959..0000000 --- a/js/media_embed_ckeditor.theme.js +++ /dev/null @@ -1,12 +0,0 @@ -/** -* DO NOT EDIT THIS FILE. -* See the following change record for more information, -* https://www.drupal.org/node/2815083 -* @preserve -**/ - -(function (Drupal) { - Drupal.theme.mediaEmbedPreviewError = function () { - return " "); - }; -})(Drupal); \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 002d949..6214a4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, + "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -26,6 +27,7 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -38,6 +40,7 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, + "license": "MIT", "dependencies": { "fill-range": "^7.1.1" }, @@ -50,6 +53,7 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, + "license": "MIT", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -74,6 +78,7 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -87,6 +92,7 @@ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -100,6 +106,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -108,16 +115,18 @@ } }, "node_modules/immutable": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz", - "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==", - "dev": true + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", + "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", + "dev": true, + "license": "MIT" }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, + "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -130,6 +139,7 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -139,6 +149,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -151,6 +162,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -160,6 +172,7 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -169,6 +182,7 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -181,6 +195,7 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -193,6 +208,7 @@ "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz", "integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==", "dev": true, + "license": "MIT", "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", @@ -210,6 +226,7 @@ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -219,6 +236,7 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, diff --git a/sass/ckeditor-iframe.scss b/sass/ckeditor-iframe.scss deleted file mode 100644 index 8c9b6b6..0000000 --- a/sass/ckeditor-iframe.scss +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file - * Approximate CLF's style in CKEditor instances on the Drupal back-end. - */ - -/* Captions */ -.caption > * { - background: #f3f3f3; - padding: 0.5ex; - border: 1px solid #ccc; -} - -.caption > figcaption { - border: 1px solid #ccc; - border-top: none; - padding-top: 0.5ex; - font-size: small; - text-align: center; -} - -/* Override clf's default blockquote and pre styles when captioned. */ -.caption-pre > pre, -.caption-blockquote > blockquote { - margin: 0; -} -.caption-blockquote > figcaption::before { - content: "— "; -} -.caption-blockquote > figcaption { - text-align: left; -} -[dir="rtl"] .caption-blockquote > figcaption { - text-align: right; -} diff --git a/sass/ckeditor5-iframe.scss b/sass/ckeditor5-iframe.scss deleted file mode 100644 index f82f92d..0000000 --- a/sass/ckeditor5-iframe.scss +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @file - * Approximate CLF's style in CKEditor instances on the Drupal back-end. - */ - -.ck-content { - @import 'ckeditor-iframe'; -} diff --git a/sass/ckeditor5.scss b/sass/ckeditor5.scss new file mode 100644 index 0000000..760c1de --- /dev/null +++ b/sass/ckeditor5.scss @@ -0,0 +1,36 @@ +/** + * @file + * Approximate CLF's style in CKEditor instances on the Drupal back-end. + */ + +.ck-content { + /* Captions */ + .caption > * { + background: #f3f3f3; + padding: 0.5ex; + border: 1px solid #ccc; + } + + .caption > figcaption { + border: 1px solid #ccc; + border-top: none; + padding-top: 0.5ex; + font-size: small; + text-align: center; + } + + /* Override clf's default blockquote and pre styles when captioned. */ + .caption-pre > pre, + .caption-blockquote > blockquote { + margin: 0; + } + .caption-blockquote > figcaption::before { + content: "— "; + } + .caption-blockquote > figcaption { + text-align: left; + } + [dir="rtl"] .caption-blockquote > figcaption { + text-align: right; + } +} diff --git a/templates/block/block--search-form-block.html.twig b/templates/block/block--search-form-block.html.twig old mode 100755 new mode 100644 index 661eadc..9709c10 --- a/templates/block/block--search-form-block.html.twig +++ b/templates/block/block--search-form-block.html.twig @@ -1,31 +1,38 @@ -{# % extends "@classy/block--search-form-block.html.twig" % #} {# /** * @file - * clf's theme implementation for a search form block. + * Theme override for the search form block. * * Available variables: + * - plugin_id: The ID of the block implementation. + * - label: The configured label of the block if visible. + * - configuration: A list of the block's configuration values, including: + * - label: The configured label for the block. + * - label_display: The display settings for the label. + * - provider: The module or other provider that provided this block plugin. + * - Block plugin specific settings will also be stored here. + * - in_preview: Whether the plugin is being rendered in preview mode. * - content: The content of this block. - * - content_attributes: A list of HTML attributes applied to the main content + * - attributes: A list HTML attributes populated by modules, intended to + * be added to the main container tag of this template. Includes: + * - id: A valid HTML ID and guaranteed unique. + * - title_attributes: Same as attributes, except applied to the main title * tag that appears in the template. + * - title_prefix: Additional output populated by modules, intended to be + * displayed in front of the main title tag that appears in the template. + * - title_suffix: Additional output populated by modules, intended to be + * displayed after the main title tag that appears in the template. * * @see template_preprocess_block() * @see search_preprocess_block() - * - * @ingroup themeable */ #} -{# % block content %} -{{ 'Forum'|t }} | -{{ 'Topics'|t }} | -{{ 'Posts'|t }} | -{{ 'Last post'|t }} | -|||
---|---|---|---|---|---|---|
- {#
- Enclose the contents of this cell with X divs, where X is the
- depth this forum resides at. This will allow us to use CSS
- left-margin for indenting.
- #}
- {% if forum.depth > 0 %}{% for i in 1..forum.depth %} {% endfor %}{% endif %}
- {% endfor %}{% endif %}
-
- {{ forum.icon_title }}
-
-
- {% if forum.description.value %}
- {{ forum.description.value }}
- {% endif %}
- {% if forum.depth > 0 %}{% for i in 1..forum.depth %} |
- {% if forum.is_container == false %}
-
- {{ forum.num_topics }}
- {% if forum.new_topics == true %}
- - {{ forum.new_text }} - {% endif %} - |
- {{ forum.num_posts }} | -{{ forum.last_reply }} | - {% endif %} -