Commit d54f55b3ddaec080b1bf1b813cf38646a110a88f
Exists in
master
and in
1 other branch
Merge branch 'develop' into 'master'
Develop See merge request !96
Showing
4 changed files
Show diff stats
src/sass/_botonera-secundaria.scss
src/sass/_login.scss
| ... | ... | @@ -20,14 +20,33 @@ |
| 20 | 20 | margin: 5px 0 0; |
| 21 | 21 | } |
| 22 | 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; | |
| 23 | 32 | &:focus { |
| 24 | - outline: 3px solid #ff9900; | |
| 33 | + border-color: #ff9900; | |
| 25 | 34 | } |
| 26 | 35 | } |
| 27 | 36 | } |
| 37 | + | |
| 28 | 38 | |
| 29 | - button { | |
| 30 | - margin-right: 42px; | |
| 39 | + &-button { | |
| 40 | + width: 80%; | |
| 41 | + background-color: #cd9035; | |
| 42 | + color: white; | |
| 43 | + &:hover{ | |
| 44 | + background-color: #a7743d; | |
| 45 | + color: white | |
| 46 | + } | |
| 47 | + &:focus{ | |
| 48 | + color: white; | |
| 49 | + } | |
| 31 | 50 | } |
| 32 | 51 | |
| 33 | 52 | &-alerta-error { |
src/sass/_teclado.scss
| ... | ... | @@ -6,16 +6,19 @@ |
| 6 | 6 | -ms-user-select: none; |
| 7 | 7 | user-select: none; |
| 8 | 8 | margin: auto; |
| 9 | - width: 855px; | |
| 10 | - position: inherit; | |
| 9 | + width: 60%; | |
| 10 | + position: absolute; | |
| 11 | 11 | height: auto; |
| 12 | 12 | border: 1px solid rgba(255, 128, 0, .4); |
| 13 | 13 | background-color: rgba(0, 0, 0, .3); |
| 14 | 14 | bottom: 5px; |
| 15 | + z-index: 100000; | |
| 15 | 16 | table { |
| 17 | + width: auto; | |
| 18 | + height: auto; | |
| 19 | + margin: 0px auto; | |
| 16 | 20 | border-spacing: 10px; |
| 17 | 21 | border-collapse: separate; |
| 18 | - z-index: 100000; | |
| 19 | 22 | td { |
| 20 | 23 | touch-action: none; |
| 21 | 24 | } |
| ... | ... | @@ -23,14 +26,15 @@ |
| 23 | 26 | |
| 24 | 27 | .letter { |
| 25 | 28 | background-color: #bdbdbd; |
| 26 | - box-shadow: 2px 2px 3px #555555; | |
| 27 | - width: 47px; | |
| 28 | - height: 50px; | |
| 29 | + box-shadow: 2px 2px 3px #555555; | |
| 30 | + padding: 10px; | |
| 31 | + width: auto; | |
| 32 | + height: auto; | |
| 29 | 33 | text-align: center; |
| 30 | 34 | font-family: "arial"; |
| 31 | 35 | cursor: pointer; |
| 32 | 36 | color: #000; |
| 33 | - font-size: 22px; | |
| 37 | + font-size: 80%; | |
| 34 | 38 | |
| 35 | 39 | &:hover { |
| 36 | 40 | background-color: #fafafa; |
| ... | ... | @@ -43,13 +47,14 @@ |
| 43 | 47 | .number { |
| 44 | 48 | background-color: #bdbdbd; |
| 45 | 49 | box-shadow: 2px 2px 3px #555555; |
| 46 | - width: 47px; | |
| 47 | - height: 35px; | |
| 50 | + padding: 10px; | |
| 51 | + width: auto; | |
| 52 | + height: auto; | |
| 48 | 53 | text-align: center; |
| 49 | 54 | font-family: "arial"; |
| 50 | 55 | cursor: pointer; |
| 51 | 56 | color: #000; |
| 52 | - font-size: 22px; | |
| 57 | + font-size: 80%; | |
| 53 | 58 | |
| 54 | 59 | &:hover { |
| 55 | 60 | background-color: #fafafa; |
| ... | ... | @@ -61,7 +66,7 @@ |
| 61 | 66 | } |
| 62 | 67 | |
| 63 | 68 | .margin { |
| 64 | - width: 40px; | |
| 65 | - height: 50px; | |
| 69 | + width: 5%; | |
| 70 | + height: 5%; | |
| 66 | 71 | } |
| 67 | 72 | } |
src/sass/general.scss
| ... | ... | @@ -65,7 +65,8 @@ input::-webkit-inner-spin-button { |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | .ladda-w-100 .ladda-label{ |
| 68 | - width: 100% | |
| 68 | + width: 100%; | |
| 69 | + float: right; | |
| 69 | 70 | } |
| 70 | 71 | |
| 71 | 72 | .btn-delete-image{ |
| ... | ... | @@ -81,6 +82,7 @@ button.clear-input{ |
| 81 | 82 | border: none; |
| 82 | 83 | margin-left: -24px; |
| 83 | 84 | z-index: 9; |
| 85 | + color: #a3a3a3; | |
| 84 | 86 | &:focus{ |
| 85 | 87 | outline: none; |
| 86 | 88 | } |