diff --git a/radix.info.yml b/radix.info.yml index c8a8b60..5ec8c67 100644 --- a/radix.info.yml +++ b/radix.info.yml @@ -1,22 +1,17 @@ name: Radix +type: theme +base theme: classy description: Radix is a base theme for Drupal with Bootstrap and Sass. screenshot: screenshot.png core: 8.x -stylesheets: - all: - - assets/stylesheets/radix-style.css - print: - - assets/stylesheets/radix-print.css -stylesheets-remove: - - system.theme.css - - system.menus.css libraries: - radix/bootstrap - radix/base +stylesheets-remove: + - system.theme.css + - system.menus.css regions: primary_menu: 'Primary menu' content: 'Content' -features: version: VERSION engine: twig -type: theme diff --git a/radix.libraries.yml b/radix.libraries.yml index 375e584..796c04a 100644 --- a/radix.libraries.yml +++ b/radix.libraries.yml @@ -7,4 +7,9 @@ base: version: VERSION js: assets/javascripts/modernizr.js: {} - assets/javascripts/radix-script.js: {} \ No newline at end of file + assets/javascripts/radix-script.js: {} + css: + theme: + assets/stylesheets/radix-style.css: {} + assets/stylesheets/radix-print.css: {media: print} + diff --git a/radix.theme b/radix.theme index 867e79b..2910de2 100644 --- a/radix.theme +++ b/radix.theme @@ -16,24 +16,12 @@ require_once dirname(__FILE__) . '/includes/view.inc'; require_once dirname(__FILE__) . '/includes/admin.inc'; require_once dirname(__FILE__) . '/includes/contrib.inc'; -use Drupal\Core\Page\MetaElement; use Drupal\Core\Menu\MenuTreeParameters; /** * Implementation of template_preprocess_html(). */ function radix_preprocess_html(&$variables) { - $page = $variables['page_object']; - - // Add meta for Bootstrap Responsive. - // - $attributes = array( - 'name' => 'viewport', - 'content' => 'width=device-width, initial-scale=1.0', - ); - $metatag = new MetaElement(NULL, $attributes); - $page->addMetaElement($metatag); - // Add some custom classes for panels pages. if (\Drupal::moduleHandler()->moduleExists('page_manager') && count(page_manager_get_current_page())) { $variables['is_panel'] = TRUE; diff --git a/templates/system/html.html.twig b/templates/system/html.html.twig deleted file mode 100644 index d9f8ad6..0000000 --- a/templates/system/html.html.twig +++ /dev/null @@ -1,46 +0,0 @@ -{# -/** - * @file - * Default theme implementation for the basic structure of a single Drupal page. - * - * Variables: - * - css: A list of CSS files for the current page. - * - head: Markup for the HEAD element (including meta tags, keyword tags, and - * so on). - * - head_title: A modified version of the page title, for use in the TITLE tag. - * - head_title_array: List of text elements that make up the head_title - * variable. May contain or more of the following: - * - title: The title of the page. - * - name: The name of the site. - * - slogan: The slogan of the site. - * - page_top: Initial rendered markup. This should be printed before 'page'. - * - page: The rendered page markup. - * - page_bottom: Closing rendered markup. This variable should be printed after - * 'page'. - * - styles: Style tags necessary to import all necessary CSS files in the head. - * - scripts: Script tags necessary to load the JavaScript files and settings - * in the head. - * - * @see template_preprocess_html() - * - * @ingroup themeable - */ -#} - - - - {{ page.head }} - {{ head_title }} - {{ page.styles }} - {{ page.scripts }} - - - -{{ page_top }} -{{ page.content }} -{{ page_bottom }} -{{ page.scripts('footer') }} - -