diff --git a/hwe/scss/common/bootstrap_sammo.scss b/hwe/scss/common/bootstrap_sammo.scss
index 2a7bcb18..b817a50a 100644
--- a/hwe/scss/common/bootstrap_sammo.scss
+++ b/hwe/scss/common/bootstrap_sammo.scss
@@ -1,67 +1,72 @@
-
-
@function frontColor($color) {
- @return color-contrast($color);
+ @return color-contrast($color);
}
-@each $colorType, $color in $nationColors {
- .sam-color-#{$colorType} {
- .sam-nation-own-bgcolor{
- background-color: $color;
- color: frontColor($color);
- }
-
- .btn-sammo-nation{
- @include button-variant($color, $color);
-
- &:hover,
- &:active,
- &:focus {
- background-color: $color;
- }
-
- &,
- &:not(.disabled):hover,
- &:not(.disabled):active,
- &:focus {
- border-color: shade-color($color, 10%);
- }
- }
+@each $colorType,
+$color in $nationColors {
+ .sam-color-#{$colorType} {
+ .sam-nation-own-bgcolor {
+ background-color: $color;
+ color: frontColor($color);
}
- .btn-sammo-nation-#{$colorType}{
- @include button-variant($color, $color);
+ .btn-sammo-nation {
+ @include button-variant($color, $color);
- &:hover,
- &:active,
- &:focus {
- background-color: $color;
- }
+ &:hover,
+ &:active,
+ &:focus {
+ background-color: $color;
+ }
- &,
- &:not(.disabled):hover,
- &:not(.disabled):active,
- &:focus {
- border-color: shade-color($color, 10%);
- }
+ &,
+ &:not(.disabled):hover,
+ &:not(.disabled):active,
+ &:focus {
+ border-color: shade-color($color, 10%);
+ }
}
+ }
+
+ .sam-nation-bg-#{$colorType} {
+ background-color: $color;
+ color: frontColor($color);
+ }
+
+ .btn-sammo-nation-#{$colorType} {
+ @include button-variant($color, $color);
+
+ &:hover,
+ &:active,
+ &:focus {
+ background-color: $color;
+ }
+
+ &,
+ &:not(.disabled):hover,
+ &:not(.disabled):active,
+ &:focus {
+ border-color: shade-color($color, 10%);
+ }
+ }
}
-@each $colorType, $color in $sammoColors {
- .btn-sammo-#{$colorType}{
- @include button-variant($color, $color);
+@each $colorType,
+$color in $sammoColors {
+ .btn-sammo-#{$colorType} {
+ @include button-variant($color, $color);
- &:hover,
- &:active,
- &:focus {
- background-color: $color;
- }
-
- &,
- &:not(.disabled):hover,
- &:not(.disabled):active,
- &:focus {
- border-color: shade-color($color, 10%);
- }
+ &:hover,
+ &:active,
+ &:focus {
+ background-color: $color;
}
+
+ &,
+ &:not(.disabled):hover,
+ &:not(.disabled):active,
+ &:focus {
+ border-color: shade-color($color, 10%);
+ }
+ }
}
\ No newline at end of file
diff --git a/hwe/scss/dipcenter.scss b/hwe/scss/dipcenter.scss
deleted file mode 100644
index a6c65219..00000000
--- a/hwe/scss/dipcenter.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-@import '@scss/common/bootstrap5.scss';
-
-#scoutMsgForm .viewer{
- max-height:200px;
- overflow: hidden;
-}
-
-.note-editor.card {
- background:inherit;
- color:inherit;
- border:none;
-}
-
-.note-editor.note-frame .note-editing-area .note-editable {
- background:inherit;
- color:inherit;
- padding:0;
-}
-
-.note-editor.note-frame .note-statusbar{
- background-color:#444444;
- border-top: 1px solid rgba(0,0,0,0.125);
-}
\ No newline at end of file
diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss
index da6c9cc6..d3804147 100644
--- a/hwe/scss/main.scss
+++ b/hwe/scss/main.scss
@@ -215,6 +215,10 @@ body {
}
}
+#nation-msg{
+ word-break: break-all;
+}
+
#nation-msg-box {
position: relative;
overflow: hidden;
diff --git a/hwe/scss/nationStratFinan.scss b/hwe/scss/nationStratFinan.scss
new file mode 100644
index 00000000..b68cde2a
--- /dev/null
+++ b/hwe/scss/nationStratFinan.scss
@@ -0,0 +1,91 @@
+@import '@scss/common/bootstrap5.scss';
+@import "@scss/game_bg.scss";
+@import "@scss/util.scss";
+@import "@scss/editor_component.scss";
+
+.diplomacyTitle {
+ background-color: $blue;
+ text-align: center;
+ font-size: 1.4em;
+}
+
+.noticeTitle {
+ background-color: $white;
+ text-align: center;
+ color: black;
+ font-size: 1.4em;
+}
+
+.financeTitle{
+ background-color: $green;
+ text-align: center;
+ font-size: 1.4em;
+}
+
+#app {
+ width: 100%;
+ overflow-x: hidden;
+}
+
+.tiptap-editor{
+ width: 100%;
+ overflow: hidden;
+}
+
+@include media-1000px {
+ #container {
+ width: 1000px;
+ margin: 0 auto;
+ position: relative;
+ }
+}
+
+@include media-500px {
+ #container {
+ position: relative;
+ width: 500px;
+ margin: auto;
+ overflow-x: hidden;
+ }
+
+
+
+ #noticeForm .ProseMirror {
+ transform: scale(0.5);
+ transform-origin: left top;
+ width: 1000px;
+ }
+
+ #scoutMsgForm .ProseMirror {
+ transform: scale(calc(500/ 870));
+ transform-origin: left top;
+ width: 870px;
+ }
+
+}
+
+.diplomacyTable {
+ .tRow {
+ display: grid;
+ grid-template-columns: minmax(130px, 3fr) 1.5fr 1fr 1fr 2fr 1fr 2fr;
+ text-align: center;
+ }
+}
+
+
+.note-editor.card {
+ background: inherit;
+ color: inherit;
+ border: none;
+}
+
+.note-editor.note-frame .note-editing-area .note-editable {
+ background: inherit;
+ color: inherit;
+ padding: 0;
+}
+
+.note-editor.note-frame .note-statusbar {
+ background-color: #444444;
+ border-top: 1px solid rgba(0, 0, 0, 0.125);
+}
\ No newline at end of file
diff --git a/hwe/scss/util.scss b/hwe/scss/util.scss
index eb044ae3..67f0d4e2 100644
--- a/hwe/scss/util.scss
+++ b/hwe/scss/util.scss
@@ -1,5 +1,3 @@
-
-
.s-border-t {
border-top: gray solid 1px;
}
diff --git a/hwe/ts/PageJoin.vue b/hwe/ts/PageJoin.vue
index 0f301023..8d8298cc 100644
--- a/hwe/ts/PageJoin.vue
+++ b/hwe/ts/PageJoin.vue
@@ -549,7 +549,9 @@ export default defineComponent({
},
});
-
\ No newline at end of file
diff --git a/hwe/ts/components/TipTap.vue b/hwe/ts/components/TipTap.vue
index db0ea843..cb09cd20 100644
--- a/hwe/ts/components/TipTap.vue
+++ b/hwe/ts/components/TipTap.vue
@@ -223,7 +223,9 @@
+
{
this.$emit("update:modelValue", this.editor.getHTML());
},
+ onCreate: () => {
+ this.$emit("ready");
+ }
});
this.editor = editor;
},
diff --git a/hwe/ts/v_join.ts b/hwe/ts/v_join.ts
index 748ea326..66abce02 100644
--- a/hwe/ts/v_join.ts
+++ b/hwe/ts/v_join.ts
@@ -1,7 +1,5 @@
import { createApp } from 'vue'
import PageJoin from '@/PageJoin.vue';
import BootstrapVue3 from 'bootstrap-vue-3'
-import "@scss/common/bootstrap5.scss";
-import "@scss/editor_component.scss";
createApp(PageJoin).use(BootstrapVue3).mount('#app')
\ No newline at end of file
diff --git a/hwe/ts/v_nationStratFinan.ts b/hwe/ts/v_nationStratFinan.ts
index 7461b256..87da3e98 100644
--- a/hwe/ts/v_nationStratFinan.ts
+++ b/hwe/ts/v_nationStratFinan.ts
@@ -7,4 +7,4 @@ import { auto500px } from './util/auto500px';
auto500px();
-createApp(PageNationStratFinan).use(BootstrapVue3).mount('#container');
\ No newline at end of file
+createApp(PageNationStratFinan).use(BootstrapVue3).mount('#app');
\ No newline at end of file
diff --git a/hwe/v_nationStratFinan.php b/hwe/v_nationStratFinan.php
index 7e0589c0..1ccba237 100644
--- a/hwe/v_nationStratFinan.php
+++ b/hwe/v_nationStratFinan.php
@@ -157,7 +157,7 @@ $outcome = getOutcome(100, $dedicationList);
-
+