Merge remote-tracking branch 'origin/release/13.2' into dev

opf · Jan 12, 2024 · 67dcb41 · 67dcb41
2 parents 753b0cb + 698133f
commit 67dcb41
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/app/components/members/index_page_header_component.html.erb b/app/components/members/index_page_header_component.html.erb
@@ -8,7 +8,6 @@
           actions.with_column(mr: BUTTON_MARGIN_RIGHT) do
             render(
               Primer::Beta::Button.new(
-                tag: :a,
                 scheme: :primary,
                 size: :medium,
                 aria: { label: I18n.t(:button_add_member) },

diff --git a/frontend/src/global_styles/content/work_packages/new/_type_status_row.sass b/frontend/src/global_styles/content/work_packages/new/_type_status_row.sass
@@ -21,10 +21,11 @@
     .inline-edit--field
       min-width: 125px
 
-  .work-packages--type-selector,
-  .work-packages--status-selector
-    .-active
-      margin: 6px 6px 6px 0px
-
-.work-packages--type-selector .-active
-    margin: 6px 6px 0px 0px
+.work-packages--type-selector,
+.work-packages--status-selector
+  .-active
+    .ng-select-container
+      height: 36px !important
+      line-height: 36px !important
+    .ng-select input
+      height: initial !important
diff --git a/frontend/src/global_styles/content/work_packages/single_view/_single_view.sass b/frontend/src/global_styles/content/work_packages/single_view/_single_view.sass
@@ -64,7 +64,6 @@
       font-size: 16px
       line-height: 1
 
-
 .work-packages--details--subject
   @include grid-content
   @include grid-size(expand)

diff --git a/frontend/src/global_styles/layout/work_packages/_full_view.sass b/frontend/src/global_styles/layout/work_packages/_full_view.sass
@@ -141,14 +141,6 @@
       font-size: 20px
       font-weight: var(--base-text-weight-bold)
 
-      // Style edit field to look like the display field.
-      // Thus we avoid a visual jump when editing the subject.
-      &.-active input
-        height: 36px
-        line-height: 36px
-        padding: 5px 0 5px 5px
-        font-size: 20px
-
 .work-packages--subject-type-row
   display: flex
   position: relative