Merge pull request jacerider#6 from petemcw/normalize-configuration

Normalize configuration

composer.json

@@ -4,14 +4,17 @@
  "type": "drupal-theme",
  "license": "GPL-2.0+",
  "homepage": "https://github.com/jacerider/fett",
- "minimum-stability": "dev",
- "keywords": [
- "Drupal",
- "Theme"
+ "authors": [
+ {
+ "name": "Cyle Carlson (JaceRider)",
+ "email": "[email protected]",
+ "role": "Maintainer"
+ }
  ],
  "support": {
  "issues": "https://github.com/jacerider/fett/issues",
  "source": "https://github.com/jacerider/fett"
  },
- "require": {}
+ "minimum-stability": "dev",
+ "require": { }
 }

fett.info.yml

@@ -1,6 +1,7 @@
 name: Fett
+description: 'A front-end Drupal base theme of awesomeness built upon Zurb Foundation.'
+package: JaceRider
 type: theme
-description: "A Foundation 6 base theme for Drupal."
 core: 8.x
 screenshot: images/screenshot.png
 libraries:

package.json

@@ -1,24 +1,27 @@
 {
  "name": "fett",
- "version": "8.0.0",
- "description": "A Foundation 6 base theme for Drupal.",
- "repository": {
- "type": "git",
- "url": "git+https://github.com/jacerider/fett.git"
+ "version": "0.9.0",
+ "description": "A front-end Drupal base theme of awesomeness built upon Zurb Foundation.",
+ "license": "GPL-2.0+",
+ "repository": "jacerider/fett",
+ "homepage": "https://github.com/jacerider/fett#readme",
+ "author": {
+ "name": "Cyle Carlson",
+ "email": "[email protected]"
+ },
+ "bugs": {
+ "url": "https://github.com/jacerider/fett/issues"
  },
  "scripts": {
  "start": "gulp",
  "postinstall": "./node_modules/bower/bin/bower install"
  },
- "author": "JaceRider",
- "license": "MIT",
- "bugs": {
- "url": "https://github.com/jacerider/fett/issues"
+ "dependencies": {
+ "bower": "^1.7.9"
  },
- "homepage": "https://github.com/jacerider/fett#readme",
  "devDependencies": {
  "browser-sync": "^2.13.0",
- "fett-breakpoints": "git+https://github.com/jacerider/fett-breakpoints.git",
+ "fett-breakpoints": "jacerider/fett-breakpoints#6c9c612",
  "fs": "0.0.2",
  "gulp": "^3.9.1",
  "gulp-autoprefixer": "^3.1.0",
@@ -36,8 +39,5 @@
  "gulp-uglify": "^1.5.4",
  "gulp-util": "^3.0.7",
  "npm": "^3.10.5"
- },
- "dependencies": {
- "bower": "^1.7.9"
  }
 }

theme-settings.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Custom theme settings.
@@ -45,15 +44,6 @@ function fett_form_system_theme_settings_alter(&$form, FormStateInterface $form_
  // various other places.
  $theme_regions = system_region_list($theme, $show = REGIONS_VISIBLE);
 
- // Active themes active blocks
- // $block_module = \Drupal::moduleHandler()->moduleExists('breakpoint');
- // if ($block_module == TRUE) {
- // $theme_blocks = \Drupal::entityTypeManager()->getStorage('block')->loadByProperties(['theme' => $theme]);
- // }
- // else {
- // $theme_blocks = NULL;
- // }
-
  // Check for breakpoints module and set a warning and a flag to disable much
  // of the theme settings if its not available.
  $breakpoints_module = \Drupal::moduleHandler()->moduleExists('breakpoint');
@@ -89,7 +79,7 @@ function fett_form_system_theme_settings_alter(&$form, FormStateInterface $form_
 
  // Fett Core
  if ($theme == 'fett') {
- drupal_set_message(t('Fett has no configuration and cannot be used as a front end theme - it is a base them only. Use <b>drush fett</b> to generate or clone a theme to get started.'), 'error');
+ drupal_set_message(t('Fett has no configuration and cannot be used as a front-end theme - it is a base theme only. Use <b>drush fett</b> to generate or clone a theme to get started.'), 'error');
 
  // Hide form items.
  $form['theme_settings']['#attributes']['class'] = array('visually-hidden');