Commit a3b2fd4ad5bb97aa5cc46a65ef018a6884e0d4b7

Authored by Pablo Marco del Pont
Exists in master

Merge branch 'master' into 'master'

Master(efernandez)

See merge request Wrappers/wrapper-demo!4
src/etc/develop.ejemplo.js
1 angular.module('appWrapperDemo').constant("API_ENDPOINT", { 1 angular.module('appWrapperDemo').constant('API_ENDPOINT', {
2 'URL': '//127.0.0.1:9000' 2 'URL': '//127.0.0.1:9000'
3 }); 3 });
4 4
src/sass/_bootstrap.scss
File was created 1 .active{
2 color: #fff;
3 text-decoration: none;
4 outline: 0;
5 background-color: #337ab7;
6 }
7
src/sass/general.scss
1 @import 'tabla'; 1 @import 'tabla';
2 @import 'lista'; 2 @import 'lista';
3 @import 'login'; 3 @import 'login';
4 @import 'contenedor'; 4 @import 'contenedor';
5 @import 'bootstrap';
5 6