QRouland/M2OLA
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TG-117 : remove bootstrap css framework and replace by

Browse Source 
angular-material and create login page
This commit is contained in:
matthieupenchenat81
2017-03-05 10:55:38 +01:00
parent d4cd89ceac
commit 5f51010615
10 changed files with 55 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/test/karma.conf.js
View File

@ -1,5 +1,5 @@
// Karma configuration
// Generated on 2017-01-20
// Generated on 2017-02-26
module.exports = function(config) {
'use strict';
@ -20,10 +20,13 @@ module.exports = function(config) {
// list of files / patterns to load in the browser
files: [
// bower:js
'bower_components/jquery/dist/jquery.js',
'bower_components/angular/angular.js',
'bower_components/bootstrap/dist/js/bootstrap.js',
'bower_components/angular-animate/angular-animate.js',
'bower_components/angular-cookies/angular-cookies.js',
'bower_components/angular-sanitize/angular-sanitize.js',
'bower_components/angular-aria/angular-aria.js',
'bower_components/angular-messages/angular-messages.js',
'bower_components/angular-material/angular-material.js',
'bower_components/angular-ui-router/release/angular-ui-router.js',
'bower_components/angular-mocks/angular-mocks.js',
// endbower

2
frontend/test/spec/controllers/main.js
View File

@ -3,7 +3,7 @@
describe('Controller: MainCtrl', function () {
// load the controller's module
beforeEach(module('clientApp'));
beforeEach(module('frontendApp'));
var MainCtrl,
scope;