Merge pull request #11749 from nanaya/team-settings-description

Adjust team description input area
ppy · Dec 17, 2024 · 4c734d2 · 4c734d2
2 parents 1f46b13 + 1839678
commit 4c734d2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/resources/css/bem/input-text.less b/resources/css/bem/input-text.less
@@ -10,4 +10,16 @@
   padding: var(--input-padding);
   box-shadow: inset 0 0 0 2px var(--input-border-colour);
   border-radius: @border-radius-large;
+
+  &--bbcode {
+    .fancy-scrollbar();
+    display: grid;
+    grid-template-rows: 1fr auto;
+    gap: 5px;
+  }
+
+  &__bbcode-textarea {
+    .reset-input();
+    resize: none;
+  }
 }
diff --git a/resources/css/bem/team-settings-description-preview.less b/resources/css/bem/team-settings-description-preview.less
@@ -4,5 +4,5 @@
 .team-settings-description-preview {
   padding: 0 var(--padding);
   overflow-y: scroll;
-  max-height: calc(70 * var(--vh));
+  height: calc(70 * var(--vh));
 }
diff --git a/resources/views/teams/edit.blade.php b/resources/views/teams/edit.blade.php
@@ -149,10 +149,13 @@ class="team-settings__image"
                             <span class="input-container__label">
                                 {{ osu_trans('teams.edit.description.label') }}
                             </span>
-                            <textarea
-                                name="team[description]"
-                                class="input-text js-post-preview--auto"
-                            >{{ $team->description }}</textarea>
+                            <div class="input-text input-text--bbcode">
+                                <textarea
+                                    name="team[description]"
+                                    class="input-text__bbcode-textarea js-post-preview--auto js-bbcode-body"
+                                >{{ $team->description }}</textarea>
+                                @include('forum._post_toolbar')
+                            </div>
                         </label>
 
                         <div class="team-settings__description-preview u-fancy-scrollbar">