Commit ab7ba47daf818bcb18803a70e8d814899fcb81e7
Exists in
master
Merge branch 'master' into 'master'
Estilos nuevo diseño See merge request !20
Showing
10 changed files
Show diff stats
index.html
| ... | ... | @@ -83,7 +83,7 @@ |
| 83 | 83 | </style> |
| 84 | 84 | <foca-nombre-empresa></foca-nombre-empresa> |
| 85 | 85 | <div ng-view class="container contenedor"></div> |
| 86 | - <div ng-controller="appWrapperDemoController" class="container d-none d-md-block"> | |
| 86 | + <div ng-controller="appWrapperDemoController" class="teclado-container container d-none d-md-block "> | |
| 87 | 87 | <div |
| 88 | 88 | class="btn-group-toggle" |
| 89 | 89 | data-toggle="buttons" |
src/sass/_botonera-lateral.scss
src/sass/_botonera-secundaria.scss
| 1 | 1 | .botonera-secundaria { |
| 2 | - background-color: rgba(0, 0, 0, 0.8); | |
| 3 | 2 | .row { |
| 4 | 3 | border-radius: 5px; |
| 5 | 4 | overflow: hidden; |
| 6 | 5 | } |
| 7 | 6 | .btn { |
| 8 | - border-radius: 0; | |
| 7 | + display: grid; | |
| 8 | + border-width: 3px !important; | |
| 9 | + border-radius: .7rem !important; | |
| 9 | 10 | margin-right: 1px; |
| 10 | 11 | width: calc(100% - 1px); |
| 11 | 12 | margin-bottom: 1px; |
| 13 | + | |
| 14 | + &:hover{ | |
| 15 | + background-color: #d8b07d; | |
| 16 | + border-color: #e09125 !important; | |
| 17 | + } | |
| 18 | + img{ | |
| 19 | + width: 50%; | |
| 20 | + margin: auto | |
| 21 | + } | |
| 22 | + span{ | |
| 23 | + font-size: 11px; | |
| 24 | + margin-left: -.25rem; | |
| 25 | + margin-right: -.25rem; | |
| 26 | + } | |
| 12 | 27 | } |
| 13 | 28 | } |
src/sass/_contenedor.scss
src/sass/_crear-nota-pedido.scss
| 1 | 1 | .crear-nota-pedido { |
| 2 | + background-color: #ccc; | |
| 3 | + | |
| 4 | + padding-bottom: 2rem; | |
| 2 | 5 | &-fecha { |
| 3 | 6 | input[type="date"]::-webkit-clear-button { |
| 4 | 7 | display: none; |
| 5 | 8 | } |
| 6 | 9 | } |
| 10 | + | |
| 11 | + .titulares>div{ | |
| 12 | + display: flex; | |
| 13 | + line-height: 30px; | |
| 14 | + h5{ | |
| 15 | + line-height: 30px; | |
| 16 | + } | |
| 17 | + button{ | |
| 18 | + margin: auto; | |
| 19 | + } | |
| 20 | + } | |
| 7 | 21 | } |
src/sass/_panel-informativo.scss
| 1 | 1 | .panel-informativo { |
| 2 | - background: linear-gradient(#ccc, #eee); | |
| 2 | + background: #67615e; | |
| 3 | + color: #FFF; | |
| 3 | 4 | min-height: 32px; |
| 4 | 5 | .form-group { |
| 5 | 6 | margin-bottom: 5px; |
| ... | ... | @@ -18,15 +19,14 @@ |
| 18 | 19 | font-size: .8em; |
| 19 | 20 | } |
| 20 | 21 | |
| 22 | + .border{ | |
| 23 | + border-width: 4px 2px !important; | |
| 24 | + } | |
| 25 | + | |
| 21 | 26 | .nota-pedido { |
| 22 | 27 | @media (max-width: 576px) { |
| 23 | 28 | text-align: center; |
| 24 | 29 | } |
| 25 | 30 | } |
| 26 | 31 | |
| 27 | - .numero-pedido { | |
| 28 | - @media (min-width: 576px) { | |
| 29 | - text-align: center; | |
| 30 | - } | |
| 31 | - } | |
| 32 | 32 | } |
src/sass/_tabla-articulos.scss
src/sass/_tabla.scss
src/sass/_teclado.scss
| ... | ... | @@ -65,11 +65,19 @@ |
| 65 | 65 | height: 50px; |
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | +.teclado-container > div{ | |
| 69 | + position: relative; | |
| 70 | +} | |
| 68 | 71 | .teclado-activar { |
| 69 | 72 | background-color: #17d236; |
| 70 | 73 | } |
| 71 | 74 | .boton-activar-teclado { |
| 72 | - margin-top: -10%; | |
| 75 | + top: -500px; | |
| 73 | 76 | position: absolute; |
| 74 | 77 | z-index: 100000; |
| 78 | + right: 1.5rem; | |
| 79 | + | |
| 80 | + @media(min-width: 1200px){ | |
| 81 | + right: 2.5rem !important; | |
| 82 | + } | |
| 75 | 83 | } |
src/sass/general.scss