Commit 4098d2d5 authored by Gábor Hojtsy's avatar Gábor Hojtsy
Browse files

Issue #3111468 by bnjmnm, lauriii: Decouple Stable libraries from Bartik/Seven/Claro/Umami

parent bf4e48d3
......@@ -56,11 +56,11 @@
}
/* Styling for the status indicator of the passwords match test. */
.password-confirm .ok {
.password-confirm-message .ok {
color: #325e1c;
font-weight: bold;
}
.password-confirm .error {
.password-confirm-message .error {
color: #a51b00;
font-weight: bold;
}
/**
* @file
* Provides theme function for Ajax-related markup.
*
* This file is a temporary addition to the theme to override
* stable/drupal.ajax. This is to help surface potential issues that may arise
* once the theme no longer depends on stable/drupal.ajax.
* @todo delete this file in https://drupal.org/node/3111468
*/
(($, Drupal) => {
/**
* Provide a wrapper for the AJAX progress bar element.
*
* @param {jQuery} $element
* Progress bar element.
* @return {string}
* The HTML markup for the progress bar.
*/
Drupal.theme.ajaxProgressBar = $element =>
$('<div class="ajax-progress ajax-progress-bar"></div>').append($element);
})(jQuery, Drupal);
/**
* DO NOT EDIT THIS FILE.
* See the following change record for more information,
* https://www.drupal.org/node/2815083
* @preserve
**/
(function ($, Drupal) {
Drupal.theme.ajaxProgressBar = function ($element) {
return $('<div class="ajax-progress ajax-progress-bar"></div>').append($element);
};
})(jQuery, Drupal);
\ No newline at end of file
/**
* @file
* Theme elements for user password forms.
*
* This file is a temporary addition to the theme to override
* stable/drupal.user. This is to help surface potential issues that may arise
* once the theme no longer depends on stable/drupal.user.
*/
(Drupal => {
/**
* Constructs a password confirm message element
*
* @return {string}
* A string representing a DOM fragment.
*/
Drupal.theme.passwordConfirmMessage = translate =>
`<div aria-live="polite" aria-atomic="true" class="password-confirm-message js-password-confirm-message">${translate.confirmTitle} <span></span></div>`;
})(Drupal);
/**
* DO NOT EDIT THIS FILE.
* See the following change record for more information,
* https://www.drupal.org/node/2815083
* @preserve
**/
(function (Drupal) {
Drupal.theme.passwordConfirmMessage = function (translate) {
return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm-message js-password-confirm-message\">".concat(translate.confirmTitle, " <span></span></div>");
};
})(Drupal);
\ No newline at end of file
......@@ -25,9 +25,17 @@ libraries-override:
theme:
layouts/fourcol_section/fourcol_section.css: layouts/fourcol_section/fourcol_section.css
# @todo remove this library override in https://drupal.org/node/3111468
stable/drupal.ajax: umami/empty
# @todo remove this library override in https://drupal.org/node/3111468
stable/drupal.user: umami/empty
libraries-extend:
tour/tour-styling:
- umami/demo-umami-tour
# @todo remove this library extend in https://drupal.org/node/3111468
core/drupal.ajax:
- umami/temporary.ajax
core/drupal.dialog:
- umami/classy.dialog
core/drupal.dropbutton:
......@@ -43,7 +51,7 @@ libraries-extend:
media_library/widget:
- umami/classy.media_library
user/drupal.user:
- umami/classy.user
- umami/user
regions:
pre_header: Pre-header
......
# Drupal throws an IncompleteLibraryDefinitionException if a base theme defined
# library is set to false in a subtheme's libraries-override. This empty library
# is used as a workaround.
# @see https://www.drupal.org/node/3098375
# @todo remove this in https://drupal.org/node/3111468
empty:
version: VERSION
css: {}
global:
version: VERSION
css:
......@@ -76,6 +85,15 @@ two-columns:
layout:
css/layout/layout-2-col.css: {}
user:
version: VERSION
css:
component:
css/components/user/user.css: { weight: -10 }
js:
# @todo remove this file from library in https://drupal.org/node/3111468
js/user.theme.temporary.js: {}
webfonts-open-sans:
remote: https://fonts.google.com
license:
......@@ -230,8 +248,10 @@ classy.search-results:
component:
css/classy/components/search-results.css: {}
classy.user:
# @todo remove library in https://drupal.org/node/3111468
temporary.ajax:
version: VERSION
css:
component:
css/classy/components/user.css: { weight: -10 }
js:
js/ajax.temporary.js: {}
dependencies:
- core/jquery
......@@ -148,7 +148,6 @@ public function providerTestClassyCopies() {
'tabs.css',
'textarea.css',
'ui-dialog.css',
'user.css',
],
'js' => [
'media_embed_ckeditor.theme.es6.js',
......@@ -411,7 +410,6 @@ public function providerTestClassyCopies() {
'tabs.css',
'textarea.css',
'ui-dialog.css',
'user.css',
],
'js' => [
'media_embed_ckeditor.theme.es6.js',
......@@ -532,7 +530,6 @@ public function providerTestClassyCopies() {
'book-navigation.css',
'tableselect.css',
'ui-dialog.css',
'user.css',
'item-list.css',
'field.css',
'tablesort.css',
......
......@@ -23,7 +23,16 @@ libraries:
- core/normalize
- bartik/global-styling
libraries-override:
# @todo remove this library override in https://drupal.org/node/3111468
stable/drupal.ajax: bartik/empty
# @todo remove this library override in https://drupal.org/node/3111468
stable/drupal.user: bartik/empty
libraries-extend:
# @todo remove this library extend in https://drupal.org/node/3111468
# core/drupal.ajax:
# - bartik/temporary.ajax
core/drupal.dialog:
- bartik/classy.dialog
core/drupal.dropbutton:
......@@ -39,7 +48,7 @@ libraries-extend:
media_library/widget:
- bartik/classy.media_library
user/drupal.user:
- bartik/classy.user
- bartik/user
ckeditor_stylesheets:
- css/base/elements.css
......
# Drupal throws an IncompleteLibraryDefinitionException if a base theme defined
# library is set to false in a subtheme's libraries-override. This empty library
# is used as a workaround.
# @see https://www.drupal.org/node/3098375
# @todo remove this in https://drupal.org/node/3111468
empty:
version: VERSION
css: {}
global-styling:
version: VERSION
css:
......@@ -114,6 +123,15 @@ classy.base:
css/classy/components/textarea.css: { weight: -10 }
css/classy/components/ui-dialog.css: { weight: -10 }
user:
version: VERSION
css:
component:
css/components/user.css: { weight: -10 }
js:
# @todo remove this file from library in https://drupal.org/node/3111468
js/user.theme.temporary.js: {}
classy.book-navigation:
version: VERSION
css:
......@@ -185,8 +203,10 @@ classy.search-results:
component:
css/classy/components/search-results.css: {}
classy.user:
# @todo remove library in https://drupal.org/node/3111468
temporary.ajax:
version: VERSION
css:
component:
css/classy/components/user.css: { weight: -10 }
js:
js/ajax.temporary.js: {}
dependencies:
- core/jquery
......@@ -56,11 +56,11 @@
}
/* Styling for the status indicator of the passwords match test. */
.password-confirm .ok {
.password-confirm-message .ok {
color: #325e1c;
font-weight: bold;
}
.password-confirm .error {
.password-confirm-message .error {
color: #a51b00;
font-weight: bold;
}
/**
* @file
* Provides theme function for Ajax-related markup.
*
* This file is a temporary addition to the theme to override
* stable/drupal.ajax. This is to help surface potential issues that may arise
* once the theme no longer depends on stable/drupal.ajax.
* @todo delete this file in https://drupal.org/node/3111468
*/
(($, Drupal) => {
/**
* Provide a wrapper for the AJAX progress bar element.
*
* @param {jQuery} $element
* Progress bar element.
* @return {string}
* The HTML markup for the progress bar.
*/
Drupal.theme.ajaxProgressBar = $element =>
$('<div class="ajax-progress ajax-progress-bar"></div>').append($element);
})(jQuery, Drupal);
/**
* DO NOT EDIT THIS FILE.
* See the following change record for more information,
* https://www.drupal.org/node/2815083
* @preserve
**/
(function ($, Drupal) {
Drupal.theme.ajaxProgressBar = function ($element) {
return $('<div class="ajax-progress ajax-progress-bar"></div>').append($element);
};
})(jQuery, Drupal);
\ No newline at end of file
/**
* @file
* Theme elements for user password forms.
*
* This file is a temporary addition to the theme to override
* stable/drupal.user. This is to help surface potential issues that may arise
* once the theme no longer depends on stable/drupal.user.
*/
(Drupal => {
/**
* Constructs a password confirm message element
*
* @return {string}
* A string representing a DOM fragment.
*/
Drupal.theme.passwordConfirmMessage = translate =>
`<div aria-live="polite" aria-atomic="true" class="password-confirm-message js-password-confirm-message">${translate.confirmTitle} <span></span></div>`;
})(Drupal);
/**
* DO NOT EDIT THIS FILE.
* See the following change record for more information,
* https://www.drupal.org/node/2815083
* @preserve
**/
(function (Drupal) {
Drupal.theme.passwordConfirmMessage = function (translate) {
return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm-message js-password-confirm-message\">".concat(translate.confirmTitle, " <span></span></div>");
};
})(Drupal);
\ No newline at end of file
......@@ -119,6 +119,8 @@ libraries-extend:
- claro/drupal.shortcut
core/drupal.ajax:
- claro/ajax
# @todo remove claro/temporary.ajax in https://drupal.org/node/3111468
- claro/temporary.ajax
views/views.module:
- claro/views
media/media_embed_ckeditor_theme:
......
......@@ -317,3 +317,11 @@ classy.search-results:
css:
component:
css/classy/components/search-results.css: {}
# @todo remove library in https://drupal.org/node/3111468
temporary.ajax:
version: VERSION
js:
js/ajax.temporary.js: {}
dependencies:
- core/jquery
/**
* @file
* Provides theme function for Ajax-related markup.
*
* This file is a temporary addition to the theme to override
* stable/drupal.ajax. This is to help surface potential issues that may arise
* once the theme no longer depends on stable/drupal.ajax.
* @todo delete this file in https://drupal.org/node/3111468
*/
(($, Drupal) => {
/**
* Provide a wrapper for the AJAX progress bar element.
*
* @param {jQuery} $element
* Progress bar element.
* @return {string}
* The HTML markup for the progress bar.
*/
Drupal.theme.ajaxProgressBar = $element =>
$('<div class="ajax-progress ajax-progress-bar"></div>').append($element);
})(jQuery, Drupal);
/**
* DO NOT EDIT THIS FILE.
* See the following change record for more information,
* https://www.drupal.org/node/2815083
* @preserve
**/
(function ($, Drupal) {
Drupal.theme.ajaxProgressBar = function ($element) {
return $('<div class="ajax-progress ajax-progress-bar"></div>').append($element);
};
})(jQuery, Drupal);
\ No newline at end of file
......@@ -56,11 +56,11 @@
}
/* Styling for the status indicator of the passwords match test. */
.password-confirm .ok {
.password-confirm-message .ok {
color: #325e1c;
font-weight: bold;
}
.password-confirm .error {
.password-confirm-message .error {
color: #a51b00;
font-weight: bold;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment