Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjust css so accordion mouse-over area is consistent #1603

Merged
merged 2 commits into from
Feb 9, 2023
Merged

adjust css so accordion mouse-over area is consistent #1603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfbcf35
adjust css so accordion mouse-over area is consistent
ijabbott Feb 8, 2023
3498757
version bump
ijabbott Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 12 additions & 23 deletions apps/andi/assets/css/edit.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$component-number-width: 4rem;
$component-header-height: 7.5rem;
$component-header-height: 4.5rem;

.edit-page {
display: grid;
Expand All @@ -18,10 +18,11 @@ $component-header-height: 7.5rem;
}

.form-section {
margin-left: 1rem;
margin-top: -$component-header-height;
padding-left: $component-number-width - 1rem;
margin-top: -$component-header-height + 1rem;
padding-top: $component-header-height;
margin-left: 1rem;
padding-bottom: 1rem;
border-left: 2px solid $color-form-border;
}

Expand Down Expand Up @@ -51,37 +52,25 @@ $component-header-height: 7.5rem;
display: none;
}

.component-edit-section--expanded {
padding-bottom: 2rem;
}

.component-header {
position: relative;
z-index: 1;
display: flex;
}

.component-header:hover {
cursor: pointer;
}

#metadata-form>.form-section {
.form-beginning>.form-section {
margin-top: -3rem;
padding-top: 4rem;
padding-top: 3rem;
}

#extract-step-form>.form-section {
margin-top: -3rem;
padding-top: 4rem;
}

.finalize-form--collapsed>.form-section {
margin-top: -9.5rem;
margin-bottom: 4rem;
}

.datasets-data-dictionary {
.form-section {
margin-top: -8.75rem;
}
.form-end>.form-section {
margin-bottom: 3rem;
padding-top: 3rem;
padding-bottom: 0;
}

.section-number {
Expand Down
8 changes: 0 additions & 8 deletions apps/andi/assets/css/transformations.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,10 @@
}
}

#transformation-forms {
margin-bottom: 2rem;
}

#add-transformation {
margin: 0;
}

.transformations--expanded {
margin-bottom: 1.2rem;
}

.transformation-form {
border: 1px solid #C9C6C7;
margin-bottom: 1.6rem;
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/dataset_live_view/data_dictionary_form.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ defmodule AndiWeb.EditLiveView.DataDictionaryForm do
end

~L"""
<div id="data-dictionary-form" class="form-component">
<div id="data-dictionary-form" class="form-component form-end">
<div class="component-header" phx-click="toggle-component-visibility" phx-value-component="data_dictionary_form">
<div class="section-number">
<div class="component-number component-number--<%= @validation_status %>"><%= @order %></div>
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/dataset_live_view/metadata_form.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ defmodule AndiWeb.EditLiveView.MetadataForm do
end

~L"""
<div id="metadata-form" class="form-component">
<div id="metadata-form" class="form-component form-beginning">
<div class="component-header" phx-click="toggle-component-visibility">
<div class="section-number">
<div class="component-number component-number--<%= @validation_status %> component-number--<%= @visibility %>">1</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/ingestion_live_view/extract_steps/extract_step_form.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ defmodule AndiWeb.IngestionLiveView.ExtractSteps.ExtractStepForm do
end

~L"""
<div id="extract-step-form" class="form-component">
<div id="extract-step-form" class="form-component form-beginning">
<div class="component-header" phx-click="toggle-component-visibility" phx-value-component="extract_form">
<div class="section-number">
<div class="component-number component-number--<%= @validation_status %>"><%= @order %></div>
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/ingestion_live_view/finalize/finalize_form.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ defmodule AndiWeb.IngestionLiveView.FinalizeForm do
end

~L"""
<div id="finalize_form" class="finalize-form finalize-form--<%= @visibility %>">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does the other steps in ingestion need the same touch or do they work the same?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We just need it for the first and last steps. This is so the line that extends between the step numbers doesn't overflow

<div id="finalize_form" class="finalize-form finalize-form--<%= @visibility %> form-end">
<div class="component-header" phx-click="toggle-component-visibility" phx-value-component="finalize_form">
<div class="section-number">
<div class="component-number component-number--<%= @validation_status %>">4</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/mix.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Andi.MixProject do
def project do
[
app: :andi,
version: "2.5.54",
version: "2.5.55",
build_path: "../../_build",
config_path: "../../config/config.exs",
deps_path: "../../deps",
Expand Down