diff --cc client/wwwroot/scripts/mpf-main-controls/components/contractorAddress/component/contractorAddress.js
index 934ac32,0ad3982..0000000
--- a/client/wwwroot/scripts/mpf-main-controls/components/contractorAddress/component/contractorAddress.js
+++ b/client/wwwroot/scripts/mpf-main-controls/components/contractorAddress/component/contractorAddress.js
@@@ -140,8 -114,7 +140,8 @@@ define(
blockProvincia: '=?',
showTitle:'=?',
interiorRequired: '=?',
- disabledFieldsBeneficiary: '=?',
+ numeroRequired: '=?'
-
++ disabledFieldsBeneficiary: '=?'
}
})
diff --cc client/wwwroot/scripts/mpf-main-controls/services/services.js
index aeeb34a,124f2e9..0000000
--- a/client/wwwroot/scripts/mpf-main-controls/services/services.js
+++ b/client/wwwroot/scripts/mpf-main-controls/services/services.js
@@@ -1,16 -1,16 +1,29 @@@
'use strict'
define([
++<<<<<<< HEAD
+ 'angular', 'constants'
+], function(angular, constants){
+
+ var appControls = angular.module('mapfre.mainServices', []);
+
+ /*########################
+ # service
+ ########################*/
+ appControls.service('mainServices', function(){
+ /*########################
++=======
+ 'angular', 'constants'
+ ], function(angular, constants){
+
+ var appControls = angular.module('mapfre.mainServices', []);
+
+ /*########################
+ # service
+ ########################*/
+ appControls.service('mainServices', function(){
+ /*########################
++>>>>>>> master
# formatZeroBefore
########################*/
function fnFormatZeroBefore(number){
@@@ -38,9 -38,9 +51,15 @@@
# addDays
########################*/
function fnAddDays(date, days){
++<<<<<<< HEAD
+ date.setDate(date.getDate() + days);
+ return date;
+ }
++=======
+ date.setDate(date.getDate() + days);
+ return date;
+ }
++>>>>>>> master
/*########################
# fnStartsWith
########################*/
@@@ -56,16 -56,16 +75,29 @@@
var vResult = (documentType == constants.documentTypes.ruc.Codigo && fnStartsWith(documentNumber, '20'));
return !vResult;
}
++<<<<<<< HEAD
+
+
+ this.fnFormatZeroBefore = fnFormatZeroBefore;
+ this.fnDocNumMaxLength = fnDocNumMaxLength;
+ this.fnAddDays = fnAddDays;
+ this.fnStartsWith = fnStartsWith;
+ this.fnShowNaturalRucPerson = fnShowNaturalRucPerson;
+
+
+ });
++=======
+
+
+ this.fnFormatZeroBefore = fnFormatZeroBefore;
+ this.fnDocNumMaxLength = fnDocNumMaxLength;
+ this.fnAddDays = fnAddDays;
+ this.fnStartsWith = fnStartsWith;
+ this.fnShowNaturalRucPerson = fnShowNaturalRucPerson;
+
+
+ });
++>>>>>>> master
});
diff --cc client/wwwroot/styles/common/_fonts.scss
index 0dfeee1,8476275..0000000
--- a/client/wwwroot/styles/common/_fonts.scss
+++ b/client/wwwroot/styles/common/_fonts.scss
@@@ -2,11 -5,11 +5,19 @@@
@font-face {
font-family: 'Mapfree-iconss';
++<<<<<<< HEAD:client/wwwroot/styles/common/_fonts.scss
+ src: url('../../fonts/Mapfree-iconss.eot?cl9xmq');
+ src: url('../../fonts/Mapfree-iconss.eot?cl9xmq#iefix') format('embedded-opentype'),
+ url('../../fonts/Mapfree-iconss.ttf?cl9xmq') format('truetype'),
+ url('../../fonts/Mapfree-iconss.woff?cl9xmq') format('woff'),
+ url('../../fonts/Mapfree-iconss.svg?cl9xmq#Mapfree-iconss') format('svg');
++=======
+ src: url('../fonts/Mapfree-iconss.eot?fy0o9m');
+ src: url('../fonts/Mapfree-iconss.eot?fy0o9m#iefix') format('embedded-opentype'),
+ url('../fonts/Mapfree-iconss.ttf?fy0o9m') format('truetype'),
+ url('../fonts/Mapfree-iconss.woff?fy0o9m') format('woff'),
+ url('../fonts/Mapfree-iconss.svg?fy0o9m#Mapfree-iconss') format('svg');
++>>>>>>> master:client/wwwroot/styles/_fonts.scss
font-weight: normal;
font-style: normal;
}
@@@ -31,39 -34,6 +42,42 @@@
&:before { position: relative; top: 2px; }
}
++<<<<<<< HEAD:client/wwwroot/styles/common/_fonts.scss
+.ico-mapfre_184_circleCheck:before {
+ content: "\e9b7";
+}
+.ico-mapfre_183_refresh:before {
+ content: "\e9b8";
+}
+.ico-mapfre_181_eliminar:before {
+ content: "\e91c";
+}
+.ico-mapfre_29_eliminar:before {
+ content: "\e9b6";
+}
+.ico-mapfre_182_responder:before {
+ content: "\e9b5";
+}
+.ico-mapfre_180_estadistica:before {
+ content: "\e9af";
+}
+.ico-mapfre_179_alertas:before {
+ content: "\e9b0";
+}
+.ico-mapfre_178_autos:before {
+ content: "\e9b1";
+}
+.ico-mapfre_177_grua:before {
+ content: "\e9b2";
+}
+.ico-mapfre_176_call:before {
+ content: "\e9b3";
+}
+.ico-mapfre_175_ambulancia:before {
+ content: "\e9b4";
+}
++=======
++>>>>>>> master:client/wwwroot/styles/_fonts.scss
.ico-mapfre_174_fotoDocumento:before {
content: "\e9ad";
}
diff --cc client/wwwroot/styles/common/_general.scss
index 6e6d19b,626f057..0000000
--- a/client/wwwroot/styles/common/_general.scss
+++ b/client/wwwroot/styles/common/_general.scss
@@@ -363,7 -357,8 +368,12 @@@ input.ng-pristine:focus
background-color: $gris7;
border: 2px solid $gris7;
color: $c-white;
++<<<<<<< HEAD:client/wwwroot/styles/common/_general.scss
+ &:hover{
++=======
+ &:hover,
+ &:focus{
++>>>>>>> master:client/wwwroot/styles/_general.scss
background-color: $gris1;
border: 2px solid $gris1;
color:$c-white;
@@@ -619,9 -583,8 +629,14 @@@
// font-weight: $normal;
color: $c-black;
}
++<<<<<<< HEAD:client/wwwroot/styles/common/_general.scss
+ &.second-design{
+ font-size: $font-size4;
+ padding-bottom: 0;
++=======
+ &.c-font{
+ color: $gris1;
++>>>>>>> master:client/wwwroot/styles/_general.scss
}
// &2 {
// font-size: $font-size5;
@@@ -796,9 -758,9 +811,15 @@@ input.onlyInput, input.form-control
.g-autocomplete-desing {
input{
++<<<<<<< HEAD:client/wwwroot/styles/common/_general.scss
+ background: #fff url('../../scripts/b_components/select2/select2.png') no-repeat 100% -22px;
+ &.select2-active{
+ background: #fff url('../../scripts/b_components/select2/select2-spinner.gif') no-repeat 100%;
++=======
+ background: #fff url('../scripts/b_components/select2/select2.png') no-repeat 100% -22px;
+ &.select2-active{
+ background: #fff url('../scripts/b_components/select2/select2-spinner.gif') no-repeat 100%;
++>>>>>>> master:client/wwwroot/styles/_general.scss
}
}
.select2-container{
@@@ -1372,9 -1335,6 +1394,12 @@@
&.border-bottom{
border-bottom: 1px solid $gris29;
}
++<<<<<<< HEAD:client/wwwroot/styles/common/_general.scss
+ &.no-border-top{
+ border-top: 0;
+ }
++=======
++>>>>>>> master:client/wwwroot/styles/_general.scss
}
/*#################
# newSectionButton
@@@ -2728,7 -2684,7 +2758,11 @@@
background-color: $gris6;
@include prefix(border-radius, 5px);
border: 1px solid $gris4;
++<<<<<<< HEAD:client/wwwroot/styles/common/_general.scss
+ // margin-top: 20px;
++=======
+ margin-top: 20px;
++>>>>>>> master:client/wwwroot/styles/_general.scss
padding: 15px;
.file-ico, .file-name, .file-message {
@include inlineblock();
@@@ -3434,84 -3362,95 +3504,165 @@@
//Documents
.g-col-filter {
background-color: $gris11;
++<<<<<<< HEAD:client/wwwroot/styles/common/_general.scss
+ position: fixed;
+ bottom: auto;
+ top: auto;
+ left: 0;
+ right: 0;
+ z-index: 1030;
+ padding-bottom: 20px;
+ transition: all 0.5s ease;
+ #show-filter {
+ cursor: pointer;
+ background-color: $gris4;
+ border-top: 1px solid #969696;
+ &:after,
+ &:before{
+ width: 0;
+ height: 0;
+ border-style: solid;
+ position: absolute;
+ top: 0;
+ left: 50%;
+ }
+ &:after {
+ margin-left: -13px;
+ border-width: 9px 13px 0 13px;
++=======
+ position: fixed;
+ bottom: auto;
+ top: auto;
+ left: 0;
+ right: 0;
+ z-index: 1000;
+ padding: 0;
+ padding-top: 0;
+ padding-bottom: 20px;
+ transition: all 0.5s ease;
+ #show-filter {
+ cursor: pointer;
+ background-color: $gris4;
+ border-top: 1px solid #969696;
+ &:after,
+ &:before{
+ width: 0;
+ height: 0;
+ border-style: solid;
+ position: absolute;
+ top: 0;
+ left: 50%;
+ }
+ &:after {
+ margin-left: -13px;
+ border-width: 9px 13px 0 13px;
++>>>>>>> master:client/wwwroot/styles/_general.scss
border-color: $c-white transparent transparent transparent;
}
&:before {
margin-left: -15px;
++<<<<<<< HEAD:client/wwwroot/styles/common/_general.scss
+ border-width: 10px 15px 0 15px;
+ border-color: #969696 transparent transparent transparent;
+ }
+ span[class^="ico-mapfre_"],
+ span.glyphicon {
+ font-size: 24px;
+ color: #aba8a8;
+ font-weight: $bold;
+ }
+ }
+ &.show {
+ overflow: auto;
+ top: 0!important;
+ bottom: 0;
+ z-index: 9992;
+ }
+ &__box {
+ overflow: hidden;
+ overflow-y: auto;
+ -webkit-overflow-scrolling: touch;
+ }
+ .cnt-title,
+ .cnt-sub-title {
+ font-size: $font-size4;
+ font-weight: $bold;
++=======
+ border-width: 10px 15px 0 15px;
+ border-color: #969696 transparent transparent transparent;
+ }
+ span[class^="ico-mapfre_"],
+ span.glyphicon {
+ font-size: 24px;
+ color: #aba8a8;
+ font-weight: $bold;
+ }
}
- .cnt-sub-title{
- padding-top: 10px;
- border-top: 1px solid $gris4;
+ &.show { top: 0!important; bottom: 0; transition: all 0.5s ease; z-index: 1010; padding-top: 0; }
+ &__box {
+ overflow: hidden;
+ overflow-y: auto;
+ -webkit-overflow-scrolling: touch;
}
- .g-date-picker .input-group-btn button.btn{
- padding: 0;
+ .cnt-title,
+ .cnt-sub-title {
+ font-size: $font-size4;
+ font-weight: $bold;
++>>>>>>> master:client/wwwroot/styles/_general.scss
+ }
+ .cnt-sub-title{
+ padding-top: 10px;
+ border-top: 1px solid $gris4;
+ }
+ .g-date-picker .input-group-btn button.btn{
+ padding: 0;
}
}
@media (min-width:$break-medium) {
.g-col-filter {
++<<<<<<< HEAD:client/wwwroot/styles/common/_general.scss
+ padding-top: 20px;
+ position: relative;
+ bottom: auto;
+ top: auto;
+ left: auto;
+ right: auto;
+ z-index: 1;
+ &__box {
+ overflow: visible;
++=======
+ position: relative; bottom: auto; top: auto; left: auto; right: auto; z-index: 1;
+ padding-top: 20px;
+ transition: all 0.5s ease;
+ &__box { overflow: visible; }
+ }
+ }
+ @media (min-width:$break-xmedium) {
+ .g-col-filter {
+ .col-md-6 {
+ width: 100%;
}
}
}
+ @media (min-width:$break-large) {
+ .g-col-filter {
+ .col-md-6 {
+ width: 50%;
++>>>>>>> master:client/wwwroot/styles/_general.scss
+ }
+ }
+ }
+
++<<<<<<< HEAD:client/wwwroot/styles/common/_general.scss
++=======
+
+
+
+
+
++>>>>>>> master:client/wwwroot/styles/_general.scss
.relive{position: relative;}
.contenido-center{
.centrado-vert{
@@@ -3799,13 -3737,13 +3950,21 @@@ input::-ms-clear
@include inlineblock();
}
}
++<<<<<<< HEAD:client/wwwroot/styles/common/_general.scss
+@media (min-width: $break-medium) {
++=======
+ @media (min-width:$break-medium) {
++>>>>>>> master:client/wwwroot/styles/_general.scss
.g-col-md{
float: none;
@include inlineblock();
}
}
++<<<<<<< HEAD:client/wwwroot/styles/common/_general.scss
+@media (min-width: $break-small) {
++=======
+ @media (min-width:$break-small) {
++>>>>>>> master:client/wwwroot/styles/_general.scss
.g-col-sm{
float: none;
@include inlineblock();
@@@ -3818,186 -3756,36 +3977,215 @@@
width: 90%;
list-style-type: disc;
text-align: left;
+ font-size: $font-size1;
li{
list-style: inherit;
+ margin-top: 5px;
+ &:first-child{
+ margin-top: 0;
+ }
+ }
+}
+.g-default{
+ &.fontSize{
+ font-size: $font-size1;
}
}
++<<<<<<< HEAD:client/wwwroot/styles/common/_general.scss
+
+
+
+/*#############################
+# COBRANZA ANULADA
+#############################*/
+.top-text{
+ padding-top: 40px;
+ position: relative;
+}
+.des-user{
+ .bold{
+ font-weight: 700;
+ }
+}
+.md-cobran-anulada{
+ .cont-anuladas{
+ .sec-items{
+ height: 230px;
+ overflow: auto;
+ overflow-x: hidden;
+ .mt-modal{
+ margin-top: 15px;
+ }
+ }
+ }
+}
+
+/*#############################
+# CONSULTAS DE GESTION
+#############################*/
+.col-50-dktp { width: 50%; }
+.col-49-dktp { width: 49%; }
+.col-48-dktp { width: 48%; }
+.col-47-dktp { width: 47%; }
+.col-46-dktp { width: 46%; }
+.col-45-dktp { width: 45%; }
+.col-44-dktp { width: 44%; }
+.col-43-dktp { width: 43%; }
+.col-42-dktp { width: 42%; }
+.col-41-dktp { width: 41%; }
+.col-40-dktp { width: 40%; }
+.col-39-dktp { width: 39%; }
+.col-38-dktp { width: 38%; }
+.col-37-dktp { width: 37%; }
+.col-36-dktp { width: 36%; }
+.col-35-dktp { width: 35%; }
+.col-34-dktp { width: 34%; }
+.col-33-dktp { width: 33%; }
+.col-32-dktp { width: 32%; }
+.col-31-dktp { width: 31%; }
+.col-30-dktp { width: 30%; }
+.col-29-dktp { width: 29%; }
+.col-28-dktp { width: 28%; }
+.col-27-dktp { width: 27%; }
+.col-26-dktp { width: 26%; }
+.col-25-dktp { width: 25%; }
+.col-24-dktp { width: 24%; }
+.col-23-dktp { width: 23%; }
+.col-22-dktp { width: 22%; }
+.col-21-dktp { width: 21%; }
+.col-20-dktp { width: 20%; }
+.col-19-dktp { width: 19%; }
+.col-18-dktp { width: 18%; }
+.col-17-dktp { width: 17%; }
+.col-16-dktp { width: 16%; }
+.col-15-dktp { width: 15%; }
+.col-14-dktp { width: 14%; }
+.col-13-dktp { width: 13%; }
+.col-12-dktp { width: 12%; }
+.col-11-dktp { width: 11%; }
+.col-10-dktp { width: 10%; }
+.col-9-dktp { width: 9%; }
+.col-8-dktp { width: 8%; }
+.col-7-dktp { width: 7%; }
+.col-6-dktp { width: 6%; }
+.col-5-dktp { width: 5%; }
+.col-4-dktp { width: 4%; }
+.col-3-dktp { width: 3%; }
+.col-2-dktp { width: 2%; }
+.col-1-dktp { width: 1%; }
+
+/*#############################
+# INSPECCIONES
+#############################*/
+.g-horizontal-list {
+ display: block;
+ >li {
+ @include inlineblock;
+ }
+}
+a.disabled { pointer-events: none; }
+
+
+/*#############################
+# CALCULAR PRIMA
+#############################*/
+.g-calcularPrima {
+ padding-top : 18px;
+ padding-bottom : 14px;
+ padding-left : 29px;
+ padding-right : 29px;
+ border-radius : 20px;
+ border : 1px solid $gris4;
+ background-color : white;
+
+ .row {
+ padding-top : 8px;
+ padding-bottom : 8px;
+ margin-top: 0px;
+
+ span {
+ color : #CACACA;
+ }
+
+ &:nth-child(odd) {
+ background-color : $gris22;
+ }
+ &:last-child {
+ font-size : $font-size5;
+ span {
+ font-size : $font-size1;
+ }
+ }
+ }
+}
+
+/*
+ * timepicker
+ */
+
+.timepicker__wp {
+ @include prefix(transform, translateY(100%));
+ background: $gris14;
+ bottom: 0;
+ left: 0;
+ padding: 10px 0;
+ position: absolute;
+ z-index: 10;
+}
+
+.timepicker__arrow {
+ color: $gris3;
+}
+
+.timepicker__col {
+ width: 81px;
+}
+
+.timepicker__box-data {
+ background: $gris36 !important;
+ border: none;
+ display: block;
+ height: 35px;
+ margin: 5px auto !important;
+ margin: auto;
+ width: 40px !important;
+}
+
+.u-txt--uppercase {
+ text-transform: uppercase;
+}
+
+.u-outline--no {
+ outline: none !important;
+}
++=======
+ /* Sobreponer el modal en los wizard-stairs */
+ .modal{
+ z-index: 100001 !important;
+ }
+ .modal-backdrop{
+ z-index: 100000 !important;
+ }
+
+ /*#############################
+ # SPINER
+ #############################*/
+ // #spinner_modal{
+ // .spinner{
+ // width: 137px !important;
+ // height: 56px;
+ // background-image: url('../images/spinnerOIM.gif');
+ // top: 0 !important;
+ // left: 0 !important;
+ // right: 0;
+ // bottom: 0;
+ // margin: auto;
+ // > div{
+ // display: none;
+ // }
+ // }
+ // }
++>>>>>>> master:client/wwwroot/styles/_general.scss
/*#####################
@@@ -4015,207 -3803,4 +4203,211 @@@ fieldset[disabled] .form-control
#####################*/
.form-control:focus{
border-color: $gris15;
-}
++<<<<<<< HEAD:client/wwwroot/styles/common/_general.scss
+}
+
+/*#################
+# Menu border top
+#################*/
+.g-menu__body { overflow-y: hidden; position: fixed; }
+.g-menu-main {
+ position: absolute; top: 40px; right: 0; z-index: 1040; width: 100%; background-color: $c-white;bottom: 0;position: fixed;overflow-y: scroll;
+ &__box { padding-bottom: 1px; border-bottom: 1px solid $gris29; }
+ >span{
+ >li {
+ display: block;
+ font-size: $font-size4; text-align: center;
+ >a {
+ display: block; padding-top: 15px; padding-bottom: 10px; color: $gris7;
+ &:hover { color: $gris2; }
+ }
+ &.link {
+ border-left: 1px solid $gris29;
+ >a { border-bottom: 2px solid $c-white; }
+ &:hover {
+ >a { border-bottom: 2px solid $rojo_primario; }
+ }
+ }
+ &.actived {
+ >a { border-bottom: 2px solid $rojo_primario; }
+ }
+ &.submenu {
+ cursor: pointer; position: relative;
+ >a {
+ border-bottom: 2px solid $c-white; padding-bottom: 10px; padding-right: 18px;
+ }
+ &:after {
+ font-family: $Mapfre; content: '\e94b'; color: $rojo_primario;
+ position: absolute; top: 15px; right: 8px;
+ }
+ &:hover {
+ >a { border-bottom: 2px solid $rojo_primario; }
+ }
+ .sbm-main {
+ display: none;
+ position: relative;
+ background-color: transparent; width: 100%;
+ >span {
+ >li.sbm-link {
+ display: block; border-bottom: 0; background-color: $gris11;border-left: 1px solid $gris14;border-right: 1px solid $gris14;
+ >a { display: block; text-align: center; text-transform: uppercase; padding: 7px 10px; font-size: $font-size15; color: $gris7; border-bottom: 1px solid $gris14; }
+ &:hover {
+ >a { border-bottom: 2px solid $rojo_primario; color: $gris2; }
+ }
+ &.actived {
+ >a { border-bottom: 2px solid $rojo_primario; color: $gris2; }
+ }
+ }
+ }
+ }
+ &.actived {
+ >a { border-bottom: 2px solid $rojo_primario; }
+ }
+ &.active {
+ &:after { content: '\e94c'; }
+ >a {
+ border-bottom: 2px solid $rojo_primario;
+ color: $gris2;
+ }
+ .sbm-main {
+ display: block;
+ >span {
+ >li { text-align: center; }
+ }
+ }
+ }
+ }
+ }
+ }
+ &_ico { position: absolute; top: 5px; right: 15px; z-index: 1010; font-size: $font-size16; cursor: pointer; }
+ &__responsive {
+ top: 103px;
+ }
+}
+
+@media (min-width: $break-small){
+
+}
+@media (min-width: $break-medium){
+ .g-menu-main {
+ margin-top: 0; text-align: left;
+ >span {
+ @include inlineblock; max-width: 165px; width: 16.66666%;
+ >li {
+ font-size: $font-size3; display: inline-block; vertical-align: top;zoom: 1; width: 100%;
+ display: block; font-size: $font-size4;
+ border-left: 1px solid $gris29;
+ &.submenu {
+ .sbm-main{
+ position: absolute;top: 100%;z-index: -1; width: 100%;
+ @include prefix(box-shadow, 0px 5px 10px 0px rgba(0,0,0,0.15));
+ .sbm-link {
+ &.submenu__more {
+ position: relative;
+ &:before { font-family: $Mapfre; content: '\e94d'; color: $rojo_primario; position: absolute; left: 0; top: 5px; }
+ .sbm-main {
+ display: none;
+ position: absolute; right: 100.54%; top:0;
+ }
+ &.active {
+ .sbm-main {
+ display: block;
+ &:before{
+ content:''; width: 0;height: 0;border-style: solid;border-width: 7px 0 7px 12.1px;border-color: transparent transparent transparent $gris11;position: absolute;right: 0px;top: 10px;
+ }
+ .sbm-link{
+ margin-right: 10px;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ .g-menu-main {
+ position: relative; top: auto; right: auto;
+ text-align: justify; font-size: 0.1px; background-color: transparent; overflow-y: initial; z-index: 1030;
+ &:after { content: ''; width: 100%; display: inline-block; }
+ >span {
+ >li {
+ // &:last-child { border-right: 1px solid $gris29; }
+ &.submenu {
+ .sbm-main {
+ position: absolute; top: 100%; z-index: -1; width: 195px;
+ >span {
+ >li.sbm-link {
+ a { text-align: center; }
+ }
+ }
+ }
+ }
+ &.active {
+ .sbm-main {
+ top: 52px; z-index: 1100;
+ }
+ }
+ }
+ .liMasOpciones{
+ border-right: 1px solid $gris29;
+ }
+ }
+ }
+}
+
+@media (min-width: $break-xmedium){
+ .g-menu-main {
+ >span {
+ max-width: 195.8px;
+ }
+ }
+}
+
+//Box add item
+.g-box-add-item {
+ &-1 {
+ >span { @include inlineblock; width: 100%; margin-bottom: 15px;}
+ >a {
+ >span.glyphicon:before { margin-right: 10px; }
+ }
+ }
+
+ &-2 {
+ text-align: left;
+ .g-label3 {
+ padding-left: 4px;
+ }
+ >.row-add-item {
+ text-align: right; margin-bottom: 10px;
+ // &:before { content: ''; display: inline-block; vertical-align: middle; height: 100%; }
+ &:before { content: none;}
+ .col-add-item {
+ @include inlineblock; vertical-align: middle; float: none; margin-left: -4px;
+ // display: block; vertical-align: middle; float: none; margin-left: -4px;
+ .g-border-right { border-color: $gris10; }
+ &-general { text-align: left; &:before {content: "\e951"; font-family: $Mapfre; color:$gris10;} }
+ &-btns {
+ @include inlineblock; text-align: center; margin-top: 7px; padding-top: 3px; padding-bottom: 3px;
+ .ico-mapfre { @include inlineblock; margin: 0; font-size: $font-size8; color: $gris3; }
+ }
+ }
+ &:last-child { margin-bottom: 0; }
+ }
+
+ }
+
+ &-3 {
+ text-align: left; background-color: transparent; padding: 25px 20px 35px 20px;
+ h3 {font-size: 19px; border-bottom: 1px solid #eaeaea; padding-bottom: 10px; }
+ }
+}
+
+.tbl-has-scrollbar { margin-right: 17px; }
+
+
+
++=======
++}
++>>>>>>> master:client/wwwroot/styles/_general.scss
diff --cc client/wwwroot/styles/common/_header.scss
index e71d18a,e333a64..0000000
--- a/client/wwwroot/styles/common/_header.scss
+++ b/client/wwwroot/styles/common/_header.scss
@@@ -319,8 -215,38 +215,42 @@@
}
}
++<<<<<<< HEAD:client/wwwroot/styles/common/_header.scss
+.menu-perfil-body { overflow: hidden; }
++=======
+ .g-ayuda-box {
+ text-align:left;padding-left: 15px;padding-bottom: 9px;
+ &.active {
+ position:relative;
+ a.g-perfil-name {
+ color:$c-white;
+ > span.ico-select {color:$c-white; font-weight:$bold;}
+ }
+ }
+ a.g-perfil-name {
+ text-align:left;color:$gris7;
+ > span.ico-select {color:$rojo_primario; font-weight:$bold; }
+ }
+ > ul {
+ position:absolute;width: 214px;top: 55px;right: -15px;background-color: $c-white;border: 1px solid $gris13;z-index: 9;
+ > li {
+ text-align: left; display:block; padding-bottom: 13px; padding-top: 13px;padding-left: 13px;border-bottom: 1px solid $gris13; color:$gris1;
+ &:hover{
+ background-color: #f2f5f7;
+ }
+ }
+ > li:last-child {border-bottom:0;}
+ }
+ }
++>>>>>>> master:client/wwwroot/styles/_header.scss
+ .menu-perfil-background {
+ background-color: rgba(0,0,0,0.5);
+ position: fixed; top: 0; bottom: 0; left: 0; right: 0;
+ z-index: 1001;
+ }
+ .menu-perfil-body { overflow: hidden; }
+
@media (max-width: 960px){
.header{
diff --cc client/wwwroot/styles/common/_mainGeneral.scss
index c7c7449,50eeac0..0000000
--- a/client/wwwroot/styles/common/_mainGeneral.scss
+++ b/client/wwwroot/styles/common/_mainGeneral.scss
@@@ -1,641 -1,25 +1,669 @@@
++<<<<<<< HEAD:client/wwwroot/styles/common/_mainGeneral.scss
+//Prefijos
+// $prefixes: "webkit", "moz", "ms", "o", "none";
+// @mixin prefix($property, $arguments) {
+// @each $prefix in $prefixes {
+// @if $prefix == "none" {
+// #{$property}: $argf1f5f7uments;
+// } @else {
+// -#{$prefix}-#{$property}: $arguments;
+// }
+// }
+// }
+@mixin prefix($property, $value) {
+ @include prefix-none($property, $value);
+ -webkit-#{$property}: $value;
+ -moz-#{$property}: $value;
+ -ms-#{$property}: $value;
+ -o-#{$property}: $value;
+}
+@mixin prefix-none($property, $value) {
+ #{$property}: $value;
+}
+
+// Screen Sizes
+$break-xxxsmall: 375px;
+$break-xxsmall: 414px;
+$break-xsmall: 480px;
+$break-small: 768px;
+$break-medium: 992px;
+$break-xmedium: 1020px;
+$break-large: 1200px;
+$break-xlarge: 1820px;
+
+// Colors
+$c-black: #000000;
+$c-white: #FFFFFF;
+$rojo_primario: #D81E05;
+// $rojo_primario: #B9230F;
+$rojo1: #CA0303;
+$rojo2: #BE0F0F;
+$rojo3: #AC0404;
+$rojo4: #F02004;
+$error: #E30513;
+$rojo5: #ff0000;
+$rojo6: #D79999;
+
+//new
+$rojo7: #db3a2b;
+$rojo8: #cd3d3d;
+
+$gris1: #27282A;
+$gris2: #4C4C4C;
+$gris3: #ADAAAA;
+$gris4: #D5D5D5;
+$gris5: #EAE9E9;
+$gris6: #F7F7F7;
+$gris7: #7E7E7E;
+$gris8: #878787;
+$gris9: #F1F5F7;
+$gris10: #CACACA;
+$gris11: #F4F4F4;
+$gris12: #989290;
+$gris13: #E5E5E5;
+$gris14: #E1E1E1;
+$gris15: #9E9E9E;
+$gris16: #C6C6C6;
+$gris17: #f1f3f5;
+$gris18: #f8f8f9;
+$gris19: #efefef;
+$gris20: #c9c9c9;
+$gris21: #3d4043;
+$gris22: #f8fafb;
+$gris23: #EBEFF0;
+$gris24: #A4A4A4;
+$gris25: #2C2C2E;
+$gris26: #C0BDBC;
+$gris27: #9B9EA3;
+$gris28: #9A9D9F;
+$gris29: #EAEAEA;
+//new
+$gris30: #888383;
+$gris31: #e0e0e0;
+$gris32: #8a8a8a;
+$gris33: #848484;
+$gris34: #E3E5E6;
+$gris35: #8f8f8f;
+$gris36: #e9eaed;
+
+
+$verde1:#8DB602;
+$verde2:#749806;
+$verde3:#607f03;
+$verde4:#8aaf19;
+$verde5:#09c3a7;
+$verde6:#727e4d;
+$verde7:#2eb19d;
+
+$c-purple1: #6676ee;
+$c-purple2: #E25271;
+$c-blue1: #008aff;
+$c-blue2: #186abd;
+$c-blue3: #37ace2;
+$c-celeste1: #28bbdb;
+$c-yellow: #EFB51A;
+$c-yellow1: #e1c110;
+$c-yellow2: #CE9B00;
+$c-orange1: #ff7800;
+$c-orange2: #e19f11;
+$c-orange3: #e17d11;
+$c-orange4: #ed7839;
+
+// Fonts
+// $icomoon: 'icomoon';
+$font-family:'Roboto', sans-serif;
+// $FontAwesome: 'FontAwesome';
+$Mapfre: 'Mapfree-iconss'; //'mapfre';
+// Weight
+$thin:100;
+$light:300;
+$normal:400!important;
+$medium:500;
+$bold:700!important;
+$ultra-bold:900;
+// FontSize
+$font-size: 11px;
+$font-size14: 12px;
+$font-size15: 13px;
+$font-size1: 14px;
+$font-size2: 15px;
+$font-size3: 16px;
+$font-size10: 17px;
+$font-size4: 18px;
+$font-size12: 19px;
+$font-size5: 20px;
+$font-size9: 21px;
+$font-size6: 22px;
+$font-size13: 23px;
+$font-size11: 24px;
+$font-size14: 25px;
+$font-size7: 27px;
+$font-size8: 30px;
+$font-size16: 32px;
+
+//Heights
+$height1:46px;
+$height2:30px;
+
+//IE-7+
+@mixin inlineblock{
+ display: inline-block;
+ vertical-align:top;
+ *display: inline;
+ zoom: 1;
+}
+
+// .wancho{
+// width: 100%;
+// max-width: 1200px;
+// margin: auto;
+// }
+
+body{
+ font-family: $font-family;
+ font-weight: $normal;
+ font-size: $font-size1;
+ color: $gris1;
+ // padding-top: 50px;
+ background-color: $gris4;
+}
+
+a{
+ color: inherit;
+ &:hover,
+ &:focus{
+ // color: inherit;
+ text-decoration: none;
+ cursor: pointer;
+ }
+}
+
+.cf{
+ zoom: 1;
+ &:after,
+ &:before{
+ content: "";
+ display: table;
+ }
+ &:after{
+ clear: both;
+ }
+}
+
+.no-bt {border-top:0!important;}
+.no-br {border-right:0!important;}
+.no-bb {border-bottom:0!important;}
+.no-bl {border-left:0!important;}
+
+.no-uppercase {text-transform:none;}
+
+/* MARGIN */
+.mt-xs-0 { margin-top: 0}
+.mt-xs-1 { margin-top: 10px}
+.mt-xs-2 { margin-top: 20px}
+.mt-xs-3 { margin-top: 30px}
+.mt-xs-4 { margin-top: 40px}
+.mt-xs-5 { margin-top: 50px}
+.mt-xs-6 { margin-top: 60px}
+.mt-xs-7 { margin-top: 70px}
+.mt-xs-8 { margin-top: 80px}
+.mt-xs-9 { margin-top: 90px}
+.mr-xs-2 { margin-right: 20px}
+.mb-xs-0 { margin-bottom: 0}
+.mb-xs-1 { margin-bottom: 10px}
+.mb-xs-2 { margin-bottom: 20px}
+.mb-xs-3 { margin-bottom: 30px}
+.mb-xs-4 { margin-bottom: 40px}
+.mb-xs-5 { margin-bottom: 50px}
+.mb-xs-6 { margin-bottom: 60px}
+.mb-xs-7 { margin-bottom: 70px}
+.mb-xs-8 { margin-bottom: 80px}
+.mb-xs-9 { margin-bottom: 90px}
+.no-margin-xs{margin: 0}
+.no-ml-xs { margin-left: 0}
+.no-mr-xs { margin-right: 0}
+.no-mt-xs { margin-top: 0}
+.no-mb-xs { margin-bottom: 0}
+/* FIN MARGENES */
+/* PADDING */
+.pt-xs-0 { padding-top: 0}
+.pt-xs-1 { padding-top: 10px}
+.pt-xs-2 { padding-top: 20px}
+.pt-xs-3 { padding-top: 30px}
+.pt-xs-4 { padding-top: 40px}
+.pt-xs-5 { padding-top: 50px}
+.pt-xs-6 { padding-top: 60px}
+.pt-xs-7 { padding-top: 70px}
+.pt-xs-8 { padding-top: 80px}
+.pt-xs-9 { padding-top: 90px}
+.pb-xs-0 { padding-bottom: 0}
+.pb-xs-1 { padding-bottom: 10px}
+.pb-xs-2 { padding-bottom: 20px}
+.pb-xs-3 { padding-bottom: 30px}
+.pb-xs-4 { padding-bottom: 40px}
+.pb-xs-5 { padding-bottom: 50px}
+.pb-xs-6 { padding-bottom: 60px}
+.pb-xs-7 { padding-bottom: 70px}
+.pb-xs-8 { padding-bottom: 80px}
+.pb-xs-9 { padding-bottom: 90px}
+.pr-xs-0 { padding-right: 0}
+.pr-xs-0-5 { padding-right: 5px}
+.pr-xs-1 { padding-right: 10px}
+.pr-xs-2 { padding-right: 20px}
+.pr-xs-3 { padding-right: 30px}
+.pr-xs-4 { padding-right: 40px}
+.pr-xs-5 { padding-right: 50px}
+.pr-xs-6 { padding-right: 60px}
+.pr-xs-7 { padding-right: 70px}
+.pr-xs-8 { padding-right: 80px}
+.pr-xs-9 { padding-right: 90px}
+.pl-xs-0 { padding-left: 0}
+.pl-xs-0-5 { padding-left: 5px}
+.pl-xs-1 { padding-left: 10px}
+.pl-xs-2 { padding-left: 20px}
+.pl-xs-3 { padding-left: 30px}
+.pl-xs-4 { padding-left: 40px}
+.pl-xs-5 { padding-left: 50px}
+.pl-xs-6 { padding-left: 60px}
+.pl-xs-7 { padding-left: 70px}
+.pl-xs-8 { padding-left: 80px}
+.pl-xs-9 { padding-left: 90px}
+.no-padding-xs{padding: 0}
+.no-pl-xs { padding-left: 0}
+.no-pr-xs { padding-right: 0}
+.no-pt-xs { padding-top: 0}
+.no-pb-xs { padding-bottom: 0}
+
+/* FIN PADDING */
+
+/* ALIGN-TEXT */
+.g-text-right-xs{
+ text-align: right;
+}
+.g-text-left-xs{
+ text-align: left;
+}
+.g-text-center-xs{
+ text-align: center;
+}
+/* FIN ALIGN-TEXT */
+
+.container{
+ max-width: 1200px;
+ width: 100%;
+ margin: auto;
+}
+
+
+// @media (min-width: 1450px){
+// .w-content{
+// width: 100%;
+// margin-left: 0;
+// }
+// }
+// @media (max-width: 960px){
+// .w-content{
+// width: 100%;
+// margin-left: 0;
+// }
+// }
+
+@media (min-width: $break-medium){
+ /* MARGIN */
+ .mt-md-0 { margin-top: 0}
+ .mt-md-1 { margin-top: 10px}
+ .mt-md-2 { margin-top: 20px}
+ .mt-md-3 { margin-top: 30px}
+ .mt-md-4 { margin-top: 40px}
+ .mt-md-5 { margin-top: 50px}
+ .mt-md-6 { margin-top: 60px}
+ .mb-md-0 { margin-bottom: 0!important}
+ .mb-md-1 { margin-bottom: 10px}
+ .mb-md-2 { margin-bottom: 20px}
+ .mb-md-3 { margin-bottom: 30px}
+ .mb-md-4 { margin-bottom: 40px}
+ .mb-md-5 { margin-bottom: 50px}
+ .mb-md-6 { margin-bottom: 60px}
+ .mr-md-0 { margin-right: 0!important}
+ .mr-md-1 { margin-right: 10px!important}
+ .mr-md-2 { margin-right: 20px!important}
+ .mr-md-3 { margin-right: 30px!important}
+ .mr-md-4 { margin-right: 40px!important}
+ .mr-md-5 { margin-right: 50px!important}
+ .mr-md-6 { margin-right: 60px!important}
+ .ml-md-0 { margin-left: 0!important}
+ .ml-md-1 { margin-left: 10px!important}
+ .ml-md-2 { margin-left: 20px!important}
+ .ml-md-3 { margin-left: 30px!important}
+ .ml-md-4 { margin-left: 40px!important}
+ .ml-md-5 { margin-right: 50px!important}
+ .ml-md-6 { margin-right: 60px!important}
+ .no-margin-md{margin: 0}
+ .no-ml-md { margin-left: 0}
+ .no-mr-md { margin-right: 0}
+ .no-mt-md { margin-top: 0}
+ .no-mb-md { margin-bottom: 0}
+
+ // .mt-sm-0 { margin-top: 0}
+ // .mt-sm-1 { margin-top: 0}
+ // .mt-sm-2 { margin-top: 0}
+ // .mt-sm-3 { margin-top: 0}
+ // .mt-sm-4 { margin-top: 0}
+ // .mt-sm-5 { margin-top: 0}
+ // .mt-sm-6 { margin-top: 0}
+ // .mt-sm-7 { margin-top: 0}
+ // .mt-sm-8 { margin-top: 0}
+ // .mt-sm-9 { margin-top: 0}
+ // .mb-sm-0 { margin-bottom: 0}
+ // .mb-sm-1 { margin-bottom: 0}
+ // .mb-sm-2 { margin-bottom: 0}
+ // .mb-sm-3 { margin-bottom: 0}
+ // .mb-sm-4 { margin-bottom: 0}
+ // .mb-sm-5 { margin-bottom: 0}
+ // .mb-sm-6 { margin-bottom: 0}
+ // .mb-sm-7 { margin-bottom: 0}
+ // .mb-sm-8 { margin-bottom: 0}
+ // .mb-sm-9 { margin-bottom: 0}
+
+ // .mt-xs-0 { margin-top: 0}
+ // .mt-xs-1 { margin-top: 0}
+ // .mt-xs-2 { margin-top: 0}
+ // .mt-xs-3 { margin-top: 0}
+ // .mt-xs-4 { margin-top: 0}
+ // .mt-xs-5 { margin-top: 0}
+ // .mt-xs-6 { margin-top: 0}
+ // .mt-xs-7 { margin-top: 0}
+ // .mt-xs-8 { margin-top: 0}
+ // .mt-xs-9 { margin-top: 0}
+ // .mb-xs-0 { margin-bottom: 0}
+ // .mb-xs-1 { margin-bottom: 0}
+ // .mb-xs-2 { margin-bottom: 0}
+ // .mb-xs-3 { margin-bottom: 0}
+ // .mb-xs-4 { margin-bottom: 0}
+ // .mb-xs-5 { margin-bottom: 0}
+ // .mb-xs-6 { margin-bottom: 0}
+ // .mb-xs-7 { margin-bottom: 0}
+ // .mb-xs-8 { margin-bottom: 0}
+ // .mb-xs-9 { margin-bottom: 0}
+ /* FIN MARGENES */
+ /* PADDING */
+ .pt-md-0 { padding-top: 0!important}
+ .pt-md-1 { padding-top: 10px}
+ .pt-md-2 { padding-top: 20px}
+ .pt-md-3 { padding-top: 30px}
+ .pt-md-4 { padding-top: 40px}
+ .pt-md-5 { padding-top: 50px}
+ .pt-md-6 { padding-top: 60px}
+ .pb-md-0 { padding-bottom: 0}
+ .pb-md-1 { padding-bottom: 10px}
+ .pb-md-2 { padding-bottom: 20px}
+ .pb-md-3 { padding-bottom: 30px}
+ .pb-md-4 { padding-bottom: 40px}
+ .pb-md-5 { padding-bottom: 50px}
+ .pb-md-6 { padding-bottom: 60px}
+ .pr-md-0 { padding-right: 0!important}
+ .pr-md-1 { padding-right: 10px!important}
+ .pr-md-2 { padding-right: 20px!important}
+ .pr-md-3 { padding-right: 30px!important}
+ .pr-md-4 { padding-right: 40px!important}
+ .pr-md-5 { padding-right: 50px!important}
+ .pr-md-6 { padding-right: 60px!important}
+ .pl-md-0 { padding-left: 0!important}
+ .pl-md-1 { padding-left: 10px!important}
+ .pl-md-2 { padding-left: 20px!important}
+ .pl-md-3 { padding-left: 30px!important}
+ .pl-md-4 { padding-left: 40px!important}
+ .pl-md-5 { padding-left: 50px!important}
+ .pl-md-6 { padding-left: 60px!important}
+ .no-padding-md{padding: 0}
+ .no-pl-md { padding-left: 0}
+ .no-pr-md { padding-right: 0}
+ .no-pt-md { padding-top: 0}
+ .no-pb-md { padding-bottom: 0}
+
+ // .pt-sm-0 { padding-top: 0}
+ // .pt-sm-1 { padding-top: 0}
+ // .pt-sm-2 { padding-top: 0}
+ // .pt-sm-3 { padding-top: 0}
+ // .pt-sm-4 { padding-top: 0}
+ // .pt-sm-5 { padding-top: 0}
+ // .pt-sm-6 { padding-top: 0}
+ // .pt-sm-7 { padding-top: 0}
+ // .pt-sm-8 { padding-top: 0}
+ // .pt-sm-9 { padding-top: 0}
+ // .pb-sm-0 { padding-bottom: 0}
+ // .pb-sm-1 { padding-bottom: 0}
+ // .pb-sm-2 { padding-bottom: 0}
+ // .pb-sm-3 { padding-bottom: 0}
+ // .pb-sm-4 { padding-bottom: 0}
+ // .pb-sm-5 { padding-bottom: 0}
+ // .pb-sm-6 { padding-bottom: 0}
+ // .pb-sm-7 { padding-bottom: 0}
+ // .pb-sm-8 { padding-bottom: 0}
+ // .pb-sm-9 { padding-bottom: 0}
+
+ // .pt-xs-0 { padding-top: 0}
+ // .pt-xs-1 { padding-top: 0}
+ // .pt-xs-2 { padding-top: 0}
+ // .pt-xs-3 { padding-top: 0}
+ // .pt-xs-4 { padding-top: 0}
+ // .pt-xs-5 { padding-top: 0}
+ // .pt-xs-6 { padding-top: 0}
+ // .pt-xs-7 { padding-top: 0}
+ // .pt-xs-8 { padding-top: 0}
+ // .pt-xs-9 { padding-top: 0}
+ // .pb-xs-0 { padding-bottom: 0}
+ // .pb-xs-1 { padding-bottom: 0}
+ // .pb-xs-2 { padding-bottom: 0}
+ // .pb-xs-3 { padding-bottom: 0}
+ // .pb-xs-4 { padding-bottom: 0}
+ // .pb-xs-5 { padding-bottom: 0}
+ // .pb-xs-6 { padding-bottom: 0}
+ // .pb-xs-7 { padding-bottom: 0}
+ // .pb-xs-8 { padding-bottom: 0}
+ // .pb-xs-9 { padding-bottom: 0}
+ /* FIN PADDING */
+
+ /* ALIGN-TEXT */
+ .g-text-right-md{
+ text-align: right;
+ }
+ .g-text-left-md{
+ text-align: left;
+ }
+ .g-text-center-md{
+ text-align: center;
+ }
+ /* FIN ALIGN-TEXT */
+
+}
+
+@media (min-width: $break-small){
+ /* MARGIN */
+ .mt-sm-0 { margin-top: 0}
+ .mt-sm-1 { margin-top: 10px}
+ .mt-sm-2 { margin-top: 20px}
+ .mt-sm-3 { margin-top: 30px}
+ .mt-sm-4 { margin-top: 40px}
+ .mt-sm-5 { margin-top: 50px}
+ .mt-sm-6 { margin-top: 60px}
+ .mt-sm-7 { margin-top: 70px}
+ .mt-sm-8 { margin-top: 80px}
+ .mt-sm-9 { margin-top: 90px}
+ .mb-sm-0 { margin-bottom: 0}
+ .mb-sm-1 { margin-bottom: 10px}
+ .mb-sm-2 { margin-bottom: 20px}
+ .mb-sm-3 { margin-bottom: 30px}
+ .mb-sm-4 { margin-bottom: 40px}
+ .mb-sm-5 { margin-bottom: 50px}
+ .mb-sm-6 { margin-bottom: 60px}
+ .mb-sm-7 { margin-bottom: 70px}
+ .mb-sm-8 { margin-bottom: 80px}
+ .mb-sm-9 { margin-bottom: 90px}
+ .no-margin-sm{margin: 0}
+ .no-ml-sm { margin-left: 0}
+ .no-mr-sm { margin-right: 0}
+ .no-mt-sm { margin-top: 0}
+ .no-mb-sm { margin-bottom: 0}
+
+ // .mt-xs-0 { margin-top: 0}
+ // .mt-xs-1 { margin-top: 0}
+ // .mt-xs-2 { margin-top: 0}
+ // .mt-xs-3 { margin-top: 0}
+ // .mt-xs-4 { margin-top: 0}
+ // .mt-xs-5 { margin-top: 0}
+ // .mt-xs-6 { margin-top: 0}
+ // .mt-xs-7 { margin-top: 0}
+ // .mt-xs-8 { margin-top: 0}
+ // .mt-xs-9 { margin-top: 0}
+ // .mb-xs-0 { margin-bottom: 0}
+ // .mb-xs-1 { margin-bottom: 0}
+ // .mb-xs-2 { margin-bottom: 0}
+ // .mb-xs-3 { margin-bottom: 0}
+ // .mb-xs-4 { margin-bottom: 0}
+ // .mb-xs-5 { margin-bottom: 0}
+ // .mb-xs-6 { margin-bottom: 0}
+ // .mb-xs-7 { margin-bottom: 0}
+ // .mb-xs-8 { margin-bottom: 0}
+ // .mb-xs-9 { margin-bottom: 0}
+
+ /* FIN MARGENES */
+ /* PADDING */
+ .pt-sm-0 { padding-top: 0}
+ .pt-sm-1 { padding-top: 10px}
+ .pt-sm-2 { padding-top: 20px}
+ .pt-sm-3 { padding-top: 30px}
+ .pt-sm-4 { padding-top: 40px}
+ .pt-sm-5 { padding-top: 50px}
+ .pt-sm-6 { padding-top: 60px}
+ .pb-sm-0 { padding-bottom: 0}
+ .pb-sm-1 { padding-bottom: 10px}
+ .pb-sm-2 { padding-bottom: 20px}
+ .pb-sm-3 { padding-bottom: 30px}
+ .pb-sm-4 { padding-bottom: 40px}
+ .pb-sm-5 { padding-bottom: 50px}
+ .pb-sm-6 { padding-bottom: 60px}
+ .pr-sm-0 { padding-right: 0}
+ .pr-sm-1 { padding-right: 10px}
+ .pr-sm-2 { padding-right: 20px}
+ .pr-sm-3 { padding-right: 30px}
+ .pr-sm-4 { padding-right: 40px}
+ .pr-sm-5 { padding-right: 50px}
+ .pr-sm-6 { padding-right: 60px}
+ .pr-sm-7 { padding-right: 70px}
+ .pr-sm-8 { padding-right: 80px}
+ .pr-sm-9 { padding-right: 90px}
+ .pl-sm-0 { padding-left: 0}
+ .pl-sm-1 { padding-left: 10px}
+ .pl-sm-2 { padding-left: 20px}
+ .pl-sm-3 { padding-left: 30px}
+ .pl-sm-4 { padding-left: 40px}
+ .pl-sm-5 { padding-left: 50px}
+ .pl-sm-6 { padding-left: 60px}
+ .pl-sm-7 { padding-left: 70px}
+ .pl-sm-8 { padding-left: 80px}
+ .pl-sm-9 { padding-left: 90px}
+ .no-padding-sm{padding: 0}
+ .no-pl-sm { padding-left: 0}
+ .no-pr-sm { padding-right: 0}
+ .no-pt-sm { padding-top: 0}
+ .no-pb-sm { padding-bottom: 0}
+ .pl-xs-1-5 {padding-left: 15px}
+
+ // .pt-xs-0 { padding-top: 0}
+ // .pt-xs-1 { padding-top: 0}
+ // .pt-xs-2 { padding-top: 0}
+ // .pt-xs-3 { padding-top: 0}
+ // .pt-xs-4 { padding-top: 0}
+ // .pt-xs-5 { padding-top: 0}
+ // .pt-xs-6 { padding-top: 0}
+ // .pt-xs-7 { padding-top: 0}
+ // .pt-xs-8 { padding-top: 0}
+ // .pt-xs-9 { padding-top: 0}
+ // .pb-xs-0 { padding-bottom: 0}
+ // .pb-xs-1 { padding-bottom: 0}
+ // .pb-xs-2 { padding-bottom: 0}
+ // .pb-xs-3 { padding-bottom: 0}
+ // .pb-xs-4 { padding-bottom: 0}
+ // .pb-xs-5 { padding-bottom: 0}
+ // .pb-xs-6 { padding-bottom: 0}
+ // .pb-xs-7 { padding-bottom: 0}
+ // .pb-xs-8 { padding-bottom: 0}
+ // .pb-xs-9 { padding-bottom: 0}
+ /* FIN PADDING */
+
+ /* ALIGN-TEXT */
+ .g-text-right-sm{
+ text-align: right;
+ }
+ .g-text-left-sm{
+ text-align: left;
+ }
+ .g-text-center-sm{
+ text-align: center;
+ }
+ /* FIN ALIGN-TEXT */
+}
+// @media (max-width: $break-xsmall){
+// /* MARGIN */
+// .xs-mt-0 { margin-top: 0}
+// .xs-mt-1 { margin-top: 10px}
+// .xs-mt-2 { margin-top: 20px}
+// .xs-mt-3 { margin-top: 30px}
+// .xs-mt-4 { margin-top: 40px}
+// .xs-mt-5 { margin-top: 50px}
+// .xs-mt-6 { margin-top: 60px}
+// .xs-mt-0 { margin-bottom: 0}
+// .xs-mb-1 { margin-bottom: 10px}
+// .xs-mb-2 { margin-bottom: 20px}
+// .xs-mb-3 { margin-bottom: 30px}
+// .xs-mb-4 { margin-bottom: 40px}
+// .xs-mb-5 { margin-bottom: 50px}
+// .xs-mb-6 { margin-bottom: 60px}
+// .xs-no-margin{margin: 0}
+// FIN MARGENES
+// /* PADDING */
+// .xs-pt-0 { padding-top: 0}
+// .xs-pt-1 { padding-top: 10px}
+// .xs-pt-2 { padding-top: 20px}
+// .xs-pt-3 { padding-top: 30px}
+// .xs-pt-4 { padding-top: 40px}
+// .xs-pt-5 { padding-top: 50px}
+// .xs-pt-6 { padding-top: 60px}
+// .xs-pt-0 { padding-bottom: 0}
+// .xs-pb-1 { padding-bottom: 10px}
+// .xs-pb-2 { padding-bottom: 20px}
+// .xs-pb-3 { padding-bottom: 30px}
+// .xs-pb-4 { padding-bottom: 40px}
+// .xs-pb-5 { padding-bottom: 50px}
+// .xs-pb-6 { padding-bottom: 60px}
+// .xs-no-padding{padding: 0}
+// /* FIN PADDING */
+// }
++=======
+ @import 'fonts';
+ @import 'normalize';
+
+
+ @import 'mainGeneral';
+
+
+ @import 'general';
+ @import 'header';
+ @import 'footer';
+ @import 'home';
+ @import 'autos';
+ @import 'login';
+ //@import 'soat';
+ @import 'hogar';
+ @import 'transporte';
+ @import 'empresa';
+ @import 'accidentes';
+ @import 'sctr';
+ @import 'nsctr';
+ @import 'vida';
+ @import 'cartas';
+
+
+ @import 'ie';
++>>>>>>> master:client/wwwroot/styles/main.scss
diff --cc client/wwwroot/styles/nsctr/_nsctr.scss
index d061927,d27e93c..0000000
--- a/client/wwwroot/styles/nsctr/_nsctr.scss
+++ b/client/wwwroot/styles/nsctr/_nsctr.scss
@@@ -397,12 -404,31 +397,17 @@@
++<<<<<<< HEAD:client/wwwroot/styles/nsctr/_nsctr.scss
+/*#############################
+# responsive
+#############################*/
+//min-width
+@media (min-width:1200px){
++=======
+
+ @media (min-width: $break-large){
++>>>>>>> master:client/wwwroot/styles/_nsctr.scss
.g-nsctr{
- // .col-lg-middle{
- // height: 46px;
- // position: absolute;
- // top: 0;
- // right: 0;
- // bottom: 0;
- // margin: auto;
- // z-index: 10;
- // &.s-check{
- // height: 20px;
- // }
- // &.s-radio{
- // height: 50px;
- // }
- // &.left{
- // right: inherit;
- // left: 0;
- // }
- // &.bottom{
- // top: inherit;
- // }
- // }
.col-lg-top,
.col-lg-middle,
.col-lg-bottom{
@@@ -469,8 -523,37 +474,12 @@@
}
}
++<<<<<<< HEAD:client/wwwroot/styles/nsctr/_nsctr.scss
++=======
+
++>>>>>>> master:client/wwwroot/styles/_nsctr.scss
@media (min-width: $break-small){
.g-nsctr{
- // .col-sm-middle{
- // height: 46px;
- // position: absolute;
- // top: 0;
- // right: 0;
- // bottom: 0;
- // margin: auto;
- // z-index: 10;
- // &.s-check{
- // height: 20px;
- // }
- // &.s-radio{
- // height: 50px;
- // }
- // &.left{
- // right: inherit;
- // left: 0;
- // }
- // &.bottom{
- // top: inherit;
- // }
- // }
.col-sm-top,
.col-sm-middle,
.col-sm-bottom{
@@@ -503,7 -586,12 +512,10 @@@
}
}
++<<<<<<< HEAD:client/wwwroot/styles/nsctr/_nsctr.scss
+//max-width
++=======
++>>>>>>> master:client/wwwroot/styles/_nsctr.scss
@media (max-width: $break-small){
.g-nsctr{
.row-checkbox{
@@@ -517,32 -605,9 +529,36 @@@
}
}
}
+ .sec-results-fixed{
+ // &.animated{
+ &.responsive{
+ top: 0;
+ right: 0;
+ overflow: auto;
+ }
+ }
+ }
+ .g-overflow{
+ &-auto-sm{
+ overflow: auto;
+ }
+ &-hidden-sm{
+ overflow: hidden;
+ }
+ &-visible-sm{
+ overflow: visible;
+ }
+ &-scroll-sm{
+ overflow: scroll;
+ }
}
}
++<<<<<<< HEAD:client/wwwroot/styles/nsctr/_nsctr.scss
+
+@media (max-width: $break-xsmall){
++=======
+ @media (max-width:$break-xsmall){
++>>>>>>> master:client/wwwroot/styles/_nsctr.scss
.g-nsctr{
.row-checkbox{
ul{
diff --cc client/wwwroot/styles/polizas/_empresa.scss
index 79c8d9a,5bc26f3..0000000
--- a/client/wwwroot/styles/polizas/_empresa.scss
+++ b/client/wwwroot/styles/polizas/_empresa.scss
@@@ -204,6 -207,13 +207,16 @@@
}
}
++<<<<<<< HEAD:client/wwwroot/styles/polizas/_empresa.scss
++=======
+ .title-acordeon{
+ display: inline-block !important; position: relative;
+ .ico-acordeon{
+ right: -30px;left: initial;top: -10px;
+ }
+ }
+
++>>>>>>> master:client/wwwroot/styles/_empresa.scss
@media (min-width: $break-medium){
.page-empresa-cotizar {
&-step3 {
diff --cc client/wwwroot/styles/polizas/_sctr.scss
index c582e90,13d0180..0000000
--- a/client/wwwroot/styles/polizas/_sctr.scss
+++ b/client/wwwroot/styles/polizas/_sctr.scss
@@@ -73,56 -73,57 +73,109 @@@
}
}
}
+.modal-title__scroll {
+ max-height: 180px;
+ overflow-y: auto;
+}
+
+.sctr-emit__ico-msg-xls {
+ font-size: 24px;
+ color: $rojo_primario;
+ margin-right: 5px;
+ position: relative;
+ top: 4px;
+}
+
+.sctr-emit__ico-xls {
+ color: $gris3;
+}
+
+.u-scroll-v--200 {
+ max-height: 200px;
+ overflow-y: auto;
+}
+
+.u-scroll-h {
+ overflow-x: auto;
+}
+
+.u-w--930 {
+ width: 930px;
+}
+
+.u-max-w--370 {
+ max-width: 370px;
+}
+
+.u-txt--0 {
+ font-size: 0;
+}
+
+.u-txt--14 {
+ font-size: 14px;
+}
+
+.u-txt--18 {
+ font-size: 18px;
+}
+
+.u-txt--bold {
+ font-weight: bold;
+}
++<<<<<<< HEAD:client/wwwroot/styles/polizas/_sctr.scss
++=======
+ .modal-title__scroll {
+ max-height: 180px;
+ overflow-y: auto;
+ }
+
+ .sctr-emit__ico-msg-xls {
+ font-size: 24px;
+ color: $rojo_primario;
+ margin-right: 5px;
+ position: relative;
+ top: 4px;
+ }
+
+ .sctr-emit__ico-xls {
+ color: $gris3;
+ }
+
+ .u-scroll-v--200 {
+ max-height: 200px;
+ overflow-y: auto;
+ }
+
+ .u-scroll-h {
+ overflow-x: auto;
+ }
+
+ .u-w--930 {
+ width: 930px;
+ }
+
+ .u-max-w--370 {
+ max-width: 370px;
+ }
+
+ .u-txt--0 {
+ font-size: 0;
+ }
+
+ .u-txt--14 {
+ font-size: 14px;
+ }
+
+ .u-txt--18 {
+ font-size: 18px;
+ }
+
+ .u-txt--bold {
+ font-weight: bold;
+ }
+
++>>>>>>> master:client/wwwroot/styles/_sctr.scss
.sctr-table__body {
.sctr-table__row {
&:nth-child(odd) {
diff --git a/client/wwwroot/callerDashboard b/client/wwwroot/callerDashboard
index 72d25f7..1ce801a 160000
--- a/client/wwwroot/callerDashboard
+++ b/client/wwwroot/callerDashboard
@@ -1 +1 @@
-Subproject commit 72d25f7fdd3620c1c3b20ea1806c57ae8180df93
+Subproject commit 1ce801a36c01380a3e0d7725d09f5e3995658c33
diff --git a/client/wwwroot/gcw b/client/wwwroot/gcw
index 62be707..96539ee 160000
--- a/client/wwwroot/gcw
+++ b/client/wwwroot/gcw
@@ -1 +1 @@
-Subproject commit 62be70791db760af4aea9a929f150972ee9ec85a
+Subproject commit 96539ee896ea2650ccb8d09b9c8e254201b79b8a
diff --git a/client/wwwroot/polizas b/client/wwwroot/polizas
index bb6f4fa..e0a411b 160000
--- a/client/wwwroot/polizas
+++ b/client/wwwroot/polizas
@@ -1 +1 @@
-Subproject commit bb6f4fa80dd908cd339952741ea2e9dc54e46f2d
+Subproject commit e0a411b7eb24d27587679b462f10d585b6010e1a
diff --git a/client/wwwroot/referencia b/client/wwwroot/referencia
index 9dabc28..3fca212 160000
--- a/client/wwwroot/referencia
+++ b/client/wwwroot/referencia
@@ -1 +1 @@
-Subproject commit 9dabc285bf485ed870f43e42b3593a1571eaafe8
+Subproject commit 3fca212d6dd4ab59408f677d4e03c2ee2d049fba
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_accidentes.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_accidentes.scssc
deleted file mode 100644
index 7b470d8..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_accidentes.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_autos.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_autos.scssc
deleted file mode 100644
index fe2e58d..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_autos.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_empresa.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_empresa.scssc
deleted file mode 100644
index b942662..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_empresa.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_fonts.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_fonts.scssc
deleted file mode 100644
index 028031c..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_fonts.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_footer.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_footer.scssc
deleted file mode 100644
index db888ed..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_footer.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_general.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_general.scssc
deleted file mode 100644
index 8b486bd..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_general.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_header.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_header.scssc
deleted file mode 100644
index 14c2889..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_header.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_hogar.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_hogar.scssc
deleted file mode 100644
index 115fa02..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_hogar.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_home.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_home.scssc
deleted file mode 100644
index 484785b..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_home.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_login.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_login.scssc
deleted file mode 100644
index 70c4564..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_login.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_normalize.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_normalize.scssc
deleted file mode 100644
index 0537353..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_normalize.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_nsctr.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_nsctr.scssc
deleted file mode 100644
index d5bae7f..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_nsctr.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_sctr.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_sctr.scssc
deleted file mode 100644
index 81d2420..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_sctr.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_transporte.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_transporte.scssc
deleted file mode 100644
index 6992be6..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_transporte.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_vida.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_vida.scssc
deleted file mode 100644
index 7049c90..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/_vida.scssc and /dev/null differ
diff --git a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/main.scssc b/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/main.scssc
deleted file mode 100644
index 6757cff..0000000
Binary files a/client/wwwroot/styles/.sass-cache/ade8a2ad79f3b87b0c3436573c35601e60c67b5d/main.scssc and /dev/null differ
diff --git a/client/wwwroot/webproc b/client/wwwroot/webproc
index 9779d58..020dbe9 160000
--- a/client/wwwroot/webproc
+++ b/client/wwwroot/webproc
@@ -1 +1 @@
-Subproject commit 9779d5803ae2140a750bbc8b1790c51a8d587484
+Subproject commit 020dbe97c95cc0216eaecaadecc246673a6b2252