From cde992a1948c9b31ff211c5772e73a5ead2d7a4d Mon Sep 17 00:00:00 2001 From: david Date: Sat, 9 Nov 2024 02:26:38 +0100 Subject: [PATCH] Cosmetics --- app/assets/stylesheets/layout.scss | 54 +++++++++---------- app/views/elements/_form.html.erb | 2 +- .../_new_success_criterion_button.html.erb | 2 +- app/views/pages/_new_element_button.html.erb | 2 +- app/views/pages/_page.html.erb | 4 -- app/views/pages/show.html.slim | 7 ++- app/views/reports/_new_page_button.html.erb | 2 +- app/views/reports/show.html.slim | 11 +++- app/views/success_criteria/_form.html.erb | 2 +- app/views/success_criteria/_header.html.slim | 4 +- app/views/success_criteria/new.html.slim | 6 +-- .../new_from_checklist.html.slim | 6 +-- 12 files changed, 53 insertions(+), 49 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 6bc705c..642941a 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -1,5 +1,10 @@ -$tertiary: $gray-300; +$tertiary-hover: $gray-200; +$tertiary: $gray-400; +$tertiary-active-hover: $gray-300; + $tertiary-dark: $gray-700; +$tertiary-dark-hover: $gray-800; +$tertiary-dark-active-open: $gray-600; .action-row { @extend .d-flex; @@ -218,30 +223,9 @@ details.tree[open]>summary::before { padding-bottom: 0; } - -// summary.active::before { -// @include details-icon(to-rgb($primary)); -// } - -.sc-level-a { - background-color: $purple; -} - -.sc-level-aa { - background-color: $orange; -} - -.sc-level-aaa { - background-color: $teal; -} - -.sc-level { - // font-size: 0.5rem; -} - details.success_criterion { summary:hover { - background-color: shade-color($tertiary, 40%); + background-color: $tertiary-hover; // border-right: solid 4px $primary; @@ -262,14 +246,13 @@ details.success_criterion { @include color-mode(dark) { details.success_criterion { summary:hover { - background-color: shade-color($tertiary-dark, 40%); + background-color: $tertiary-dark-hover; } } } details.success_criterion[open] { - // padding-left: 8px; border: solid 1px $tertiary; margin-bottom: 2rem; padding-bottom: 1rem; @@ -279,8 +262,7 @@ details.success_criterion[open] { } summary:hover { - background-color: shade-color($tertiary, 30%); - // border-right: solid 4px $primary; + background-color: $tertiary-active-hover; } } @@ -293,7 +275,7 @@ details.success_criterion[open] { } summary:hover { - background-color: shade-color($tertiary-dark, 30%); + background-color: $tertiary-dark-active-open; } } } @@ -302,7 +284,7 @@ details.tree { summary:hover, li:has(a):hover { - background-color: shade-color($tertiary, 50%); + background-color: $tertiary-hover; } } @@ -311,7 +293,19 @@ details.tree { summary:hover, li:has(a):hover { - background-color: shade-color($tertiary-dark, 40%); + background-color: $tertiary-dark-hover; } } +} + +.sc-level-a { + background-color: $pink; +} + +.sc-level-aa { + background-color: $indigo; +} + +.sc-level-aaa { + background-color: $purple; } \ No newline at end of file diff --git a/app/views/elements/_form.html.erb b/app/views/elements/_form.html.erb index 43349ca..1795bfc 100644 --- a/app/views/elements/_form.html.erb +++ b/app/views/elements/_form.html.erb @@ -2,6 +2,6 @@ <%= form.hidden_field :page_id %> <%= form.text_field :title %> <%= form.rich_text_area :description %> - <%= form.submit class: "btn btn-warning" %> + <%= form.submit class: "btn btn-primary" %> <%= link_to("Abbrechen", element.persisted? ? element : element.report, class: "btn btn-outline-secondary") %> <% end %> diff --git a/app/views/elements/_new_success_criterion_button.html.erb b/app/views/elements/_new_success_criterion_button.html.erb index 49da718..5de52b4 100644 --- a/app/views/elements/_new_success_criterion_button.html.erb +++ b/app/views/elements/_new_success_criterion_button.html.erb @@ -1,3 +1,3 @@ -<%= link_to "#{tag.i(class: "bi bi-plus-lg")} Checkliste".html_safe, new_from_checklist_element_success_criteria_path(element), class: "btn btn-primary" %> +<%= link_to "#{tag.i(class: "bi bi-plus-lg")} Checkliste".html_safe, new_from_checklist_element_success_criteria_path(element), class: "btn btn-secondary" %> <%= link_to "#{tag.i(class: "bi bi-plus-lg")} Erfolgskriterium".html_safe, new_element_success_criterion_path(element), class: "btn btn-secondary" %> diff --git a/app/views/pages/_new_element_button.html.erb b/app/views/pages/_new_element_button.html.erb index 07ccdd4..873b571 100644 --- a/app/views/pages/_new_element_button.html.erb +++ b/app/views/pages/_new_element_button.html.erb @@ -1 +1 @@ -<%= link_to "#{tag.i(class: "bi bi-plus-lg")} Neues Element".html_safe, new_page_element_path(page_id: page.id), class: "btn btn-primary" %> +<%= link_to "#{tag.i(class: "bi bi-plus-lg")} Neues Element".html_safe, new_page_element_path(page_id: page.id), class: "btn btn-secondary" %> diff --git a/app/views/pages/_page.html.erb b/app/views/pages/_page.html.erb index 1e3adda..d3bc06a 100644 --- a/app/views/pages/_page.html.erb +++ b/app/views/pages/_page.html.erb @@ -1,8 +1,4 @@
-

- - <%= page.position %> <%= page.path %>

-

url: <%= page.url %>

<% page.elements.each do |element| %> <%= render element %> diff --git a/app/views/pages/show.html.slim b/app/views/pages/show.html.slim index b2beb5b..c2c8f8b 100644 --- a/app/views/pages/show.html.slim +++ b/app/views/pages/show.html.slim @@ -1,10 +1,15 @@ h1 = t("scaffold.pagetitle_show", model: @page.class.model_name.human) +h2 + i.bi.bi-file-earmark-check + = @page.position + = @page.path + = render @page = turbo_frame_tag(dom_id(@page, :notes)) do - = render partial: "pages/notes", locals: { page: @page } + = render partial: "pages/notes", locals: { page: @page } .action-row = link_to t("scaffold.link_edit", model: @page.model_name.human), edit_page_path(@page) diff --git a/app/views/reports/_new_page_button.html.erb b/app/views/reports/_new_page_button.html.erb index cfe16a8..b23bb0f 100644 --- a/app/views/reports/_new_page_button.html.erb +++ b/app/views/reports/_new_page_button.html.erb @@ -1 +1 @@ -<%= link_to "#{tag.i(class: "bi bi-plus-lg")}".html_safe, new_report_page_path(report), class: "btn btn-primary" %> +<%= link_to "#{tag.i(class: "bi bi-plus-lg")}".html_safe, new_report_page_path(report), class: "btn btn-secondary" %> diff --git a/app/views/reports/show.html.slim b/app/views/reports/show.html.slim index 0a73113..4e5f082 100644 --- a/app/views/reports/show.html.slim +++ b/app/views/reports/show.html.slim @@ -10,7 +10,16 @@ h1 - if @report.comment .smb-4.lead.mb-3 = @report.comment -.row +- if @current_page + h2 + i.bi.bi-file-earmark-check + =< @current_page.position + =< @current_page.path + p + 'URL: + = @current_page.url +/ .border-top.my-3 +.row .col-lg-3.col-md-4.col-sm-12 .page_nav.sticky-top = render partial: "reports/page_nav", locals: { report: @report, current_page: @current_page } diff --git a/app/views/success_criteria/_form.html.erb b/app/views/success_criteria/_form.html.erb index daad523..8f351a1 100644 --- a/app/views/success_criteria/_form.html.erb +++ b/app/views/success_criteria/_form.html.erb @@ -6,6 +6,6 @@ <%= form.rich_text_area :quick_fail %> <%= form.rich_text_area :quick_fix %> <%= form.rich_text_area :test_comment %> - <%= form.submit class: "btn btn-warning" %> + <%= form.submit class: "btn btn-primary" %> <%= link_to "Abbrechen", success_criterion.persisted? ? success_criterion : success_criterion.element, class: "btn btn-outline-secondary" %> <% end %> diff --git a/app/views/success_criteria/_header.html.slim b/app/views/success_criteria/_header.html.slim index fbfd625..096ebeb 100644 --- a/app/views/success_criteria/_header.html.slim +++ b/app/views/success_criteria/_header.html.slim @@ -1,7 +1,7 @@ - edit_mode = action_name == "edit" summary.d-flex.align-items-start id=dom_id(success_criterion, :header) .content.d-flex.align-items-center - .result-icon.d-flex.justify-content-center.mt-1 class=[success_criterion_result_color_classes(success_criterion)] + .result-icon.flex-shrink-0.d-flex.justify-content-center.mt-1 class=[success_criterion_result_color_classes(success_criterion)] span.h1.bi class=[success_criterion_result_icon_classes(success_criterion)] h4.mt-2 = success_criterion.page.position @@ -17,6 +17,6 @@ summary.d-flex.align-items-start id=dom_id(success_criterion, :header) = success_criterion_badge(success_criterion.check.external_number, extra_classes: "text-bg-info me-1") - = success_criterion_badge(success_criterion.level, extra_classes: "sc-level sc-level-#{success_criterion.level.to_s.downcase} me-1") + = success_criterion_badge(success_criterion.level, extra_classes: "sc-level-#{success_criterion.level.to_s.downcase} me-1") \ No newline at end of file diff --git a/app/views/success_criteria/new.html.slim b/app/views/success_criteria/new.html.slim index c89373f..6001930 100644 --- a/app/views/success_criteria/new.html.slim +++ b/app/views/success_criteria/new.html.slim @@ -1,10 +1,10 @@ h1 = t("scaffold.pagetitle_new", model: SuccessCriterion.model_name.human) = turbo_frame_tag dom_id(@success_criterion.element, "new_success_criterion_frame") do - .border.border-info.p-3 + .border.p-3 = bootstrap_form_with(model: @success_criterion.persisted? ? @success_criterion : [:element, @success_criterion]) do |form| - = form.collection_select :check_id, Check.all.order(:external_number_1, :external_number_2, :external_number_3), :id, :display_label - = form.submit class: "btn btn-warning" + = form.collection_select :check_id, Check.all.order(:external_number_1, :external_number_2, :external_number_3), :id, :display_label, hide_label: true + = form.submit "Hinzufügen", class: "btn btn-primary" = link_to "Abbrechen", @success_criterion.persisted? ? @success_criterion : @success_criterion.element, class: "btn btn-outline-secondary" .action-row diff --git a/app/views/success_criteria/new_from_checklist.html.slim b/app/views/success_criteria/new_from_checklist.html.slim index b6feb1f..0a34b58 100644 --- a/app/views/success_criteria/new_from_checklist.html.slim +++ b/app/views/success_criteria/new_from_checklist.html.slim @@ -1,8 +1,8 @@ = turbo_frame_tag dom_id(@success_criterion.element, :new_success_criterion_frame) do - .border.border-info.p-3 + .border.p-3 = bootstrap_form_with(url: create_from_checklist_element_success_criteria_path(@success_criterion.element), name: :new_from_checklist) do |form| - = form.collection_select :checklist_id, Checklist.all.order(:name), :id, :name - = form.submit class: "btn btn-warning" + = form.collection_select :checklist_id, Checklist.all.order(:name), :id, :name, hide_label: true + = form.submit "Hinzufügen", class: "btn btn-primary" = link_to "Abbrechen", @success_criterion.persisted? ? @success_criterion : @success_criterion.element, class: "btn btn-outline-secondary" \ No newline at end of file