Florencia Cazzola / wrapper-demo

Commit 5610e89f1a369226c9e3fe8675c9abf93403c1ad

Authored by Eric Fernandez 2018-12-20 18:03:57 -0300

Merge branch 'master' into 'master'

clase .table-title

See merge request !28

Showing 6 changed files Show diff stats

src/sass/_acciones-mobile.scss

Diff comments View file @ 5610e89

1	.acciones-mobile {	1	.acciones-mobile {
2	line-height: 2.5em;	2	line-height: 2.5em;
3	color: orange;	3	color: orange;
4	font-size: 1.25em	4	font-size: 1.25em
5	}
		5	}

src/sass/_admin-seguimiento.scss

Diff comments View file @ 5610e89

1	.foca-admin-seguimiento {	1	.foca-admin-seguimiento {
2	osm {	2	osm {
3	&>div {	3	&>div {
4	height: 600px;	4	height: 535px;
5	}	5	}
6	}	6	}
7	}	7	}
8		8

src/sass/_bootstrap.scss

Diff comments View file @ 5610e89

-.active{
+button.active{
-    color: #fff;
     text-decoration: none;
     outline: 0;
-    background-color: #337ab7;
+    background-color: $primary-color;
+    &:focus{
+        box-shadow: 0 0 0 0.2rem #d8b07d;
+    }
 }
 .btn-xs {
     padding: .15rem .5rem;
     font-size: .8rem;
     line-height: 1.5;
     border-radius: .2rem;
 }
 .no-border-bottom {
     border-bottom: 0 !important;
 }
 .no-border-top {
     border-top: 0 !important;
 }
 .no-border {
     border: 0 !important;
 }
 .margin-bottom-mobile {
     margin-bottom: 2.5em !important;
 }
 .tamaño-boton {
     width:44px;
 }
 .modal-content {
     .modal-header{
         display: block;
         >div.row{
             margin: 0 !important;
             >div{
                 padding: 0 !important;
             }
         }
     }
     @media (max-width: 576px) {
         height: auto;
         height: 100%;
         border-radius: 0;
     }
 }
 .modal.show .modal-dialog {
     @media (min-width: 1201px){
         -webkit-transform: translate(0, 70px);
         transform: translate(0, 70px);
     }
     @media (min-width: 576px) {
         -webkit-transform: translate(0, 90px);
         transform: translate(0, 90px);
     }
     @media (max-width: 576px) {
         width: 100%;
         height: 100%;
         margin: 0;
         padding: 0;
     }
 }
 .modal-body {
     @media (max-width: 576px) {
         overflow-y: auto;
     }
 }
 .boton-salir {
     position: absolute;
     bottom: 10px;
     right: 15px;
     width: calc(100% - 15px);
 }
 input[type=number]::-webkit-inner-spin-button,
 input[type=number]::-webkit-outer-spin-button {
   -webkit-appearance: none;
   margin: 0;
 }
 .invisible {
     color: rgba(0,0,0,0);
 }

src/sass/_contenedor.scss

Diff comments View file @ 5610e89

 body {
-    @media (min-width: 768px) {
+    background-color: #cccccc;
-        background-color: #cccccc;
-    }
 }
 .contenedor {
     @media (min-width: 768px) {
         min-height: 600px;
         min-width: 800px;
     }
 }
 .grilla-articulo {
     @media (min-width: 768px) {
         height: 300px;
     }
 }

src/sass/_tabla.scss

Diff comments View file @ 5610e89

 .table {
     &-nonfluid {
         width: auto;
     }
     &-celda-total {
         color: #000000;
         background-color: #FF9900;
     }
+    &-title{
+        background-color: #67615e;
+        color: #FFF;
+        margin-bottom: 0;
+        padding: 0.25rem 0;
+        font-size: 1rem;
+    }
     thead th{
         font-size: 13px;
     }
+    &.table-abm{
+        thead{
+            color: #FFF;
+            background-color: #67615e;
+        }
+    }
 }

src/sass/general.scss

Diff comments View file @ 5610e89

 $primary-color: #e09125;
 @import 'admin-seguimiento';
 @import 'bootstrap';
 @import 'botonera';
 @import 'botonera-lateral';
 @import 'botonera-principal';
 @import 'botonera-secundaria';
 @import 'contenedor';
 @import 'lista';
 @import 'login';
 @import 'panel-informativo';
 @import 'tabla';
 @import 'teclado';
 @import 'tabla-articulos';
 @import 'acciones-mobile';
 @import 'swiper';
 @import 'foca-crear';
 //OCULTA FLECHAS INPUT NUMBER
 input[type='number'] {
     -moz-appearance:textfield;
 }
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {
     -webkit-appearance: none;
 }
 .d-md-grid{
     @media (min-width: 768px) {
         display: grid !important;
     }
 }
+.btn-outline-debo{
+    background-color: transparent;
+    color: $primary-color;
+    border-color: $primary-color;
+    &:hover{
+        color: #FFF;
+        border-color: transparent;
+        background-color: $primary-color;
+    }
+}