From 41a8372b961c653df63d5966b7248de582b878c6 Mon Sep 17 00:00:00 2001 From: Sevka <240303vilkov@gmail.com> Date: Fri, 22 Dec 2023 22:39:40 +0300 Subject: [PATCH] lastCommit --- src/App.css | 2 +- src/Components/HomePage/style.module.scss | 4 +- src/Components/MeetPage/index.jsx | 9 ++-- src/Components/MeetPage/style.module.scss | 52 +++++++++++++++++++++++ src/Components/css/style.module.css | 2 +- src/Components/css/style.module.css.map | 2 +- 6 files changed, 64 insertions(+), 7 deletions(-) diff --git a/src/App.css b/src/App.css index b9d355d..8f3d3b1 100644 --- a/src/App.css +++ b/src/App.css @@ -1,5 +1,5 @@ #root { - max-width: 1280px; + width: 79%; margin: 0 auto; padding: 2rem; text-align: center; diff --git a/src/Components/HomePage/style.module.scss b/src/Components/HomePage/style.module.scss index 993d0eb..1ccc8db 100644 --- a/src/Components/HomePage/style.module.scss +++ b/src/Components/HomePage/style.module.scss @@ -1,6 +1,8 @@ - +.container { + width: 100%; +} .muza { &__container { height: 700px; diff --git a/src/Components/MeetPage/index.jsx b/src/Components/MeetPage/index.jsx index 6fb020e..08a37b4 100644 --- a/src/Components/MeetPage/index.jsx +++ b/src/Components/MeetPage/index.jsx @@ -1,6 +1,7 @@ import Header from "../Header"; import styles from './style.module.scss'; - +import clock from '../../img/MeetPage/Clock.png'; +import globe from '../../img/MeetPage/Globe.png'; const MeetPage = () => { @@ -12,9 +13,11 @@ const MeetPage = () => {
Интерактивная лекция «Управление инжиниринговыми проектами на базе вуза» Психология - Онлайн - 22 декабря, с 10:00 до 22:00 по Московскому времени +
clock Онлайн
+
globe 22 декабря, с 10:00 до 22:00 по Московскому времени
+
+ diff --git a/src/Components/MeetPage/style.module.scss b/src/Components/MeetPage/style.module.scss index e69de29..8ec6ddd 100644 --- a/src/Components/MeetPage/style.module.scss +++ b/src/Components/MeetPage/style.module.scss @@ -0,0 +1,52 @@ +.meets { + + width: 100%; + display: flex; + justify-content: space-between; + &__img { + width: 40%; + height: 400px; + background-color: gray; + } + &__mainInfo { + &_container { + width: 50%; + display: flex; + flex-direction: column; + align-content: start; + } + &_descr { + color: #000; + font-family: Montserrat; + font-size: 30px; + font-style: normal; + font-weight: 600; + line-height: normal; + text-align: left; + } + &_type { + display: flex; + margin-top: 25px; + border-radius: 10px; + border: 1px solid var(--gray_text, #888); + width: 110px; + height: 35px; + justify-content: center; + align-items: center; + } + &_status { + margin-top: 40px; + + display: flex; + } + &_time { + margin-top: 40px; + + display: flex; + } + &_status_img { + margin-right: 12px; + } + } + +} \ No newline at end of file diff --git a/src/Components/css/style.module.css b/src/Components/css/style.module.css index 976f3fb..6de163b 100644 --- a/src/Components/css/style.module.css +++ b/src/Components/css/style.module.css @@ -1 +1 @@ -.muza__container{height:700px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:100%}.muza__title{margin-top:150px;color:#000;font-family:Montserrat;font-size:143.016px;font-style:normal;font-weight:700;line-height:normal;text-align:left;display:-webkit-box;display:-ms-flexbox;display:flex;width:90%}.muza__descr{margin-top:50px;margin-left:70px;color:#000;font-family:Montserrat;font-size:46px;font-style:normal;font-weight:400;line-height:normal;text-align:left;display:-webkit-box;display:-ms-flexbox;display:flex;width:60%}.muza__descr_container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.meeting__container{height:1400px}.meeting__inputs{width:90%;height:46px;border-radius:10px;border:1px solid #000;padding-left:40px}.container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.select{margin-right:50px;height:35px;border-radius:10px;border:1px solid var(--gray_stroke, #D0D2D8);width:200px}.select__container{display:-webkit-box;display:-ms-flexbox;display:flex;width:93%;margin-top:30px}.NewContainer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-top:30px}.search_container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.search__descr{margin-right:25px}/*# sourceMappingURL=style.module.css.map */ \ No newline at end of file +.meets{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.meets__img{width:40%;height:400px;background-color:gray}.meets__mainInfo_container{width:50%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-ms-flex-line-pack:start;align-content:start}.meets__mainInfo_descr{color:#000;font-family:Montserrat;font-size:30px;font-style:normal;font-weight:600;line-height:normal;text-align:left}.meets__mainInfo_type{display:-webkit-box;display:-ms-flexbox;display:flex;margin-top:25px;border-radius:10px;border:1px solid var(--gray_text, #888);width:110px;height:35px;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.meets__mainInfo_status{margin-top:40px;display:-webkit-box;display:-ms-flexbox;display:flex}.meets__mainInfo_time{margin-top:40px;display:-webkit-box;display:-ms-flexbox;display:flex}.meets__mainInfo_status_img{margin-right:12px}/*# sourceMappingURL=style.module.css.map */ \ No newline at end of file diff --git a/src/Components/css/style.module.css.map b/src/Components/css/style.module.css.map index ca1f9ad..8890c5e 100644 --- a/src/Components/css/style.module.css.map +++ b/src/Components/css/style.module.css.map @@ -1 +1 @@ -{"version":3,"sources":["../HomePage/style.module.scss"],"names":[],"mappings":"AAII,iBACI,YAAA,CACA,mBAAA,CAAA,mBAAA,CAAA,YAAA,CACA,wBAAA,CAAA,qBAAA,CAAA,kBAAA,CACA,2BAAA,CAAA,4BAAA,CAAA,yBAAA,CAAA,qBAAA,CACA,UAAA,CAGJ,aACI,gBAAA,CACA,UAAA,CACA,sBAAA,CACA,mBAAA,CACA,iBAAA,CACA,eAAA,CACA,kBAAA,CACA,eAAA,CACA,mBAAA,CAAA,mBAAA,CAAA,YAAA,CACA,SAAA,CAGJ,aAKI,eAAA,CACA,gBAAA,CACA,UAAA,CACA,sBAAA,CACA,cAAA,CACA,iBAAA,CACA,eAAA,CACA,kBAAA,CACA,eAAA,CACA,mBAAA,CAAA,mBAAA,CAAA,YAAA,CACA,SAAA,CAdA,uBACI,mBAAA,CAAA,mBAAA,CAAA,YAAA,CACA,oBAAA,CAAA,iBAAA,CAAA,wBAAA,CAiBT,oBACC,aAAA,CAED,iBACK,SAAA,CACA,WAAA,CACA,kBAAA,CACA,qBAAA,CACA,iBAAA,CAIR,WACI,mBAAA,CAAA,mBAAA,CAAA,YAAA,CACA,uBAAA,CAAA,oBAAA,CAAA,sBAAA,CAGJ,QACI,iBAAA,CACA,WAAA,CACA,kBAAA,CACA,4CAAA,CACA,WAAA,CACA,mBACI,mBAAA,CAAA,mBAAA,CAAA,YAAA,CACA,SAAA,CACA,eAAA,CAGR,cACI,mBAAA,CAAA,mBAAA,CAAA,YAAA,CACA,oBAAA,CAAA,iBAAA,CAAA,wBAAA,CACA,eAAA,CAEJ,kBACI,mBAAA,CAAA,mBAAA,CAAA,YAAA,CACA,wBAAA,CAAA,qBAAA,CAAA,kBAAA,CACA,uBAAA,CAAA,oBAAA,CAAA,sBAAA,CAEJ,eACI,iBAAA","file":"style.module.css"} \ No newline at end of file +{"version":3,"sources":["../MeetPage/style.module.scss"],"names":[],"mappings":"AAAA,OAEI,UAAA,CACA,mBAAA,CAAA,mBAAA,CAAA,YAAA,CACA,wBAAA,CAAA,qBAAA,CAAA,6BAAA,CACA,YACI,SAAA,CACA,YAAA,CACA,qBAAA,CAGA,2BACI,SAAA,CACA,mBAAA,CAAA,mBAAA,CAAA,YAAA,CACA,2BAAA,CAAA,4BAAA,CAAA,yBAAA,CAAA,qBAAA,CACA,wBAAA,CAAA,mBAAA,CAEJ,uBACI,UAAA,CACA,sBAAA,CACA,cAAA,CACA,iBAAA,CACA,eAAA,CACA,kBAAA,CACA,eAAA,CAEJ,sBACI,mBAAA,CAAA,mBAAA,CAAA,YAAA,CACA,eAAA,CACA,kBAAA,CACA,uCAAA,CACA,WAAA,CACA,WAAA,CACA,uBAAA,CAAA,oBAAA,CAAA,sBAAA,CACA,wBAAA,CAAA,qBAAA,CAAA,kBAAA,CAEJ,wBACI,eAAA,CAEA,mBAAA,CAAA,mBAAA,CAAA,YAAA,CAEJ,sBACI,eAAA,CAEA,mBAAA,CAAA,mBAAA,CAAA,YAAA,CAEJ,4BACI,iBAAA","file":"style.module.css"} \ No newline at end of file