From 50ce0e9e445b05e2dd84bf4969567b29da23e522 Mon Sep 17 00:00:00 2001 From: Kostya Date: Fri, 24 Nov 2023 16:32:32 +0300 Subject: [PATCH 1/7] fix error with margin for template --- luckydiamond/src/assets/css/PagesStyles/home.css | 4 ++-- luckydiamond/src/assets/css/global.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/home.css b/luckydiamond/src/assets/css/PagesStyles/home.css index c03069c..b53d003 100644 --- a/luckydiamond/src/assets/css/PagesStyles/home.css +++ b/luckydiamond/src/assets/css/PagesStyles/home.css @@ -69,7 +69,7 @@ /* GameMode */ .gamemode__content--text h2 { - margin: 2% 0 .5% 10%; + margin: 2% 0 .5% 8%; text-transform: uppercase; color: #FFF; text-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); @@ -79,7 +79,7 @@ } .gamemode__content--text div { - width: 80%; + width: 84%; margin: 0 auto; border: 1px solid #fff; } diff --git a/luckydiamond/src/assets/css/global.css b/luckydiamond/src/assets/css/global.css index 93025cc..6806130 100644 --- a/luckydiamond/src/assets/css/global.css +++ b/luckydiamond/src/assets/css/global.css @@ -86,7 +86,7 @@ body, html { grid-area: main; width: 80%; height: 90%; - margin: 2.7% auto 0; + margin: 2.7% auto 0 8%; } /* /Main */ From 2027d5cb2bfc29a1ae607d7b0a8e74a6537304f3 Mon Sep 17 00:00:00 2001 From: Kostya Date: Fri, 24 Nov 2023 16:32:57 +0300 Subject: [PATCH 2/7] fix placed btn in gamemode-main --- luckydiamond/src/assets/css/PagesStyles/home.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/home.css b/luckydiamond/src/assets/css/PagesStyles/home.css index b53d003..02593b1 100644 --- a/luckydiamond/src/assets/css/PagesStyles/home.css +++ b/luckydiamond/src/assets/css/PagesStyles/home.css @@ -127,11 +127,18 @@ display: flex; justify-content: center; align-items: center; - padding-top: 12%; + padding-top: 2.5%; +} + +.line__content .line__btn--main .line__btn { + top: 2.5em; + left: -2em; + width: 100%; } .line__footer img { width: 60%; + margin-bottom: 23px; } .gamemode__lines { From d090afd6cf64113ef8f3a2f660265131f0407c27 Mon Sep 17 00:00:00 2001 From: Kostya Date: Fri, 24 Nov 2023 16:39:47 +0300 Subject: [PATCH 3/7] fixed height card and margin for gamemode-twolines elements --- luckydiamond/src/assets/css/PagesStyles/home.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/home.css b/luckydiamond/src/assets/css/PagesStyles/home.css index 02593b1..51c41e5 100644 --- a/luckydiamond/src/assets/css/PagesStyles/home.css +++ b/luckydiamond/src/assets/css/PagesStyles/home.css @@ -127,7 +127,7 @@ display: flex; justify-content: center; align-items: center; - padding-top: 2.5%; + padding-top: 10.6%; } .line__content .line__btn--main .line__btn { @@ -214,6 +214,7 @@ font-size: 87px; font-weight: 700; text-transform: uppercase; + padding: 4.5% 2.2%; } .gamemode__twoline--first__element .container { @@ -225,6 +226,7 @@ .gamemode__twoline--first__element .container a { margin-right: 10%; padding: 12px 10px; + margin-bottom: 3%; } .gamemode__twoline--two__element { From b536562a74467ab77c7c3c5dece59029ed2e9964 Mon Sep 17 00:00:00 2001 From: Kostya Date: Fri, 24 Nov 2023 17:08:04 +0300 Subject: [PATCH 4/7] fix error with width line gamemode-textcontent --- luckydiamond/src/assets/css/PagesStyles/home.css | 4 ++-- luckydiamond/src/assets/css/global.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/home.css b/luckydiamond/src/assets/css/PagesStyles/home.css index 51c41e5..0e0fd45 100644 --- a/luckydiamond/src/assets/css/PagesStyles/home.css +++ b/luckydiamond/src/assets/css/PagesStyles/home.css @@ -79,8 +79,8 @@ } .gamemode__content--text div { - width: 84%; - margin: 0 auto; + width: 82%; + margin-left: 8%; border: 1px solid #fff; } diff --git a/luckydiamond/src/assets/css/global.css b/luckydiamond/src/assets/css/global.css index 6806130..6e6d8a8 100644 --- a/luckydiamond/src/assets/css/global.css +++ b/luckydiamond/src/assets/css/global.css @@ -84,7 +84,7 @@ body, html { .main { grid-area: main; - width: 80%; + width: 82%; height: 90%; margin: 2.7% auto 0 8%; } From 26df1760454057ffbbb96e3c5a4478c9d1bb560a Mon Sep 17 00:00:00 2001 From: Kostya Date: Sat, 25 Nov 2023 12:02:18 +0300 Subject: [PATCH 5/7] changed icon and bg for btn discord-auth in header --- .../src/assets/css/ComponentsStyles/header.css | 4 ++-- .../src/assets/icons-header/discord-icon.png | Bin 778 -> 0 bytes .../src/assets/icons-header/discord-icon.svg | 1 + luckydiamond/src/components/HeaderComponent.vue | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 luckydiamond/src/assets/icons-header/discord-icon.png create mode 100644 luckydiamond/src/assets/icons-header/discord-icon.svg diff --git a/luckydiamond/src/assets/css/ComponentsStyles/header.css b/luckydiamond/src/assets/css/ComponentsStyles/header.css index 15c8944..814c586 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/header.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/header.css @@ -131,9 +131,9 @@ display: flex; align-items: center; border-radius: 13px; - background: #5865F2; + background: #5865f2; box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.25); - color: #000; + color: #fff; font-size: 16px; font-weight: 600; font-family: Montserrat; diff --git a/luckydiamond/src/assets/icons-header/discord-icon.png b/luckydiamond/src/assets/icons-header/discord-icon.png deleted file mode 100644 index ef33ab244f43b0b9ea52941a20db522b63fd21f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 778 zcmV+l1NHogP)q6#`UX1l~wylHKGw znLx(DR(pj!C$Gq757M2qCAB0&>d0BLoeUwX$YHVqDW+N8BN5rw~2{`7V(9AB-IK$5aB(MsS-2Zjy%w_ zSie@+6@RiKdA*bJzD827#uiv%glrIb46B1InO?wWHmqvTz_M49@;(*dRyCxf!($zV z4i4$BbUaP7tH>}kt?N2W&Z&_stZCj6q50N_oF-FZ&pN`+?Ob6DP7GKJJDHT0D*U@? z)$3qi#L`6HP7)?SbUWHGGBDieMxP^r-<4|2!@ZZ0tCCFCKjZhi+j z2>ZC}63$YhJ+K1P(IzobswA=B$V-@LG3@}T337@teUavz}L+l%6D2YCluo%FpPt=1y#7p-!JX2+VHd;kCd07*qo IM6N<$f>@+$DF6Tf diff --git a/luckydiamond/src/assets/icons-header/discord-icon.svg b/luckydiamond/src/assets/icons-header/discord-icon.svg new file mode 100644 index 0000000..7f9a31f --- /dev/null +++ b/luckydiamond/src/assets/icons-header/discord-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/luckydiamond/src/components/HeaderComponent.vue b/luckydiamond/src/components/HeaderComponent.vue index 0caf0fd..9e0db18 100644 --- a/luckydiamond/src/components/HeaderComponent.vue +++ b/luckydiamond/src/components/HeaderComponent.vue @@ -31,7 +31,7 @@ From 3d8e585ecf8625cb9da26595999fe1d2f23f1606 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sat, 25 Nov 2023 12:09:10 +0300 Subject: [PATCH 6/7] changed margin for icon discord in discord-auth card, header --- luckydiamond/src/assets/css/ComponentsStyles/header.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luckydiamond/src/assets/css/ComponentsStyles/header.css b/luckydiamond/src/assets/css/ComponentsStyles/header.css index 814c586..b635559 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/header.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/header.css @@ -143,5 +143,5 @@ } .auth__card--content a span img { - margin-right: 5px; + margin: 8% 5px 0 0; } \ No newline at end of file From 55cc295faf780f7fac58dca35b74d1f88dd89f97 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sat, 25 Nov 2023 12:19:48 +0300 Subject: [PATCH 7/7] refactor styles for chat --- luckydiamond/src/assets/css/ComponentsStyles/chat.css | 4 ++-- luckydiamond/src/assets/css/global.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/luckydiamond/src/assets/css/ComponentsStyles/chat.css b/luckydiamond/src/assets/css/ComponentsStyles/chat.css index b6e6dde..b46a657 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/chat.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/chat.css @@ -1,5 +1,5 @@ .chat { - margin: 1% 1.2% 0 0; + margin: 1% 3.2% 0 0; } .chat__content { @@ -81,7 +81,7 @@ } .write__content input { - padding: 14px 35% 14px 12px; + padding: 14px 25% 14px 12px; border-radius: 13px; background: #22252F; color: #A9A99D; diff --git a/luckydiamond/src/assets/css/global.css b/luckydiamond/src/assets/css/global.css index 6e6d8a8..0a427b7 100644 --- a/luckydiamond/src/assets/css/global.css +++ b/luckydiamond/src/assets/css/global.css @@ -24,7 +24,7 @@ body, html { .content-grid { display: grid; - grid-template-columns: .35fr repeat(5, 1fr) 1.2fr; + grid-template-columns: .35fr repeat(5, 1fr) 1fr; grid-template-rows: auto 0fr repeat(4, 1fr); grid-auto-columns: 1fr; grid-auto-flow: row;