Merge branch 'master' into 'master'

Master(efernandez) See merge request Wrappers/wrapper-demo!4

Merge branch 'master' into 'master'
Master(efernandez) See merge request Wrappers/wrapper-demo!4
Pablo Marco del Pont
2 parents e46f814f39 fbba88fb51
Showing 3 changed files Show diff stats
src/etc/develop.ejemplo.js
src/sass/_bootstrap.scss
src/sass/general.scss
-angular.module('appWrapperDemo').constant("API_ENDPOINT", {
+angular.module('appWrapperDemo').constant('API_ENDPOINT', {
     'URL': '//127.0.0.1:9000'
 });
@@ -0,0 +1,6 @@
+.active{
+    color: #fff;
+    text-decoration: none;
+    outline: 0;
+    background-color: #337ab7;
+}
@@ -2,3 +2,4 @@
 @import 'lista';
 @import 'login';
 @import 'contenedor';
+@import 'bootstrap';
1		-angular.module('appWrapperDemo').constant("API_ENDPOINT", {
	1	+angular.module('appWrapperDemo').constant('API_ENDPOINT', {
2	2	'URL': '//127.0.0.1:9000'
3	3	});
...	...	@@ -0,0 +1,6 @@
	1	+.active{
	2	+ color: #fff;
	3	+ text-decoration: none;
	4	+ outline: 0;
	5	+ background-color: #337ab7;
	6	+}
...	...	@@ -2,3 +2,4 @@
2	2	@import 'lista';
3	3	@import 'login';
4	4	@import 'contenedor';
	5	+@import 'bootstrap';