From f0a8efb5adca61eafa32dece57da702191e18e73 Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 2 Dec 2021 22:01:29 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20500px=20=EB=AA=A8=EB=93=9C=EB=A5=BC=20?= =?UTF-8?q?=ED=99=95=EC=8B=A4=ED=95=98=EA=B2=8C=20=EB=AA=85=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/index.php | 16 +++++++------- hwe/scss/break_500px.scss | 16 ++++++++++++++ hwe/scss/main.scss | 44 +++++++++++++++++++++++--------------- hwe/ts/ReservedCommand.vue | 1 + 4 files changed, 52 insertions(+), 25 deletions(-) create mode 100644 hwe/scss/break_500px.scss diff --git a/hwe/index.php b/hwe/index.php index 0ec7c1bf..efc8d46a 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -252,17 +252,17 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
-
-
+
+
-
+
장수 동향
-
+
개인 기록
@@ -285,13 +285,13 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
npcmode == 1) ?>
-
+
전체 메시지(최고99자)
-
+
국가 메시지(최고99자)
@@ -301,14 +301,14 @@ $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1); -
+
개인 메시지(최고99자)
-
+
외교 메시지(최고99자)
diff --git a/hwe/scss/break_500px.scss b/hwe/scss/break_500px.scss new file mode 100644 index 00000000..abcbe6e7 --- /dev/null +++ b/hwe/scss/break_500px.scss @@ -0,0 +1,16 @@ +$container-max-widths: ( + sm: 500px, + md: 500px, + lg: 1020px, + xl: 1140px, + xxl: 1320px + ) !default; + +$grid-breakpoints: ( + xs: 0, + sm: 520px, + md: 900px, + lg: 992px, + xl: 1200px, + xxl: 1400px +); \ No newline at end of file diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss index ca25060d..fbf8d991 100644 --- a/hwe/scss/main.scss +++ b/hwe/scss/main.scss @@ -1,3 +1,4 @@ +@import "./break_500px.scss"; @import "./bootstrap5.scss"; body { @@ -28,7 +29,7 @@ body { } .avoid-wrap { - display:inline-block; + display: inline-block; } @@ -304,6 +305,31 @@ body { } +@include media-breakpoint-up(md) { + #message_board section { + overflow-y: auto; + overflow-x: hidden; + height: 650px; + } + + + .public_message, + .diplomacy_message, + .national_message, + .private_message { + min-height: 300px; + } +} + +@include media-breakpoint-down(md) { + .public_message, + .diplomacy_message, + .national_message, + .private_message { + min-height: 150px; + } +} + .msg_plate_national, .msg_plate_diplomacy { background-color: #00582c; @@ -319,22 +345,6 @@ body { background-color: #70153b; } -.public_message { - min-height: 300px; -} - -.diplomacy_message { - min-height: 300px; -} - -.national_message { - min-height: 300px; -} - -.private_message { - min-height: 300px; -} - .msg_icon { float: left; width: 64px; diff --git a/hwe/ts/ReservedCommand.vue b/hwe/ts/ReservedCommand.vue index 1197633d..81593a8e 100644 --- a/hwe/ts/ReservedCommand.vue +++ b/hwe/ts/ReservedCommand.vue @@ -452,6 +452,7 @@ export default defineComponent({ });