diff --git a/app/assets/stylesheets/common/_custom_texts.scss b/app/assets/stylesheets/common/_custom_texts.scss index 165c1f17..ab3689d5 100644 --- a/app/assets/stylesheets/common/_custom_texts.scss +++ b/app/assets/stylesheets/common/_custom_texts.scss @@ -33,7 +33,6 @@ .m-0; font-size: smaller; - line-height: 95%; } .uppercaseText { diff --git a/app/assets/stylesheets/common/_header.scss b/app/assets/stylesheets/common/_header.scss index 308a9428..6cb94a75 100644 --- a/app/assets/stylesheets/common/_header.scss +++ b/app/assets/stylesheets/common/_header.scss @@ -85,7 +85,15 @@ } } + .boards-dropdown { + .dropdown-item { + padding-top: 0.75rem; + padding-bottom: 0.75rem; + } + } + .dropdown-item:active { + color: white !important; background-color: var(--primary-color); } } \ No newline at end of file diff --git a/app/assets/stylesheets/common/_index.scss b/app/assets/stylesheets/common/_index.scss index cc73dd5d..49119752 100644 --- a/app/assets/stylesheets/common/_index.scss +++ b/app/assets/stylesheets/common/_index.scss @@ -221,6 +221,8 @@ body { & > input:focus ~ label::before { border-color: var(--primary-color-dark) !important; } + + z-index: auto; } .selectPicker { diff --git a/app/assets/stylesheets/components/Board.scss b/app/assets/stylesheets/components/Board.scss index 2c5ea4a9..70f28188 100644 --- a/app/assets/stylesheets/components/Board.scss +++ b/app/assets/stylesheets/components/Board.scss @@ -25,6 +25,12 @@ .newPostForm { @extend .my-2; + + #postDescription { + height: 100px; + min-height: 100px; + resize: vertical; + } } } diff --git a/app/assets/stylesheets/components/Comments.scss b/app/assets/stylesheets/components/Comments.scss index bae13b12..57caf9f8 100644 --- a/app/assets/stylesheets/components/Comments.scss +++ b/app/assets/stylesheets/components/Comments.scss @@ -9,11 +9,11 @@ .mr-2; height: 80px; + min-height: 80px; + resize: vertical; border: thin solid grey; border-radius: 4px; - - resize: none; } .newCommentForm { diff --git a/app/assets/stylesheets/components/Post.scss b/app/assets/stylesheets/components/Post.scss index 1e50f910..917254f7 100644 --- a/app/assets/stylesheets/components/Post.scss +++ b/app/assets/stylesheets/components/Post.scss @@ -149,6 +149,12 @@ @extend .my-3; } + .postDescription { + height: 150px; + min-height: 150px; + resize: vertical; + } + .postEditFormButtons { @extend .d-flex, .justify-content-end; } diff --git a/app/assets/stylesheets/components/SiteSettings/Appearance/index.scss b/app/assets/stylesheets/components/SiteSettings/Appearance/index.scss index 001def94..0e9ce42f 100644 --- a/app/assets/stylesheets/components/SiteSettings/Appearance/index.scss +++ b/app/assets/stylesheets/components/SiteSettings/Appearance/index.scss @@ -1,4 +1,6 @@ #customCss { width: 100%; height: 300px; + min-height: 100px; + resize: vertical; } \ No newline at end of file diff --git a/app/assets/stylesheets/components/SiteSettings/Authentication/index.scss b/app/assets/stylesheets/components/SiteSettings/Authentication/index.scss index 0292d7a7..333b1ef9 100644 --- a/app/assets/stylesheets/components/SiteSettings/Authentication/index.scss +++ b/app/assets/stylesheets/components/SiteSettings/Authentication/index.scss @@ -1,6 +1,4 @@ .authenticationIndexPage { - h2 { @extend .mb-3; } - .oauthProvidersTitle { @extend .d-flex; diff --git a/app/assets/stylesheets/components/SiteSettings/Boards/index.scss b/app/assets/stylesheets/components/SiteSettings/Boards/index.scss index 9278b311..808d4463 100644 --- a/app/assets/stylesheets/components/SiteSettings/Boards/index.scss +++ b/app/assets/stylesheets/components/SiteSettings/Boards/index.scss @@ -44,4 +44,10 @@ column-gap: 8px; } + + .boardDescriptionTextArea { + height: 80px; + min-height: 80px; + resize: vertical; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/components/SiteSettings/Users/index.scss b/app/assets/stylesheets/components/SiteSettings/Users/index.scss index 39c7b812..c4040d8e 100644 --- a/app/assets/stylesheets/components/SiteSettings/Users/index.scss +++ b/app/assets/stylesheets/components/SiteSettings/Users/index.scss @@ -1,3 +1,7 @@ +.userCount { + text-transform: lowercase; +} + ul.usersList { @extend .pl-1; diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 21f1ab19..43f0c2de 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -6,7 +6,7 @@ class UsersController < ApplicationController @users = User .all - .order(role: :desc) + .order(role: :desc, created_at: :desc) render json: @users end diff --git a/app/javascript/components/Comments/CommentEditForm.tsx b/app/javascript/components/Comments/CommentEditForm.tsx index 932614b5..e6b2ee88 100644 --- a/app/javascript/components/Comments/CommentEditForm.tsx +++ b/app/javascript/components/Comments/CommentEditForm.tsx @@ -58,6 +58,7 @@ class CommentEditForm extends React.Component {