diff --git a/app/assets/stylesheets/buttons.css b/app/assets/stylesheets/buttons.css index 3b6b3ebcc..ccc8ebffd 100644 --- a/app/assets/stylesheets/buttons.css +++ b/app/assets/stylesheets/buttons.css @@ -193,3 +193,20 @@ } } } + + + + + + +.btn-dialog { + .popup { + background-color: var(--bubble-color, var(--color-bg)); + margin-top: var(--btn-size); + } + + .popup__item { + --btn-background: var(--bubble-color); + --btn-color: var(--color-bg); + } +} diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 1b9231cae..4d66afe4b 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -116,7 +116,6 @@ margin-block: calc(var(--block-space) * -1) var(--block-space); padding: var(--block-space) var(--inline-space-double); position: relative; - z-index: 0; &:has(dialog[open]) { z-index: 1; diff --git a/app/views/bubbles/_pop_toggle.html.erb b/app/views/bubbles/_pop_toggle.html.erb index 3335efdac..f9b1d4105 100644 --- a/app/views/bubbles/_pop_toggle.html.erb +++ b/app/views/bubbles/_pop_toggle.html.erb @@ -6,21 +6,22 @@ <% end %> <% else %>
- - - Close as… +
+ - <% Current.account.pop_reasons.labels.each do |label| %> - <%= button_to bubble_pop_path(bubble, reason: label), class: "btn popup__item full-width", form_class: "full-width" do %> - <%= label %> + + <% Current.account.pop_reasons.labels.each do |label| %> + <%= button_to bubble_pop_path(bubble, reason: label), class: "btn popup__item full-width", form_class: "full-width" do %> + <%= label %> + <% end %> <% end %> - <% end %> - +
+