Debug material

pirhoo · Jan 4, 2018 · 7c8fb30 · 7c8fb30
1 parent 8b29d0c
commit 7c8fb30
Show file tree

Hide file tree

Showing 7 changed files with 128 additions and 115 deletions.
diff --git a/Makefile b/Makefile
@@ -5,5 +5,4 @@ deploy:
 	gulp deploy
 
 install:
-	npm install
-	bower install
+	yarn
diff --git a/gulp/build.js b/gulp/build.js
@@ -3,7 +3,7 @@
 var gulp = require('gulp');
 
 var $ = require('gulp-load-plugins')({
-  pattern: ['gulp-*', 'main-bower-files', 'uglify-save-license', 'del']
+  pattern: ['gulp-*', 'uglify-save-license', 'del']
 });
 
 function handleError(err) {
@@ -99,14 +99,6 @@ gulp.task('images', function () {
       .pipe($.size());
 });
 
-gulp.task('fonts', function () {
-  return gulp.src($.mainBowerFiles())
-    .pipe($.filter('**/*.{eot,svg,ttf,woff}'))
-    .pipe($.flatten())
-    .pipe(gulp.dest('dist/fonts'))
-    .pipe($.size());
-});
-
 gulp.task('swf', [], function () {
   return gulp.src('node_modules/@bower_components/**/*.swf')
     .pipe($.flatten())
@@ -130,4 +122,4 @@ gulp.task('deploy', ['build'], function() {
   }));
 });
 
-gulp.task('build', ['html', 'images', 'fonts', 'misc']);
+gulp.task('build', ['html', 'images', 'misc']);
diff --git a/package.json b/package.json
@@ -2,14 +2,14 @@
   "name": "iframe-scaffolder",
   "version": "1.0.0",
   "dependencies": {
-    "@bower_components/angular": "angular/bower-angular#1.3.20",
-    "@bower_components/angular-animate": "angular/bower-angular-animate#1.3.x",
-    "@bower_components/angular-aria": "angular/bower-angular-aria#^1.3.15 || >1.4.0-beta.0",
+    "@bower_components/angular": "angular/bower-angular#1.6.x",
+    "@bower_components/angular-animate": "angular/bower-angular-animate#1.6.x",
+    "@bower_components/angular-aria": "angular/bower-angular-aria#^1.6.x",
     "@bower_components/angular-bootstrap": "angular-ui/bootstrap-bower#0.13.1",
-    "@bower_components/angular-material": "angular/bower-material#~0.10.0",
-    "@bower_components/angular-mocks": "angular/bower-angular-mocks#1.3.x",
-    "@bower_components/angular-sanitize": "angular/bower-angular-sanitize#1.3.x",
-    "@bower_components/angular-ui-router": "angular-ui/angular-ui-router-bower#0.2.15",
+    "@bower_components/angular-material": "angular/bower-material#~1.1.4",
+    "@bower_components/angular-mocks": "angular/bower-angular-mocks#1.6.x",
+    "@bower_components/angular-sanitize": "angular/bower-angular-sanitize#1.6.x",
+    "@bower_components/angular-ui-router": "angular-ui/angular-ui-router-bower#0.3.2",
     "@bower_components/angular-ui-sortable": "angular-ui/ui-sortable#~0.13.0",
     "@bower_components/angular-ui-utils": "angular-ui/ui-utils#bower-validate",
     "@bower_components/angular-zeroclipboard": "lisposter/angular-zeroclipboard#~0.3.2",
@@ -42,7 +42,7 @@
     "gulp-less": "^1.3.3",
     "gulp-load-plugins": "^0.6.0",
     "gulp-minify-html": "^0.1.3",
-    "gulp-ng-annotate": "^0.3.0",
+    "gulp-ng-annotate": "^2.1.0",
     "gulp-ng-html2js": "^0.1.6",
     "gulp-protractor": "^0.0.11",
     "gulp-replace": "^0.4.0",
@@ -56,7 +56,6 @@
     "karma": "^2.0.0",
     "karma-jasmine": "^1.1.1",
     "karma-phantomjs-launcher": "^1.0.4",
-    "main-bower-files": "^2.0.0",
     "protractor": "^1.1.1",
     "require-dir": "^0.3.2",
     "uglify-save-license": "^0.4.1"

diff --git a/src/app/main/main.controller.js b/src/app/main/main.controller.js
@@ -23,8 +23,8 @@ angular.module('iframeScaffolder').controller('MainCtrl', function ($scope, $sta
   $scope.examples   = [];
 
   // Get sample datasets
-  $http.get('assets/examples.json').success(function(data) {
-    $scope.examples = data;
+  $http.get('assets/examples.json').then(function(res) {
+    $scope.examples = res.data;
   });
 
   $scope.getTheme = function(slug) {

diff --git a/src/components/scaffolder/scaffolder.html b/src/components/scaffolder/scaffolder.html
@@ -1,6 +1,6 @@
-<div class="scaffolder scaffolder--{{options.layout}} scaffolder--{{options.theme}}"  layout="column" layout-align="start start">
-  <div class="scaffolder__header"></div>
-  <div class="scaffolder__container" flex>
+<div class="scaffolder scaffolder--{{options.layout}} scaffolder--{{options.theme}} layout-column" layout="column" layout-align="center none">
+  <div class="scaffolder__header" flex="nogrow"></div>
+  <div class="scaffolder__container" flex="100">
     <aside ng-show="scaffolder.hasMenu()" class="scaffolder__container__menu">
       <ul class="nav nav-pills" ng-class="{ 'nav-stacked': options.layout === 'menu' }">
         <li ng-repeat="url in options.urls track by $index"
@@ -25,7 +25,7 @@ <h4 class="scaffolder__container__title">{{ scaffolder.getActive( 'Iframe ' + ($
               ng-src="{{ scaffolder.url($index) }}"></iframe>
     </div>
   </div>
-  <div class="scaffolder__footer">
+  <div class="scaffolder__footer" flex="none">
     Built with <a href="//pirhoo.github.io/iframe-scaffolder/" target="_blank">Iframe Scaffolder</a>
     <div class="scaffolder__footer__sharing-toggler" ng-show="scaffolder.hasMenu() && scaffolder.urls.length">
       <button class="btn btn-xs"

diff --git a/src/components/scaffolder/scaffolder.less b/src/components/scaffolder/scaffolder.less
@@ -6,6 +6,7 @@
 
   &__container {
     width: 100%;
+    overflow: hidden;
     position:relative;
     background:inherit;