<commit_before>    @import url('https://fonts.googleapis.com/css?family=Open+Sans|Raleway');
    /*
==================
GENERAL
==================
*/
    
    html {
        font-family: 'Open Sans', 'Raleway', sans-serif;
        box-sizing: border-box;
        overflow: auto;
    }
    
    .o-s {
        font-family: 'Open Sans', sans-serif;
    }
    
    .rale {
        font-family: 'Raleway', sans-serif;
    }
    
    .bold-text {
        font-weight: bolder;
    }
    
    .white {
        color: #fff;
    }
    
    .gray {
        color: #333;
    }
    
    .bg-yellow {
        background-color: #F7B617;
    }
    
    .border-white {
        padding: 10px;
        border: solid 1px #fff;
    }
    
    .section {
        padding-top: 30px;
        padding-bottom: 30px;
    }
    /*
==================
CONDUCE
==================
*/
    
    .conduce {
        background-image: url("../images/conduce.jpg");
        background-repeat: no-repeat;
        background-size: cover;
        height: 65vh;
    }
    
    .conduce-info {
        background-color: rgba(0, 0, 0, 0.5);
        height: 65vh;
        padding: 80px 0 20px 35px;
    }
    
    .conduce h2 {
        font-size: 2.5rem;
    }
    
    .conduce p {
        font-size: 1.9rem;
        margin-bottom: 20px;
    }
    
    .conduce button {
        padding: 12px 20px;
    }
    /*
==================
TARIFA
==================
*/
    
    .section-tarifa input {
        width: 80%;
        display: inline-block;
        border-color: #fff;
    }
    
    .section-tarifa input::placeholder {
        color: #fff;
    }
    
    .section-tarifa i {
        width: 40px;
        display: inline-block;
    }
    
    .section-tarifa input:focus {
        border-color: #fff;
        box-shadow: none;
    }
    
    div#map {
        width: 100%;
        height: 60vh;
    }
    /*
==================
FOOTER
==================
*/
    
    footer {
        background-color: #2B2B2B;
        padding: 20px 0;
        font-size: 1.5rem;
    }
    
    .footer-logo {
        border-bottom: 1px solid white;
        padding-bottom: 2%;
    }
    
    .footer-menu {
        padding: 2% 0;
    }
    
    .footer-menu li {
        padding: 10px 0;
    }
    
    .footer-legal {
        border-top: 1px solid white;
        padding-top: 2%;
    }
    
    .social-media {
        position: relative;
        top: 20px;
        left: 10px;
    }
    
    .social-media li {
        display: inline-block;
        padding-left: 7px;
    }
    
    .app-store {
        padding-top: 50px;
    }
    
    .h-0 {
        height: 25px;
    }
    /*
==================
MEDIA
==================
*/
    /*Media MOBILE*/
    
    @media (max-width: 748px) {
        .conduce {
            height: 50vh;
            background-position-y: 0;
        }
        .conduce-info {
            height: 50vh;
        }
    }
    /*Media DESKTOP*/
    
    @media (min-width:748px) {
        .app-store {
            min-height: 330px;
            display: flex;
            flex-direction: column;
            justify-content: flex-end;
        }
        .social-media {
            position: relative;
            top: 30px;
            left: -35px;
            min-height: 330px;
            display: flex;
            align-items: flex-end;
        }
        .conduce {
            background-position-y: -200px;
        }
    }<commit_msg>solucionando conflicto con header, pendiente<commit_after>    @import url('https://fonts.googleapis.com/css?family=Open+Sans|Raleway');
    /*
==================
GENERAL
==================
*/
    
    html {
        font-family: 'Open Sans', 'Raleway', sans-serif;
        box-sizing: border-box;
        overflow: auto;
    }
    
    .o-s {
        font-family: 'Open Sans', sans-serif;
    }
    
    .rale {
        font-family: 'Raleway', sans-serif;
    }
    
    .bold-text {
        font-weight: bolder;
    }
    
    .white {
        color: #fff;
    }
    
    .gray {
        color: #333;
    }
    
    .bg-yellow {
        background-color: #F7B617;
    }
    
    .border-white {
        padding: 10px;
        border: solid 1px #fff;
    }
    
    .section {
        padding-top: 30px;
        padding-bottom: 30px;
    }
    /*
==================
NAVBAR
==================
*/
    /*
==================
CONDUCE
==================
*/
    
    .conduce {
        background-image: url("../images/conduce.jpg");
        background-repeat: no-repeat;
        background-size: cover;
        height: 65vh;
    }
    
    .conduce-info {
        background-color: rgba(0, 0, 0, 0.5);
        height: 65vh;
        padding: 80px 0 20px 35px;
    }
    
    .conduce h2 {
        font-size: 2.5rem;
    }
    
    .conduce p {
        font-size: 1.9rem;
        margin-bottom: 20px;
    }
    
    .conduce button {
        padding: 12px 20px;
    }
    /*
==================
TARIFA
==================
*/
    
    .section-tarifa input {
        width: 80%;
        display: inline-block;
        border-color: #fff;
    }
    
    .section-tarifa input::placeholder {
        color: #fff;
    }
    
    .section-tarifa i {
        width: 40px;
        display: inline-block;
    }
    
    .section-tarifa input:focus {
        border-color: #fff;
        box-shadow: none;
    }
    
    div#map {
        width: 100%;
        height: 60vh;
    }
    /*
==================
FOOTER
==================
*/
    
    footer {
        background-color: #2B2B2B;
        padding: 20px 0;
        font-size: 1.5rem;
    }
    
    .footer-logo {
        border-bottom: 1px solid white;
        padding-bottom: 2%;
    }
    
    .footer-menu {
        padding: 2% 0;
    }
    
    .footer-menu li {
        padding: 10px 0;
    }
    
    .footer-legal {
        border-top: 1px solid white;
        padding-top: 2%;
    }
    
    .social-media {
        position: relative;
        top: 20px;
        left: 10px;
    }
    
    .social-media li {
        display: inline-block;
        padding-left: 7px;
    }
    
    .app-store {
        padding-top: 50px;
    }
    
    .h-0 {
        height: 25px;
    }
    /*
==================
MEDIA
==================
*/
    /*Media MOBILE*/
    
    @media (max-width: 748px) {
        .conduce {
            height: 50vh;
            background-position-y: 0;
        }
        .conduce-info {
            height: 50vh;
        }
    }
    /*Media DESKTOP*/
    
    @media (min-width:748px) {
        .app-store {
            min-height: 330px;
            display: flex;
            flex-direction: column;
            justify-content: flex-end;
        }
        .social-media {
            position: relative;
            top: 30px;
            left: -35px;
            min-height: 330px;
            display: flex;
            align-items: flex-end;
        }
        .conduce {
            background-position-y: -200px;
        }
    }
    
    =======>>>>>>>be4c4b6e1f7319f41741b977bfab35b76176ac55
{'fraction_non_alphanumeric': 0.1741314958369222, 'fraction_numerical': 0.03258685041630778, 'mean_word_length': 1.3115461181154613, 'pattern_counts': {'":': 0, '<': 3, '<?xml version=': 0, '>': 10, 'https://': 2, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '6468254', 'n_tokens_mistral': 2549, 'n_tokens_neox': 2322, 'n_words': 424}