convert to foundation for css

HariPrasath7 · Jul 23, 2014 · 81cb351 · 81cb351
1 parent f096529
commit 81cb351
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 16 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -383,7 +383,7 @@ module.exports = function (grunt) {
     // Test settings
     karma: {
       unit: {
-        configFile: 'test/karma.conf.js',
+        configFile: 'karma.conf.js',
         singleRun: true
       }
     }

diff --git a/app/scripts/services/settings.js b/app/scripts/services/settings.js
@@ -3,5 +3,5 @@
 angular.module('deckApp')
   .constant('settings', {
     front50Url: 'http://front50.test.netflix.net',
-    oortUrl: 'http://oort.prod.netflix.net:8080'
+    oortUrl: 'http://localhost:8080'
   });
diff --git a/app/styles/main.less b/app/styles/main.less
@@ -107,7 +107,7 @@ body {
 }
 
 .secondary-panel {
-  > .row > div {
+  .nav, .nav-content {
     min-height: 600px;
   }
   .nav {
@@ -220,6 +220,7 @@ dl {
   background-color: #ffffff;
   min-height: 500px;
   padding: 0;
+  margin-left: 20px;
 
   .header {
     text-align: center;

diff --git a/app/views/application/cluster/navigation.html b/app/views/application/cluster/navigation.html
@@ -3,7 +3,7 @@ <h3>Accounts</h3>
   <div class="sub-nav-item">
     <h4>{{account}}</h4>
     <a ng-repeat="cluster in getClustersForAccount(account)"
-       ui-sref="clusters.cluster({account: account, cluster: cluster.name})"
+       ui-sref="cluster({account: account, cluster: cluster.name})"
        ng-class="{active: $state.includes('clusters.cluster', {account: account, cluster: cluster.name} )}">
         {{cluster.name}}</a>
   </div>

diff --git a/app/views/insight.html b/app/views/insight.html
@@ -11,6 +11,7 @@
       </div>
     </div>
   </div>
-  <div class="col-md-4 details-panel" ui-view="detail">
+  <div class="col-md-4">
+    <div class="details-panel" ui-view="detail"></div>
   </div>
 </div>
diff --git a/test/karma.conf.js → karma.conf.js b/test/karma.conf.js → karma.conf.js
@@ -9,25 +9,25 @@ module.exports = function(config) {
     autoWatch: true,
 
     // base path, that will be used to resolve files and exclude
-    basePath: '../',
+    basePath: '/',
 
     // testing framework to use (jasmine/mocha/qunit/...)
     frameworks: ['jasmine'],
 
     // list of files / patterns to load in the browser
     files: [
-      'bower_components/angular/angular.js',
-      'bower_components/angular-mocks/angular-mocks.js',
+      'app/bower_components/angular/angular.js',
+      'app/bower_components/angular-mocks/angular-mocks.js',
       'app/scripts/**/*.js',
-      'test/mock/**/*.js',
+//      'test/mock/**/*.js',
       'test/spec/**/*.js'
     ],
 
     // list of files / patterns to exclude
     exclude: [],
 
     // web server port
-    port: 8080,
+    port: 8081,
 
     // Start these browsers, currently available:
     // - Chrome
@@ -57,11 +57,13 @@ module.exports = function(config) {
     // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
     logLevel: config.LOG_INFO,
 
-    // Uncomment the following lines if you are using grunt's server to run the tests
-    // proxies: {
-    //   '/': 'http://localhost:9000/'
-    // },
-    // URL root prevent conflicts with the site root
-    // urlRoot: '_karma_'
+    // jUnit Report output
+    reporters: ['progress', 'junit'],
+
+    // the default configuration
+    junitReporter: {
+      outputFile: 'test-results.xml',
+      suite: ''
+    }
   });
 };
diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
     "grunt-karma": "~0.8.3",
     "karma-phantomjs-launcher": "~0.1.4",
     "karma": "~0.12.17",
+    "karma-junit-reporter": "~0.2.1",
     "karma-jasmine": "~0.1.5"
   },
   "engines": {