Skip to content

Moves reset button out of navigation bar #154

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

Open
vreelb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Moves reset button out of navigation bar #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 36 additions & 27 deletions core/calculator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,58 +70,67 @@ body {

.search_bar {
margin-bottom: 10px;

}

.search_label_wrapper {
float:left;
padding: 5px 10px;
border: 2px solid #8b90a1;
border-right: 0;
background: #D8D9ED;
border-radius: 5px 0 0 5px;
}
.search_label {
border-radius: 5px;
display: flex;
flex-direction: row;
justify-content: space-between;
}

.search_box_wrapper {
display: block;
overflow: hidden;
flex-grow: 1;
}
.search_box {
width: 100%;
box-sizing:border-box;
box-sizing: border-box;
padding: 5px;
margin: 0;
color: #000;
font-family: sans-serif;
background-color: #fff;
border: none;
border-top: 2px solid #8b90a1;
border-bottom: 2px solid #8b90a1;
font-size: 1em;
}




.hide_unused_wrapper {
float:right;
padding: 5px 10px;
border: 2px solid #8b90a1;
border-radius: 0 5px 5px 0;
.search_bar_button {
padding: 5px 9px;
border: none;
border-left: 2px solid #8b90a1;
outline: none;
background: #FFF;
transition: background-color 0.1s linear, color 0.1s linear;
font-size: inherit;
cursor: pointer;
}

#search_label_wrapper {
background: #D8D9ED;
border: none;
border-right: 2px solid #8b90a1;
cursor: none;
}
@media (max-width:768px) {
#search_label_wrapper {
display: none;
}
}
.hide_unused_wrapper {
display: inline-block;
}
.hide_unused_wrapper:hover {
background: #D8D9ED;
}

.hide_unused_label {
cursor: pointer;
cursor: inherit;
}
#reset_item_count {
display: inline-block;
background-color: #ffbcbc
}
#reset_item_count:hover {
background-color: #ff8282
}




#item_list {
Expand Down
20 changes: 11 additions & 9 deletions core/calculator.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<body>
<div class="header_bar">
<a href="/" aria-label="Home"><div class="home_button_logo">&nbsp;</div></a>
<a href="#" id="reset_item_count"><div class="home_button"> Reset Item Counts</div></a>
<a href="mailto:admin@resourcecalculator.com?Subject=Resource%20Calculator%20Issue"><div class="home_button">Report An Issue</div></a>
<a href="https://github.com/AsherGlick/ResourceCalculator/blob/master/README.md"><div class="home_button">Contribute</div></a>
<a><div id="about_button" class="home_button">About</div></a>
Expand All @@ -57,16 +56,19 @@
</div>
<!-- <input type="button" class="inventory_import_export_toggle" title="Show/Hide Inventory as Text" value="Show/Hide Inventory as Text"/> -->
<div class="search_bar">
<div class='hide_unused_wrapper'>
<input type="checkbox" id="unused_hide_checkbox" class="hide_unused_checkbox" />
<label class="hide_unused_label" for="unused_hide_checkbox" id="unused_hide_checkbox_label">Hide Unused</label>
</div>
<div class="search_label_wrapper">
<div id="search_label_wrapper" class="search_bar_button">
<label class="search_label" for="item_filter">Filter:</label>
</div>
<span class="search_box_wrapper">
<input type="text" class="search_box" id="item_filter" />
</span>
<div class="search_box_wrapper">
<input type="text" id="item_filter" class="search_box" placeholder="Type to filter items..." />
</div>
<div>
<div class="hide_unused_wrapper search_bar_button">
<input type="checkbox" id="unused_hide_checkbox" class="hide_unused_checkbox" />
<label class="hide_unused_label" for="unused_hide_checkbox" id="unused_hide_checkbox_label">Hide Unused</label>
</div>
<button type="button" id="reset_item_count" class="search_bar_button">Reset</button>
</div>
</div>

<div class="resource_content">
Expand Down
6 changes: 5 additions & 1 deletion core/src/calculator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@ const inventory_amount_input_elem = <HTMLInputElement>document.getElementById("i
| "Reset Item Counts" Button Logic |
\******************************************************************************/
function clear_item_counts() {
if (!confirm("Are you sure you want to clear all items?")) {
return;
}

document.querySelectorAll(".desired_item").forEach((desired_item) => {
let field = <HTMLInputElement>desired_item.querySelector(".desired_item_count");
const field = <HTMLInputElement>desired_item.querySelector(".desired_item_count");
field.value = "";
set_textbox_background(field);
});
Expand Down