From c12eeaa1fc739ded09064d5f5cf5af6981f13636 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 12 Apr 2018 13:25:05 +0300 Subject: [PATCH] Merge styles from lilcity/templates --- web/build/img/sprite.svg | 48 +- web/src/sass/_common.sass | 783 ++++++++++++++++++++---- web/src/sass/generated/_sprite-svg.scss | 35 ++ 3 files changed, 707 insertions(+), 159 deletions(-) diff --git a/web/build/img/sprite.svg b/web/build/img/sprite.svg index 01c98f63..270f167d 100644 --- a/web/build/img/sprite.svg +++ b/web/build/img/sprite.svg @@ -1,9 +1,7 @@ - - - - - - + + @@ -20,17 +18,14 @@ + + - - - - - @@ -57,30 +52,21 @@ - - - password-eye - - - Created using Figma - - - - - - password-eye-hidden - - - Created using Figma - - - + + + + + + + + + @@ -97,6 +83,8 @@ + + @@ -111,6 +99,8 @@ + + diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index f924962a..9ce1eb14 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -1,14 +1,14 @@ =d - @media only screen and (max-width: 1120px) + @media only screen and (max-width: "1120px") @content =t - @media only screen and (max-width: 1023px) + @media only screen and (max-width: "1023px") @content =m - @media only screen and (max-width: 599px) + @media only screen and (max-width: "599px") @content =s - @media only screen and (max-width: 474px) + @media only screen and (max-width: "474px") @content +font(ProximaNova-Regular, ProximaNova-Regular) @@ -24,7 +24,7 @@ =fl font-family: 'ProximaNova-Light', serif -$pink: #FF9393linear-gradient(-225deg, #FFE2EB 0%, #D8F5F5 100%) +$pink: #FF9393 $pink-light: #FDF8F9 $purple: #B995D9 $green: #8ECFC0 @@ -32,7 +32,7 @@ $green-light: #5BD700 $gray: #A7A7A7 $blue: #4A90E2 $viol: #B995D9 -$bg: #F8F8F8 +$bg: #f8f8f8 $border: #E6E6E6 $cl: #191919 @@ -75,6 +75,9 @@ b color: white // box-shadow: 0 0 0 1px red +.bold + +fb + button &:disabled cursor: not-allowed @@ -117,6 +120,9 @@ button z-index: 2 +t line-height: 1.33 + +m + padding: 13px 20px 12px + letter-spacing: 1px &:hover box-shadow: 0 5px 20px 0 rgba(0,0,0,0.11) &:disabled @@ -164,8 +170,24 @@ button border-radius: 2px transition: opacity .2s z-index: -2 + &_fb + background: #3957A7 + color: white + &:active + color: rgba(white,.2) + .icon + fill: rgba(white,.2) + .icon + margin: -9px 15px -6px -25px + font-size: 20px + fill: white &_gray background: $bg + &_white + background: white + &_pink + background: #ff9393 + color: white &_md padding: 18px 24px 17px +m @@ -420,6 +442,21 @@ a.btn +m &:after opacity: 0 + &__dot + position: absolute + top: 50% + right: 3px + width: 7px + height: 7px + margin-top: -5px + background: #EE4630 + border-radius: 50% + +t + width: 6px + height: 6px + margin-top: -4px + +m + display: none &__list, &__drop position: absolute @@ -606,6 +643,8 @@ a.btn line-height: 1.33 +m margin-bottom: 50px + &__bold + +fb &__content margin-bottom: 30px &__time @@ -614,6 +653,57 @@ a.btn font-size: 20px text-transform: uppercase letter-spacing: 3px + &__btn + margin: 0 10px + +m + margin: 0 0 10px + &__foot + margin-top: 30px + &__foot, + &__list + display: flex + justify-content: center + align-items: center + &__go + font-size: 0 + .icon + font-size: 32px + fill: black + +m + font-size: 24px + &__nav + padding: 0 15px + +m + padding: 0 10px + &__link + margin: 0 15px + font-size: 12px + color: #888 + text-transform: uppercase + +m + margin: 0 10px + &.active + +fb + color: black + &__socials + position: absolute + top: 50% + right: 15px + transform: translateY(-50%) + +t + right: 5px + +m + display: none + &__social + display: block + padding: 10px + font-size: 0 + +nl + margin-bottom: 10px + .icon + font-size: 16px + &-facebook + font-size: 18px &_green &:before background-image: linear-gradient(-225deg, #E2E2E2 0%, #E2FFDF 100%) @@ -626,6 +716,22 @@ a.btn min-height: 0 &_sm &__title margin-bottom: 0 + &_default + padding-top: 165px + padding-bottom: 30px + &_default &__center + margin-bottom: 0 + &_default &__title + margin-bottom: 55px + +f + font-size: 40px + +t + max-width: 480px + margin-bottom: 40px + font-size: 24px + +m + margin-bottom: 30px + font-size: 20px a[name] .title @@ -639,7 +745,8 @@ a[name] line-height: (35/32) z-index: 4 +t - margin-bottom: 20px + max-width: 420px + margin: 0 auto 20px font-size: 24px line-height: 1.33 &_center @@ -733,6 +840,30 @@ a[name] margin-bottom: 0 +m margin-bottom: 0 + &_only_curve + margin: 0 auto 10px + &_only_curve &__curve_one + left: -75px + bottom: -25px + +t + left: -180px + bottom: -40px + +m + top: auto + left: -55px + bottom: -15px + &_arts + max-width: 500px + margin-bottom: 65px + +f + font-size: 20px + &_arts &__curve_two + bottom: 35px + &_courses + max-width: 670px + margin-bottom: 75px + +f + font-size: 20px .section padding: 60px 0 @@ -761,7 +892,7 @@ a[name] +t max-width: calc(100% - 30px) &_gradient - background-image: linear-gradient(-225deg, #F8F8F8 0%, #FFF2F2 100%) + background-image: linear-gradient(-225deg, $bg 0%, #FFF2F2 100%) &_tabs padding-top: 20px +m @@ -770,6 +901,30 @@ a[name] padding: 20px 0 &_confirm padding: 30px 0 50px + &_school + padding: 85px 0 95px + +t + padding: 65px 0 55px + +m + padding: 45px 0 + &_benefits + padding: 95px 0 100px + background: $bg + +t + padding: 65px 0 55px + +m + padding: 45px 0 + &_arts + padding: 95px 0 70px + +t + padding: 80px 0 70px + +m + padding: 45px 0 + &_courses + padding: 95px 0 85px + background: $bg + +t + padding: 80px 0 40px .ava display: block @@ -862,7 +1017,10 @@ a[name] margin: -5px 0 -5px auto +f font-size: 15px - + .icon + fill: $gray + &-fill + fill: $pink &_white &__date color: white @@ -904,7 +1062,7 @@ a[name] .about display: flex - padding-right: 160px + padding-right: 60px +t padding: 0 &__ava @@ -921,8 +1079,12 @@ a[name] flex: 0 0 60px &__content margin-bottom: 20px + font-size: 18px + p + margin-bottom: 18px &__ceo margin-bottom: 20px + font-size: 16px a +fb &__video @@ -961,7 +1123,7 @@ a[name] z-index: -2 &__type margin-bottom: 85px - +fb + // +fb font-size: 20px letter-spacing: 4px +t @@ -972,7 +1134,7 @@ a[name] margin-bottom: 40px &__title margin-bottom: 2px - +fb + // +fb font-size: 50px line-height: (6/5) +t @@ -1052,6 +1214,33 @@ a[name] font-size: 12px +m font-size: 14px + &_colors + max-width: 100% + margin: 0 + +t + margin-bottom: -40px + +m + display: flex + margin-bottom: -30px + &_colors &__item + +t + flex: 0 0 50% + +m + margin-bottom: 30px + &_colors &__preview + margin-bottom: 25px + +m + margin-bottom: 10px + height: 45px + .icon + fill: #ff3837 + &_colors &__title + min-height: 0 + margin-bottom: 10px + letter-spacing: .5px + &_colors &__content + +m + line-height: 1.2 .reviews padding-right: 80px @@ -1390,7 +1579,9 @@ a.grey-link display: block position: relative margin-bottom: 15px + border-radius: 2px color: $cl + overflow: hidden +t margin-bottom: 10px &__preview:hover &__view @@ -1415,20 +1606,21 @@ a.grey-link &__pic display: block width: 100% - border-radius: 2px + // border-radius: 2px &__view display: flex position: absolute - top: 0 - left: 0 - width: 100% - height: 100% + top: -1% + left: -1% + width: 102% + height: 102% background-image: linear-gradient(-225deg, #FFE2EB 0%, #D8F5F5 100%) - border-radius: 2px + // border-radius: 2px opacity: 0 font-size: 18px align-items: center justify-content: center + transform: translate3d(0,0,0) transition: opacity .2s z-index: 4 &__soon @@ -1444,6 +1636,7 @@ a.grey-link flex-direction: column justify-content: center text-align: center + transform: translate3d(0,0,0) &__left margin-bottom: 5px font-size: 15px @@ -1926,6 +2119,7 @@ a.grey-link &__input height: 36px &[type='password'] + font-size: 30px &::placeholder font-size: 18px &_bg @@ -1933,12 +2127,11 @@ a.grey-link padding: 0 20px &__textarea display: block - height: auto + height: 36px padding: 7px 0 resize: vertical &_lg - min-height: 44px - height: auto + height: 80px font-size: 25px &__preview position: absolute @@ -1960,7 +2153,7 @@ a.grey-link height: 40px font-size: 15px &_info &__label - color: rgba(255, 255, 255, 0.8) + color: $gray &_info &__input, &_info &__textarea border-color: rgba($border,.2) @@ -1982,6 +2175,7 @@ a.grey-link border: none background: none margin-top: 11px + .field__wrap &--title margin-right: 60px @@ -2125,6 +2319,7 @@ a.grey-link flex: 0 0 calc(100% - 220px) z-index: 4 +t + max-width: 100% margin: 0 0 15px padding: 0 flex: 0 0 100% @@ -2134,6 +2329,19 @@ a.grey-link left: calc(50% - 60px) transform: translateY(-50%) z-index: -2 + &__field + margin: 0 + &__text + padding-right: 30px + font-size: 18px + align-self: center + flex: 0 0 calc(100% - 220px) + +t + max-width: 260px + font-size: 14px + line-height: 1.2 + +m + display: none .layout display: flex @@ -2538,7 +2746,7 @@ a.grey-link &__textarea display: block width: 100% - height: 70px + height: 44px padding: 11px 15px border-radius: 2px font-size: 16px @@ -2722,7 +2930,17 @@ a.grey-link text-align: center +m padding: 0 + text-align: center + &__head + display: flex + margin-bottom: 30px + align-items: flex-start + +m + display: none + &__title + margin: 0 20px 0 0 &__btn + margin-left: auto padding: 10px 15px background: transparent border: 1px solid $gray @@ -2743,12 +2961,16 @@ a.grey-link &__ava width: 120px height: 120px - margin: 0 auto 20px + margin-right: 25px + flex: 0 0 120px +m width: 140px height: 140px + margin: 0 auto 20px + &__wrap + flex: 0 0 calc(100% - 145px) &__name - margin-bottom: 15px + margin-bottom: 25px font-size: 20px letter-spacing: 3px text-transform: uppercase @@ -3059,6 +3281,8 @@ a.grey-link &__fieldset &:first-child margin-bottom: 50px + &:last-child + margin-top: auto .add display: flex @@ -3311,6 +3535,404 @@ a.grey-link +m display: none +.school + display: flex + position: relative + margin: 0 -15px + flex-wrap: wrap + z-index: 2 + +t + margin-bottom: -40px + +m + margin: 0 -10px -30px + &__col + padding: 0 15px + text-align: center + flex: 0 0 25% + +t + margin-bottom: 40px + flex: 0 0 50% + +m + margin-bottom: 30px + padding: 0 10px + &__preview + margin-bottom: 25px + font-size: 0 + +m + margin-bottom: 15px + .icon + font-size: 34px + fill: #93d2c2 + &__title + margin-bottom: 5px + font-size: 24px + +t + font-size: 18px + &__text + max-width: 200px + margin: 0 auto + font-size: 11px + line-height: 1.3 + text-transform: uppercase + +t + font-size: 10px + &_main + margin: 55px 0 35px + +m + margin-top: 35px + &_main &__col + +t + flex: 0 0 25% + +m + flex: 0 0 50% + &_main &__preview + margin-bottom: 15px + .icon + fill: white + &_main &__title + +t + font-size: 16px + +.arts + display: flex + margin: 0 -12px + justify-content: center + flex-wrap: wrap + +m + margin-bottom: -24px + &__col + padding: 0 12px + flex: 0 0 20% + +t + flex: 0 0 33.33% + +m + margin-bottom: 24px + flex: 0 0 50% + &__item + position: relative + border-radius: 50% + background-position: 50% 50% + background-size: cover + &:before + content: '' + display: block + padding-bottom: 100% + &__title + position: absolute + top: 50% + left: 50% + width: 100% + padding: 0 20px + +fs + font-size: 14px + text-align: center + text-transform: uppercase + transform: translate(-50%,-50%) + +.letsgo + margin-top: 80px + text-align: center + +t + margin-top: 45px + +.timing + +t + padding-left: 10px + &__week + margin-bottom: 35px + &__item + display: flex + position: relative + padding: 20px 0 + +nf + border-top: 1px solid $border + &_bg + margin-top: 10px + background: $bg + box-shadow: -40px 0 0 0 $bg, 40px 0 0 0 $bg + +nf + border-color: transparent + &__item.open + padding-bottom: 40px + &__item.open &__toggle + .icon + transform: rotate(180deg) + &__item.open &__buy, + &__item.open &__more + display: block + &__item.open &__buy + +m + display: flex + &__item.open &__cell + &:nth-child(3) + +m + padding-bottom: 70px + &__item.disable &__preview, + &__item.disable &__title, + &__item.disable &__content + opacity: .4 + &__item.disable &__cell + &:nth-child(1) + justify-content: center + &:nth-child(3) + +m + padding: 0 0 50px + &__cell + &:nth-child(1) + display: flex + padding-right: 20px + flex-direction: column + align-items: flex-start + flex: 0 0 140px + +m + padding: 0 + flex: 0 0 0 + &:nth-child(2) + padding-right: 20px + flex: 0 0 90px + &:nth-child(3) + flex: 0 0 calc(100% - 254px) + +m + padding-top: 20px + flex: 0 0 calc(100% - 114px) + &:nth-child(4) + flex: 0 0 34px + &__unlock + +m + position: absolute + left: 90px + bottom: 20px + &__info + margin-bottom: auto + +m + display: flex + position: absolute + top: 20px + left: 90px + right: 0 + padding: 0 + flex-direction: row + &__day + position: relative + margin: 10px 0 5px + +fb + font-size: 12px + text-transform: uppercase + +m + margin: 0 + &.active + &:before + content: '' + position: absolute + top: 3px + left: -13px + width: 8px + height: 8px + background: #EE4630 + border-radius: 50% + &__date + opacity: .5 + +m + margin: -3px 0 0 auto + &__buy + +m + position: absolute + left: 0 + bottom: 40px + align-items: center + &__time + margin: 15px 0 + opacity: .5 + +m + width: 90px + margin: 0 + &__btn + margin-right: -60px + padding-left: 20px + padding-right: 20px + white-space: nowrap + letter-spacing: 1px + &__pic + display: block + width: 100% + border-radius: 50% + &__title + margin-bottom: 5px + font-size: 24px + line-height: 1.3 + +t + font-size: 18px + &__content + padding-bottom: 5px + &__toggle + width: 34px + height: 34px + margin-top: 30px + font-size: 0 + .icon + font-size: 8px + fill: $pink + &__buy, + &__more + display: none + &__more + padding-top: 15px + &__head + margin-bottom: 10px + +fb + &__row + display: flex + margin: 0 -15px 20px + +t + display: block + &__col + padding: 0 15px + flex: 0 0 40% + &:first-child + flex: 0 0 60% + +m + margin-bottom: 10px + &__text + ul + li + position: relative + padding-left: 17px + &:before + content: '—' + position: absolute + top: 0 + left: 0 + &__works + display: flex + margin: 0 -30px -10px 0 + flex-wrap: wrap + &__work + margin: 0 10px 10px 0 + flex: 0 0 48px + &__foot + display: flex + align-items: center + &__foot &__btn + margin-right: 40px + &__print + position: relative + margin-left: auto + padding-left: 30px + color: #878787 + line-height: 1.3 + .bold + color: $cl + .icon + position: absolute + top: 1px + left: 0 + fill: $pink + +.switcher + display: inline-block + position: relative + &__input + position: absolute + top: 0 + left: 0 + opacity: 0 + &__input:checked + &__wrap &__item + &:first-child + background: #f8f8f8 + &:last-child + background: transparent + &__wrap + display: flex + background: linear-gradient(to right, #cdff82, #5efff4) + border-radius: 23px + align-items: center + &__item + padding: 11px 20px + border-radius: 23px + +fb + font-size: 12px + text-transform: uppercase + user-select: none + cursor: pointer + &:last-child + background: #f8f8f8 + +.casing + display: flex + position: relative + +t + padding-top: 105px + +m + padding-top: 155px + &__col + &:first-child + padding-right: 20px + flex: 0 0 160px + +t + padding: 0 + flex: 0 0 0 + &:last-child + flex: 0 0 calc(100% - 160px) + +t + flex: 0 0 100% + &__subscribe + +t + display: flex + position: absolute + top: 0 + left: 0 + width: 250px + flex-wrap: wrap + align-items: center + +m + width: 100% + justify-content: center + &__msg + margin-bottom: 15px + padding-top: 5px + font-size: 14px + line-height: 1.3 + +t + margin: 0 15px 0 0 + padding: 0 + .bold + display: block + &__btn + padding-left: 15px + padding-right: 15px + letter-spacing: 1px + &__note + padding-top: 15px + font-size: 14px + line-height: 1.2 + opacity: 0.6 + +t + padding-top: 10px + flex: 0 0 140px + +m + display: none + &__head + display: flex + margin-bottom: 30px + align-items: center + +t + justify-content: center + &__title + margin: 0 auto 0 0 + +t + margin: 0 + &__switcher + +t + position: absolute + top: 0 + right: 0 + +m + top: 60px + right: 50% + transform: translateX(50%) + white-space: nowrap + + .searching display: flex margin-bottom: 40px @@ -3329,12 +3951,12 @@ a.grey-link flex: 0 0 100px a - &.link--black - color: #000 - &.disabled - pointer-events: none - cursor: default - opacity: 0.6 + &.link--black + color: #000 + &.disabled + pointer-events: none + cursor: default + opacity: 0.6 .content-block &.title @@ -3347,102 +3969,3 @@ a &.pic position: relative width: 100% - - -.school - &__page - display: flex - margin: 0 0 0 10px - flex-wrap: wrap - &__block - flex: 0 0 calc(50% - 20px) - +m - flex: 0 0 calc(100% - 20px) - &__list - margin: 0 -10px - flex-wrap: wrap - +m - margin-top: 20px - &__item - display: block - margin: 0 10px 40px 10px - flex: 0 0 calc(100% - 20px) - &__title - display: block - margin: 0 0 10px 0 - font-weight: bold - letter-spacing: 2px - color: #ff9393 - &__subtitle - display: block - margin: 0 - color: #333333 - font-family: 'ProximaNova-Bold', serif - &__content - font-size: 16px - line-height: 1.25 - color: #333333 - &__btn - margin-top: 20px - a - width: 70% - +m - width: 100%; - &__btn__prev - margin-top: 12px - a - width: 70% - +m - width: 100%; - &__month - margin-bottom: 20px - flex: 0 0 320px - border-radius: 8px - background-image: linear-gradient(-225deg, #FFE2EB 0%, #D8F5F5 100%) - width: 70% - padding: 2px - +m - width: 100%; - &__wrap - padding: 5px 0 10px - background: white - border-radius: 6px - &__title - margin: 20px 0 0 20px - font-size: 36px - line-height: 0.97 - color: #333333 - &__subtitle - margin: 10px 0 0 20px - font-size: 16px - line-height: 0.88 - color: #888888 - &__image - margin: 40px 0 40px 0 - &__pic - display: block - width: 100% - &__prev__btn - position: relative - padding: 19px 24px 18px - border-radius: 8px - z-index: 4 - font-size: 12px - font-weight: bold - line-height: 1.67 - letter-spacing: 1px - text-align: center - color: #333333 - &:hover:before - opacity: 0 - &:before - content: '' - position: absolute - top: 2px - left: 2px - right: 2px - bottom: 2px - background: #FDF8F9 - border-radius: 8px - transition: opacity .2s - z-index: -2 diff --git a/web/src/sass/generated/_sprite-svg.scss b/web/src/sass/generated/_sprite-svg.scss index 729565d4..a95397c3 100755 --- a/web/src/sass/generated/_sprite-svg.scss +++ b/web/src/sass/generated/_sprite-svg.scss @@ -38,6 +38,11 @@ height: 1em; fill: #C8C8C8; } +.icon-everyday { + width: 1em; + height: 1em; + fill: #93D2C2; +} .icon-eye { width: 1.69em; height: 1em; @@ -123,6 +128,16 @@ height: 1em; fill: #979797; } +.icon-next { + width: 0.52em; + height: 1em; + fill: initial; +} +.icon-online { + width: 1.41em; + height: 1em; + fill: #93D2C2; +} .icon-password-eye { width: 1.79em; height: 1em; @@ -148,6 +163,16 @@ height: 1em; fill: #BEBEBE; } +.icon-prev { + width: 0.52em; + height: 1em; + fill: initial; +} +.icon-print { + width: 1.07em; + height: 1em; + fill: initial; +} .icon-search { width: 1em; height: 1em; @@ -188,6 +213,11 @@ height: 1em; fill: #C8C8C8; } +.icon-subjects { + width: 1.1em; + height: 1em; + fill: #93D2C2; +} .icon-text { width: 0.82em; height: 1em; @@ -223,6 +253,11 @@ height: 1em; fill: #C8C8C8; } +.icon-view { + width: 1.17em; + height: 1em; + fill: #93D2C2; +} .icon-wallet { width: 1.15em; height: 1em;