diff -u b/core/includes/theme.inc b/core/includes/theme.inc --- b/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -210,10 +210,10 @@ } drupal_render($css); - // Do basically the same as the above for scripts + // Do basically the same as the above for libraries $final_libraries = array(); - // Grab scripts from base theme + // Grab libraries from base theme foreach ($base_theme as $base) { if (!empty($base->libraries)) { foreach ($base->libraries as $library) { @@ -222,19 +222,19 @@ } } - // Add scripts used by this theme. + // Add libraries used by this theme. if (!empty($theme->libraries)) { foreach ($theme->libraries as $library) { $final_libraries[] = $library; } } - // Add scripts used by this theme. - $js = array(); + // Add libraries used by this theme. + $libraries = array(); foreach ($final_libraries as $library) { - $js['#attached']['library'][] = $library; + $libraries['#attached']['library'][] = $library; } - drupal_render($js); + drupal_render($libraries); $theme_engine = NULL; diff -u b/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml --- b/core/themes/bartik/bartik.info.yml +++ b/core/themes/bartik/bartik.info.yml @@ -4,11 +4,17 @@ package: Core version: VERSION core: 8.x -libraries: - - bartik/base +# @todo use library version once color module is fixed #2228745 +#libraries: +# - bartik/base +# stylesheets: all: + - css/layout.css + - css/style.css - css/colors.css + print: + - css/print.css ckeditor_stylesheets: - css/ckeditor-iframe.css regions: diff -u b/core/themes/bartik/bartik.libraries.yml b/core/themes/bartik/bartik.libraries.yml --- b/core/themes/bartik/bartik.libraries.yml +++ b/core/themes/bartik/bartik.libraries.yml @@ -4,6 +4,7 @@ theme: css/layout.css: {} css/style.css: {} + css/colors.css: {} css/print.css: { media: print } maintenance_page: