Mauricio Cattafi / wrapper-demo

Download as
Browse Code ยป

Commit b3ba56d5ffa2fdee8da4ac5fdf8a789bddcd6c13

Authored by Marcelo Puebla
2 parents fd71e68e9a eb5847e3c1
Exists in master

Merge branch 'master' into 'develop' 

Master(benjaminr)

See merge request !162
Showing 6 changed files   Show diff stats
... ... @@ -116,17 +116,17 @@
116 116 "ui-bootstrap4": "^3.0.6"
117 117 },
118 118 "devDependencies": {
119   - "gulp": "3.9.1",
  119 + "gulp": "^3.9.1",
120 120 "gulp-clean": "^0.4.0",
121 121 "gulp-concat": "^2.6.1",
122 122 "gulp-connect": "^5.7.0",
123 123 "gulp-jshint": "^2.1.0",
124 124 "gulp-rename": "^1.4.0",
125 125 "gulp-replace": "^1.0.0",
126   - "gulp-sass": "^4.0.1",
  126 + "gulp-sass": "^4.0.2",
127 127 "gulp-uglify": "^3.0.2",
128 128 "gulp-watch": "^5.0.1",
129   - "jasmine-core": "^3.4.0",
  129 + "jasmine-core": "^3.5.0",
130 130 "jshint": "^2.10.2",
131 131 "pre-commit": "^1.2.2",
132 132 "pump": "^3.0.0"
src/sass/_animations.scss
Diff comments   View file @ b3ba56d
... ... @@ -0,0 +1,14 @@
  1 +.modal-content,
  2 +.focus-in {
  3 + animation: focus-in 0.3s cubic-bezier(0.55, 0.085, 0.68, 0.53) both;
  4 +}
  5 +@keyframes focus-in {
  6 + 0% {
  7 + filter: blur(12px);
  8 + opacity: 0;
  9 + }
  10 + 100% {
  11 + filter: blur(0px);
  12 + opacity: 1;
  13 + }
  14 +}
src/sass/_bootstrap.scss
Diff comments   View file @ b3ba56d
1 1 button.active {
2   - text-decoration: none;
3   - outline: 0;
4   - color: white;
5   - background-color: $primary;
6   - &:focus {
7   - box-shadow: 0 0 0 0.2rem $primaryTransparency;
8   - }
  2 + text-decoration: none;
  3 + outline: 0;
  4 + color: white;
  5 + background-color: $primary;
  6 + &:focus {
  7 + box-shadow: 0 0 0 0.2rem $primaryTransparency;
  8 + }
9 9 }
10 10 .btn-xs {
11   - padding: 0.15rem 0.5rem;
12   - font-size: 0.8rem;
13   - line-height: 1.5;
14   - border-radius: 0.2rem;
  11 + padding: 0.15rem 0.5rem;
  12 + font-size: 0.8rem;
  13 + line-height: 1.5;
  14 + border-radius: 0.2rem;
15 15 }
16 16  
17 17 .no-border-bottom {
18   - border-bottom: 0 !important;
  18 + border-bottom: 0 !important;
19 19 }
20 20 .no-border-top {
21   - border-top: 0 !important;
  21 + border-top: 0 !important;
22 22 }
23 23 .no-border {
24   - border: 0 !important;
  24 + border: 0 !important;
25 25 }
26 26 .margin-bottom-mobile {
27   - margin-bottom: 2.5em !important;
  27 + margin-bottom: 2.5em !important;
28 28 }
29 29 .tamaรฑo-boton {
30   - width: 44px;
  30 + width: 44px;
31 31 }
32 32 .modal-content {
33   - .modal-header {
34   - display: block;
35   - > div.row {
36   - margin: 0 !important;
37   - > div {
38   - padding: 0 !important;
39   - }
40   - }
41   - }
42   - @media (max-width: 576px) {
43   - height: auto;
44   - height: 100%;
45   - border-radius: 0;
  33 + .modal-header {
  34 + display: block;
  35 + > div.row {
  36 + margin: 0 !important;
  37 + > div {
  38 + padding: 0 !important;
  39 + }
46 40 }
  41 + }
  42 + @media (max-width: 576px) {
  43 + height: auto;
  44 + height: 100%;
  45 + border-radius: 0;
  46 + }
47 47 }
48 48 .modal.show .modal-dialog {
49   - @media (min-width: 1201px) {
50   - -webkit-transform: translate(0, 70px);
51   - transform: translate(0, 70px);
52   - }
53   - @media (min-width: 576px) {
54   - -webkit-transform: translate(0, 90px);
55   - transform: translate(0, 90px);
56   - }
57   - @media (max-width: 576px) {
58   - width: 100%;
59   - height: 100%;
60   - margin: 0;
61   - padding: 0;
62   - }
  49 + @media (min-width: 1201px) {
  50 + -webkit-transform: translate(0, 70px);
  51 + transform: translate(0, 70px);
  52 + }
  53 + @media (min-width: 576px) {
  54 + -webkit-transform: translate(0, 90px);
  55 + transform: translate(0, 90px);
  56 + }
  57 + @media (max-width: 576px) {
  58 + width: 100%;
  59 + height: 100%;
  60 + margin: 0;
  61 + padding: 0;
  62 + }
63 63 }
64 64 .modal-body {
65   - @media (max-width: 576px) {
66   - overflow-y: auto;
67   - }
  65 + @media (max-width: 576px) {
  66 + overflow-y: auto;
  67 + }
68 68 }
69 69  
70 70 .boton-salir {
71   - position: absolute;
72   - bottom: 10px;
73   - right: 15px;
74   - width: calc(100% - 15px);
  71 + position: absolute;
  72 + bottom: 10px;
  73 + right: 15px;
  74 + width: calc(100% - 15px);
75 75 }
76 76  
77 77 input[type="number"]::-webkit-inner-spin-button,
78 78 input[type="number"]::-webkit-outer-spin-button {
79   - -webkit-appearance: none;
80   - margin: 0;
  79 + -webkit-appearance: none;
  80 + margin: 0;
81 81 }
82 82  
83 83 .invisible {
84   - color: rgba(0, 0, 0, 0);
  84 + color: rgba(0, 0, 0, 0);
85 85 }
86 86  
87 87 .badge-success {
88   - background-color: #9aae47 !important;
  88 + background-color: #9aae47 !important;
89 89 }
90 90  
91 91 .border-warning {
92   - border-color: #cd9035 !important;
  92 + border-color: #cd9035 !important;
93 93 }
src/sass/_botonera-principal.scss
Diff comments   View file @ b3ba56d
... ... @@ -246,6 +246,48 @@
246 246 filter: drop-shadow(4px 4px 4px gray);
247 247 }
248 248 }
  249 +
  250 + .btn-tareas-pausadas{
  251 + background-color: #cd9035;
  252 + border-color: #cd9035 !important;
  253 + height: 30px;
  254 + text-align: center;
  255 + width: 280px;
  256 + background-image: none;
  257 + flood-color: #ffffff;
  258 + &:hover {
  259 + background-color: #cd9035;
  260 + }
  261 + &:focus {
  262 + background-color: #cd9035;
  263 + }
  264 + }
  265 +
  266 + .dropdown-tareas-pausadas{
  267 + background: linear-gradient(0 ,#ffffff, #e6e6e6);
  268 + position: absolute;
  269 + will-change: transform;
  270 + top: 0px;
  271 + left: 0px;
  272 + transform: translate3d(0px, 0px, 0px);
  273 + margin-bottom: 5px;
  274 + padding: 0px;
  275 + box-sizing: content-box;
  276 + border-radius: 12px;
  277 + font: small;
  278 + transform: translate3d(0px, 30px, 0px);
  279 + }
  280 +
  281 + .items-dropdown{
  282 + background-color:rgba(0, 0, 0, 0);
  283 + cursor: hand;
  284 + &:hover {
  285 + background-color: #e6e6e6;
  286 + width: 98%;
  287 + border-radius: 12px;
  288 + }
  289 + }
  290 +
249 291 @media (min-width: 992px) {
250 292 a {
251 293 margin-top: 2.5rem;
src/sass/_login.scss
Diff comments   View file @ b3ba56d
1 1 .login {
2   - background-color: #bdbdbd;
  2 + background: linear-gradient(0 ,#ffffff, #e6e6e6);
3 3 border: 1px solid #000000;
4 4 border-radius: 3px;
5   - height: calc(193px + 1em);
  5 + height: calc(280px + 1em);
6 6 left: calc(50% - 130px);
7 7 opacity: 0.7;
8 8 position: absolute;
... ... @@ -54,3 +54,17 @@
54 54 top: calc(383px + 1.5em);
55 55 }
56 56 }
  57 +
  58 +@media (min-width: 600px) {
  59 + .img-login{
  60 + height: 190px;
  61 + width: 211px;
  62 + }
  63 +}
  64 +
  65 +@media (max-width: 600px) {
  66 + .img-login{
  67 + height: 150px;
  68 + width: 158px;
  69 + }
  70 +}
src/sass/general.scss
Diff comments   View file @ b3ba56d
1   -@import "constants";
2   -@import "admin-seguimiento";
3   -@import "bootstrap";
4   -@import "botonera";
5   -@import "botonera-lateral";
6   -@import "botonera-principal";
7   -@import "botonera-secundaria";
8   -@import "contenedor";
9   -@import "lista";
10   -@import "login";
11   -@import "panel-informativo";
12   -@import "tabla";
13   -@import "teclado";
14   -@import "tabla-articulos";
15   -@import "acciones-mobile";
16   -@import "swiper";
17   -@import "foca-crear";
18   -@import "logistica-pedido-ruta";
19   -@import "tabs";
20   -@import "grid";
21   -@import "paginador-abm";
22   -@import "table-autorizar-nota-pedido";
  1 +@import 'constants';
  2 +@import 'admin-seguimiento';
  3 +@import 'bootstrap';
  4 +@import 'botonera';
  5 +@import 'botonera-lateral';
  6 +@import 'botonera-principal';
  7 +@import 'botonera-secundaria';
  8 +@import 'contenedor';
  9 +@import 'lista';
  10 +@import 'login';
  11 +@import 'panel-informativo';
  12 +@import 'tabla';
  13 +@import 'teclado';
  14 +@import 'tabla-articulos';
  15 +@import 'acciones-mobile';
  16 +@import 'swiper';
  17 +@import 'foca-crear';
  18 +@import 'logistica-pedido-ruta';
  19 +@import 'tabs';
  20 +@import 'grid';
  21 +@import 'paginador-abm';
  22 +@import 'table-autorizar-nota-pedido';
  23 +@import 'animations';
23 24  
24 25 //OCULTA FLECHAS INPUT NUMBER
25 26 input[type="number"] {