Skip to content

Commit

Permalink
Merge branch 'ui-fix'
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/index.html

Conflicts resolved
  • Loading branch information
hepabolu committed Jun 22, 2024
2 parents 9c3a759 + 9b64b5f commit 40b9313
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</header> <!-- close row for nav -->

<section id="content" class="row"> <!-- open row for content below nav -->
<div class="accordion mt-3 mb-3 mb-lg-3 col-11 col-md mx-auto" id="passwordConfig"> <!-- open config col -->
<!-- div class="accordion mt-3 mb-3 mb-lg-3 col-11 col-md mx-auto" id="passwordConfig"> < !-- open config col - - >
<div class="accordion-item">
<h2 class="accordion-header">
<button class="accordion-button" type="button" data-bs-toggle="collapse"
Expand All @@ -79,8 +79,8 @@ <h2 class="accordion-header">
</button>
</h2>
<div id="collapseConfig" class="accordion-collapse collapse" data-bs-parent="#passwordConfig">
<div class="accordion-body">
<div class="accordion" id="configOptions">
<div class="accordion-body"> -->
<div class="accordion my-3 mb-lg-3 px-0" id="configOptions">
<div class="accordion-item">
<h2 class="accordion-header">
<button class="accordion-button" type="button" data-bs-toggle="collapse"
Expand All @@ -89,7 +89,7 @@ <h2 class="accordion-header">
</button>
</h2>
<!-- This section (id = collapsePresets) is handled by the PresetController and the PresetView -->
<div id="collapsePresets" class="accordion-collapse collapse show"
<div id="collapsePresets" class="accordion-collapse collapse"
data-bs-parent="#configOptions">
<div class="accordion-body">
<div id="preset-btn-group" class="row" role="group" aria-label="Preset group">
Expand Down Expand Up @@ -315,10 +315,10 @@ <h5>Padding</h5>
</div> <!-- /collapseSettings -->
</div> <!-- /accordion-item for settings -->
</div> <!-- /accordion configOptions -->
</div> <!-- /accordion body -->
</div> <!-- /collapseConfig -->
<!-- /div> <! - - /accordion body - - >
</div> <!- - /collapseConfig - - >
</div>
</div> <!-- close config col -->
</div> <!- - close config col -->

<!-- this section (id = generatePassword) is handled by the PasswordController and the PasswordView -->
<div id="generatePassword" class="mt-2"> <!-- open generate pw - need to split pw box out -->
Expand Down Expand Up @@ -364,7 +364,7 @@ <h3>Generate Password(s)</h3>
<div class="row"> <!-- open row for password card -->

<!-- this section (id = password-card) is handled by the PasswordController and the PasswordView -->
<section id="password-card" class="order-3">
<section id="password-card" class="order-3 px-0">
<div class="card mt-3 mt-lg-5 col"> <!-- open password card with stats -->
<div class="card-header d-flex align-items-center">
<span class="text-uppercase">Passwords</span>
Expand Down

0 comments on commit 40b9313

Please sign in to comment.