Merge branch 'master' into 'develop'

Master(mpuebla) See merge request !170

Merge branch 'master' into 'develop'
Master(mpuebla) See merge request !170
Marcelo Puebla
2 parents 5b7ae9477f 178f92310a
Showing 2 changed files Show diff stats
src/sass/_login.scss
src/sass/general.scss
-.login {
-    background: linear-gradient(0 ,#ffffff, #e6e6e6);
-    border: 1px solid #000000;
-    border-radius: 3px;
-    height: calc(280px + 1em);
-    left: calc(50% - 130px);
-    opacity: 0.7;
-    position: absolute;
-    text-align: center;
-    top: 190px;
-    width: 260px;
-    &-titulo {
-        border-bottom: 1px solid #ffffff;
-        padding: 5px 0;
-    }
-    &-campo {
-        label {
-            display: block;
-            font-size: 12px;
-            margin: 5px 0 0;
-        }
-        input {
-            -moz-border-radius: 10px;
-            -khtml-border-radius: 10px;
-            -webkit-border-radius: 10px;
-            -webkit-appearance: none;
-            padding-right: 5%;
-            padding-left: 5%;
-            border-radius: 10px;
-            outline: 0;
-            border-color: transparent;
-            text-transform: none !important;
-            &:focus {
-                border-color: #ff9900;
-            }
-        }
-    }
-    &-button {
-        width: 80%;
-        background-color: #cd9035;
-        color: white;
-        &:hover {
-            background-color: #a7743d;
-            color: white
-        }
-        &:focus {
-            color: white;
-        }
-    }
-    &-alerta-error {
-        width: 260px;
-        left: calc(50% - 130px);
-        top: calc(383px + 1.5em);
-    }
+.bg-gradient-login {
+    background: linear-gradient(0, #ffffff, #e6e6e6);
+}
+
+.login-small-text {
+    font-size: 12px;
 }
  
 @media (min-width: 768px) {
-    .img-login{
-        height: 190px;
+    .img-login {
         width: 211px;
     }
 }
  
 @media (max-width: 768px) {
-    .img-login{
-        height: 150px;
+    .img-login {
         width: 158px;
     }
 }
@@ -386,3 +386,7 @@ button.clear-input {
         transform: translateY(0);
     }
 }
+
+.text-transform-none {
+    text-transform: none !important;
+}
1		-.login {
2		- background: linear-gradient(0 ,#ffffff, #e6e6e6);
3		- border: 1px solid #000000;
4		- border-radius: 3px;
5		- height: calc(280px + 1em);
6		- left: calc(50% - 130px);
7		- opacity: 0.7;
8		- position: absolute;
9		- text-align: center;
10		- top: 190px;
11		- width: 260px;
12		- &-titulo {
13		- border-bottom: 1px solid #ffffff;
14		- padding: 5px 0;
15		- }
16		- &-campo {
17		- label {
18		- display: block;
19		- font-size: 12px;
20		- margin: 5px 0 0;
21		- }
22		- input {
23		- -moz-border-radius: 10px;
24		- -khtml-border-radius: 10px;
25		- -webkit-border-radius: 10px;
26		- -webkit-appearance: none;
27		- padding-right: 5%;
28		- padding-left: 5%;
29		- border-radius: 10px;
30		- outline: 0;
31		- border-color: transparent;
32		- text-transform: none !important;
33		- &:focus {
34		- border-color: #ff9900;
35		- }
36		- }
37		- }
38		- &-button {
39		- width: 80%;
40		- background-color: #cd9035;
41		- color: white;
42		- &:hover {
43		- background-color: #a7743d;
44		- color: white
45		- }
46		- &:focus {
47		- color: white;
48		- }
49		- }
50		- &-alerta-error {
51		- width: 260px;
52		- left: calc(50% - 130px);
53		- top: calc(383px + 1.5em);
54		- }
	1	+.bg-gradient-login {
	2	+ background: linear-gradient(0, #ffffff, #e6e6e6);
	3	+}
	4	+
	5	+.login-small-text {
	6	+ font-size: 12px;
55	7	}
56	8
57	9	@media (min-width: 768px) {
58		- .img-login{
59		- height: 190px;
	10	+ .img-login {
60	11	width: 211px;
61	12	}
62	13	}
63	14
64	15	@media (max-width: 768px) {
65		- .img-login{
66		- height: 150px;
	16	+ .img-login {
67	17	width: 158px;
68	18	}
69	19	}
...	...	@@ -386,3 +386,7 @@ button.clear-input {
386	386	transform: translateY(0);
387	387	}
388	388	}
	389	+
	390	+.text-transform-none {
	391	+ text-transform: none !important;
	392	+}