Merge branch 'master' into 'develop'

Master(Macola) See merge request !8

Merge branch 'master' into 'develop'
Master(Macola) See merge request !8
Marcelo Puebla
2 parents 9f5526fae0 5e9cbadac7
Showing 6 changed files Show diff stats
src/sass/_bootstrap.scss
src/sass/_botonera-secundaria.scss
src/sass/_constants.scss
src/sass/_login.scss
src/sass/_swiper.scss
src/sass/general.scss
@@ -89,7 +89,7 @@ input[type=&quot;number&quot;]::-webkit-outer-spin-button {
 }
  
 .border-warning {
-    border-color: #cd9035 !important;
+    border-color: #2872AD !important;
 }
  
 .rounded-1 {
@@ -11,8 +11,8 @@
         width: calc(100% - 1px);
         margin-bottom: 1px;
         &:hover{
-            background-color: #cd903550 ;
-            border-color: #cd9035 !important;
+            background-color: #2872AD50 ;
+            border-color: #2872AD !important;
         }
         &:focus{
             box-shadow: 0 0 0 0.2rem rgb(216, 176, 125);
@@ -31,12 +31,12 @@
         border-width: 3px !important;
         border-radius: .7rem !important;
         &:hover{
-            background-color: #cd903550 ;
-            border-color: #cd9035 !important;
+            background-color: #2872AD50 ;
+            border-color: #2872AD !important;
         }
         &:focus{
             box-shadow: none;
-            border-color: #cd9035 !important;
+            border-color: #2872AD !important;
         }
         img{
             width: 5em;
@@ -47,12 +47,12 @@
         border-width: 3px !important;
         border-radius: .7rem !important;
         &:hover{
-            background-color: #cd903550 ;
-            border-color: #cd9035 !important;
+            background-color: #2872AD50 ;
+            border-color: #2872AD !important;
         }
         &:focus{
             box-shadow: none;
-            border-color: #cd9035 !important;
+            border-color: #2872AD !important;
         }
         img{
             width: 100%;
@@ -64,12 +64,12 @@
         border-width: 3px !important;
         border-radius: .7rem !important;
         &:hover{
-            background-color: #cd903550 ;
-            border-color: #cd9035 !important;
+            background-color: #2872AD50 ;
+            border-color: #2872AD !important;
         }
         &:focus{
             box-shadow: none;
-            border-color: #cd9035 !important;
+            border-color: #2872AD !important;
         }
         img{
             width: 60%;
-$primary: #cd9035;
-$primaryTransparency: #d6a55bcc;
-$highlightedArea: #df9424;
+$primary: #2872AD;
+$primaryTransparency: #226daacc;
+$highlightedArea: #247fca;
 $default: #6c757d;
  
 $defaultTransparency: #6c757dcc;
@@ -37,7 +37,7 @@
  
     &-button {
         width: 80%;        
-        background-color: #cd9035;
+        background-color: #2872AD;
         color: white;
         &:hover{
             background-color: #a7743d;
@@ -24,5 +24,5 @@
  
 .swiper-pagination-bullet-active {
     opacity: 1;
-    background: #CD9035;
+    background: #2872AD;
 }
@@ -188,7 +188,7 @@ input[type=&quot;file&quot;] {
  
 .btn-enviar {
     background-color: white;
-    border-color: #cd9035;
+    border-color: #2872AD;
     &:focus {
         box-shadow: none !important;
     }
...	...	@@ -89,7 +89,7 @@ input[type="number"]::-webkit-outer-spin-button {
89	89	}
90	90
91	91	.border-warning {
92		- border-color: #cd9035 !important;
	92	+ border-color: #2872AD !important;
93	93	}
94	94
95	95	.rounded-1 {
...	...	@@ -11,8 +11,8 @@
11	11	width: calc(100% - 1px);
12	12	margin-bottom: 1px;
13	13	&:hover{
14		- background-color: #cd903550 ;
15		- border-color: #cd9035 !important;
	14	+ background-color: #2872AD50 ;
	15	+ border-color: #2872AD !important;
16	16	}
17	17	&:focus{
18	18	box-shadow: 0 0 0 0.2rem rgb(216, 176, 125);
...	...	@@ -31,12 +31,12 @@
31	31	border-width: 3px !important;
32	32	border-radius: .7rem !important;
33	33	&:hover{
34		- background-color: #cd903550 ;
35		- border-color: #cd9035 !important;
	34	+ background-color: #2872AD50 ;
	35	+ border-color: #2872AD !important;
36	36	}
37	37	&:focus{
38	38	box-shadow: none;
39		- border-color: #cd9035 !important;
	39	+ border-color: #2872AD !important;
40	40	}
41	41	img{
42	42	width: 5em;
...	...	@@ -47,12 +47,12 @@
47	47	border-width: 3px !important;
48	48	border-radius: .7rem !important;
49	49	&:hover{
50		- background-color: #cd903550 ;
51		- border-color: #cd9035 !important;
	50	+ background-color: #2872AD50 ;
	51	+ border-color: #2872AD !important;
52	52	}
53	53	&:focus{
54	54	box-shadow: none;
55		- border-color: #cd9035 !important;
	55	+ border-color: #2872AD !important;
56	56	}
57	57	img{
58	58	width: 100%;
...	...	@@ -64,12 +64,12 @@
64	64	border-width: 3px !important;
65	65	border-radius: .7rem !important;
66	66	&:hover{
67		- background-color: #cd903550 ;
68		- border-color: #cd9035 !important;
	67	+ background-color: #2872AD50 ;
	68	+ border-color: #2872AD !important;
69	69	}
70	70	&:focus{
71	71	box-shadow: none;
72		- border-color: #cd9035 !important;
	72	+ border-color: #2872AD !important;
73	73	}
74	74	img{
75	75	width: 60%;
1		-$primary: #cd9035;
2		-$primaryTransparency: #d6a55bcc;
3		-$highlightedArea: #df9424;
	1	+$primary: #2872AD;
	2	+$primaryTransparency: #226daacc;
	3	+$highlightedArea: #247fca;
4	4	$default: #6c757d;
5	5
6	6	$defaultTransparency: #6c757dcc;
...	...	@@ -37,7 +37,7 @@
37	37
38	38	&-button {
39	39	width: 80%;
40		- background-color: #cd9035;
	40	+ background-color: #2872AD;
41	41	color: white;
42	42	&:hover{
43	43	background-color: #a7743d;
...	...	@@ -24,5 +24,5 @@
24	24
25	25	.swiper-pagination-bullet-active {
26	26	opacity: 1;
27		- background: #CD9035;
	27	+ background: #2872AD;
28	28	}
...	...	@@ -188,7 +188,7 @@ input[type="file"] {
188	188
189	189	.btn-enviar {
190	190	background-color: white;
191		- border-color: #cd9035;
	191	+ border-color: #2872AD;
192	192	&:focus {
193	193	box-shadow: none !important;
194	194	}