Merge branch 'commerceguys_updates' into 'master'

Commerceguys updates

See merge request contrib/kickstart/kickstart-frontend!13

Author: Jace Bennest

package-lock.json

@@ -14,61 +14,61 @@
     "jquery-param": "^0.2.0",
     "net": "^1.0.2",
     "tls": "0.0.1",
-    "vee-validate": "^2.0.0-rc.17",
-    "vue": "^2.3.3",
-    "vue-analytics": "^5.1.1",
-    "vue-notification": "^1.3.2",
-    "vue-resource": "^1.3.4",
-    "vue-router": "^2.6.0",
-    "vue-scrollto": "^2.7.2",
-    "vue-sticky": "^3.2.0",
-    "vuex": "^2.3.1"
+    "vee-validate": "^2.0.3",
+    "vue": "^2.5.13",
+    "vue-analytics": "^5.8.0",
+    "vue-notification": "^1.3.6",
+    "vue-resource": "^1.3.5",
+    "vue-router": "^2.8.1",
+    "vue-scrollto": "^2.8.0",
+    "vue-sticky": "^3.3.1",
+    "vuex": "^2.5.0"
   },
   "devDependencies": {
-    "autoprefixer": "^7.1.2",
-    "babel-core": "^6.22.1",
+    "autoprefixer": "^7.2.5",
+    "babel-core": "^6.26.0",
     "babel-eslint": "^7.1.1",
-    "babel-loader": "^7.1.1",
+    "babel-loader": "^7.1.2",
     "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-preset-env": "^1.3.2",
+    "babel-preset-env": "^1.6.1",
     "babel-preset-stage-2": "^6.22.0",
-    "babel-register": "^6.22.0",
-    "chalk": "^2.0.1",
-    "connect-history-api-fallback": "^1.3.0",
-    "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.28.0",
+    "babel-register": "^6.26.0",
+    "chalk": "^2.3.0",
+    "connect-history-api-fallback": "^1.5.0",
+    "copy-webpack-plugin": "^4.4.1",
+    "css-loader": "^0.28.9",
     "cssnano": "^3.10.0",
     "eslint": "^3.19.0",
     "eslint-config-standard": "^6.2.1",
     "eslint-friendly-formatter": "^3.0.0",
     "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^3.0.0",
-    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-html": "^3.2.2",
+    "eslint-plugin-promise": "^3.6.0",
     "eslint-plugin-standard": "^2.0.1",
     "eventsource-polyfill": "^0.9.6",
-    "express": "^4.14.1",
+    "express": "^4.16.2",
     "extract-text-webpack-plugin": "^2.0.0",
     "file-loader": "^0.11.1",
     "friendly-errors-webpack-plugin": "^1.1.3",
     "html-webpack-plugin": "^2.28.0",
     "http-proxy-middleware": "^0.17.3",
-    "node-sass": "^4.5.3",
-    "opn": "^5.1.0",
+    "node-sass": "^4.7.2",
+    "opn": "^5.2.0",
     "optimize-css-assets-webpack-plugin": "^2.0.0",
-    "ora": "^1.2.0",
-    "rimraf": "^2.6.0",
+    "ora": "^1.4.0",
+    "rimraf": "^2.6.2",
     "sass-loader": "^6.0.6",
-    "semver": "^5.3.0",
+    "semver": "^5.5.0",
     "shelljs": "^0.7.6",
     "url-loader": "^0.5.8",
     "vue-loader": "^12.1.0",
-    "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.3.3",
+    "vue-style-loader": "^3.1.2",
+    "vue-template-compiler": "^2.5.13",
     "webpack": "^2.6.1",
-    "webpack-bundle-analyzer": "^2.2.1",
-    "webpack-dev-middleware": "^1.10.0",
-    "webpack-hot-middleware": "^2.18.0",
-    "webpack-merge": "^4.1.0"
+    "webpack-bundle-analyzer": "^2.10.0",
+    "webpack-dev-middleware": "^1.12.2",
+    "webpack-hot-middleware": "^2.21.0",
+    "webpack-merge": "^4.1.1"
   },
   "engines": {
     "node": ">= 6.0.0",

package.json

@@ -4,6 +4,7 @@
     <router-view></router-view>
     <app-footer></app-footer>
     <notifications classes="kickstart-notification"/>
+    <notifications group="kickstart-notification" />
   </div>
 </template>
 
@@ -28,13 +29,15 @@
   .kickstart-notification {
     background: $yellow-warning !important;
     color: $c-white;
+    font-size: 15px;
     text-align: center;
     margin-top: 20px;
     margin-right: 20px;
     border: 3px solid $c-white;
 
     .notification-title {
       text-decoration: underline;
+      font-size: 18px;
     }
   }
 </style>

src/App.vue

@@ -67,7 +67,7 @@
     }
   }
 }
-@media screen and  (max-width: 1000px){
+@media screen and  (max-width: $screen-md-max){
   .is-one-quarter:nth-child(3n+1){
     clear:left;
   }

src/assets/styles/partials/_kickstart.scss

@@ -207,6 +207,11 @@ h2 {
   .box__item {
     position: relative;
     padding: 15px 0.75rem;
+    @media(max-width: $screen-md-max) {
+      h3 {
+        font-size: 20px;
+      }
+    }
   }
   .box__description {
     @media(max-width: $screen-md-max) {

src/assets/styles/partials/_sections.scss

@@ -81,9 +81,8 @@
           } else {
             let sectionTitle = this.sections[section].title
             this.$notify({
-              group: 'required',
-              type: 'warning',
-              position: 'top center',
+              group: 'kickstart-notification',
+              type: 'kickstart-notification',
               title: sectionTitle + ' Required',
               text: 'At least one ' + sectionTitle + ' option must be selected. You can choose a different option if you like.',
               duration: 4500,

src/components/Cards.vue

@@ -16,7 +16,7 @@
           <br />
           <div class="kickstart__description-warning">
             <i class="material-icons warning">warning</i>
-            Some modules below may not yet have a stable release. If this important to your project, visit the module's Drupal.org project page (<i class="material-icons item-icon">open_in_new</i>) for its current status.
+            Some modules below may not yet have a stable release. If this is important to your project, visit the module's Drupal.org project page (<i class="material-icons item-icon">open_in_new</i>) for its current status.
           </div>
         </div>
 

src/components/Kickstart.vue

@@ -342,6 +342,7 @@ const sections = {
       {
         title: 'None',
         description: 'Clean install, no migrations or demo content.',
+        location: locations.LOCATION_INTL,
         default: true,
       },
       {
@@ -350,20 +351,23 @@ const sections = {
         composer_package: 'drupal/commerce_migrate',
         composer_package_version: '^2.0@alpha',
         package_link: 'https://www.drupal.org/project/commerce_migrate',
+        location: locations.LOCATION_INTL,
       },
       {
         title: 'Ubercart',
         description: 'Migrate your content over from a Drupal 6 or Drupal 7 Ubercart install.',
         composer_package: 'drupal/commerce_migrate',
         composer_package_version: '^2.0@alpha',
         package_link: 'https://www.drupal.org/project/commerce_migrate',
+        location: locations.LOCATION_INTL,
       },
       {
         title: 'Magento',
         description: 'Migrate your content from an existing Magento setup.',
         composer_package: 'drupal/commerce_migrate',
         composer_package_version: '^2.0@alpha',
         package_link: 'https://www.drupal.org/project/commerce_migrate',
+        location: locations.LOCATION_INTL,
         enabled: false,
       },
       {
@@ -372,6 +376,7 @@ const sections = {
         composer_package: 'drupal/commerce_migrate',
         composer_package_version: '^2.0@alpha',
         package_link: 'https://www.drupal.org/project/commerce_migrate',
+        location: locations.LOCATION_INTL,
         enabled: false,
       },
       {
@@ -380,6 +385,7 @@ const sections = {
         composer_package: 'drupal/commerce_migrate',
         composer_package_version: '^2.0@alpha',
         package_link: 'https://www.drupal.org/project/commerce_migrate',
+        location: locations.LOCATION_INTL,
         enabled: false,
       },
     ],