0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-20 03:12:44 +00:00

restructure html, eliminate .tool divs

Treat each input and button as a direct child of the `.group` class, removing the intermediate div and reassign the `tool` classname to those inputs and buttons.  One item, the current / total page "set", is wrapped in a .tool div because they should be considered one item (even within the .group container).

And then a bunch of CSS adjustments to match the new structure.
This commit is contained in:
Gazook89
2024-08-20 21:08:07 -05:00
parent cdc2ffeff4
commit 051eed0e83
2 changed files with 90 additions and 86 deletions

View File

@@ -44,17 +44,17 @@ const ToolBar = ({ onZoomChange, currentPage, onPageChange, totalPages })=>{
return ( return (
<div className='toolBar'> <div className='toolBar'>
<div className='group'> <div className='group'>
<div className='tool'>
<button <button
id='zoom-out'
className='tool'
onClick={()=>handleZoomChange(-20)} onClick={()=>handleZoomChange(-20)}
disabled={zoomLevel <= MIN_ZOOM} disabled={zoomLevel <= MIN_ZOOM}
> >
<i className='fas fa-magnifying-glass-minus' /> <i className='fas fa-magnifying-glass-minus' />
</button> </button>
</div>
<div className='tool'>
<input <input
className='slider' id='zoom-slider'
className='range-input tool'
type='range' type='range'
name='zoom' name='zoom'
list='zoomLevels' list='zoomLevels'
@@ -67,35 +67,35 @@ const ToolBar = ({ onZoomChange, currentPage, onPageChange, totalPages })=>{
<datalist id='zoomLevels'> <datalist id='zoomLevels'>
<option value='100' /> <option value='100' />
</datalist> </datalist>
</div>
<div className='tool'>
<button <button
id='zoom-in'
className='tool'
onClick={()=>handleZoomChange(20)} onClick={()=>handleZoomChange(20)}
disabled={zoomLevel >= MAX_ZOOM} disabled={zoomLevel >= MAX_ZOOM}
> >
<i className='fas fa-magnifying-glass-plus' /> <i className='fas fa-magnifying-glass-plus' />
</button> </button>
</div> </div>
</div>
<div className='group'> <div className='group'>
<div className='tool'>
<button <button
className='previousPage' id='previous-page'
className='previousPage tool'
onClick={()=>scrollToPage(pageInput - 1)} onClick={()=>scrollToPage(pageInput - 1)}
disabled={pageInput <= 1} disabled={pageInput <= 1}
> >
<i className='fas fa-arrow-left'></i> <i className='fas fa-arrow-left'></i>
</button> </button>
</div>
<div className='tool'>
<input <input
id='page-input'
class='text-input'
type='text' type='text'
name='page' name='page'
inputMode='numeric' inputMode='numeric'
pattern='[0-9]' pattern='[0-9]'
id='pageInput'
value={pageInput} value={pageInput}
onChange={(e)=>{ onChange={(e)=>{
handlePageChange(e.target.value == false ? e.target.value : parseInt(e.target.value));}} handlePageChange(e.target.value == false ? e.target.value : parseInt(e.target.value));}}
@@ -104,11 +104,12 @@ const ToolBar = ({ onZoomChange, currentPage, onPageChange, totalPages })=>{
/> />
<span id='page-count'>/ {totalPages}</span> <span id='page-count'>/ {totalPages}</span>
</div>
<div className='tool'>
<button <button
className='nextPage' id='next-page'
// onClick={()=>{setPageInput((pageInput)=>parseInt(pageInput) + 1)}} className='tool'
onClick={()=>scrollToPage(pageInput + 1)} onClick={()=>scrollToPage(pageInput + 1)}
disabled={pageInput >= totalPages} disabled={pageInput >= totalPages}
> >
@@ -116,7 +117,6 @@ const ToolBar = ({ onZoomChange, currentPage, onPageChange, totalPages })=>{
</button> </button>
</div> </div>
</div> </div>
</div>
); );
}; };

View File

@@ -16,12 +16,18 @@
.group { .group {
display : flex; display : flex;
gap: 0 3px;
align-items : center; align-items : center;
justify-content : center; justify-content : center;
box-sizing : border-box; box-sizing : border-box;
height: 28px; height: 28px;
} }
.tool {
display: flex;
align-items: center;
}
input { input {
position : relative; position : relative;
height : 1.5em; height : 1.5em;
@@ -32,7 +38,8 @@
border : 1px solid gray; border : 1px solid gray;
&:focus { outline : 1px solid #d3d3d3; } &:focus { outline : 1px solid #d3d3d3; }
&.slider { // `.range-input` if generic to all range inputs, or `#zoom-input` if only for zoom slider
&.range-input {
color: #D3D3D3; color: #D3D3D3;
accent-color: #d3d3d3; accent-color: #d3d3d3;
padding: 2px 0; padding: 2px 0;
@@ -61,7 +68,8 @@
} }
} }
&#pageInput { // `.text-input` if generic to all range inputs, or `#page-input` if only for current page input
&#page-input {
width: 4ch; width: 4ch;
text-align: center; text-align: center;
margin-right: 1ch; margin-right: 1ch;
@@ -70,17 +78,11 @@
} }
.tool {
display : flex;
align-items : center;
padding : 0;
height: 100%;
width: auto;
box-sizing: content-box;
&:hover { background-color : #444444; }
button { button {
display : flex;
align-items : center;
justify-content: center;
height : 100%; height : 100%;
width : auto; width : auto;
min-width : 46px; min-width : 46px;
@@ -88,6 +90,9 @@
font-weight : unset; font-weight : unset;
color : inherit; color : inherit;
background-color : unset; background-color : unset;
box-sizing: content-box;
&:hover { background-color : #444444; }
&:focus { outline : 1px solid #d3d3d3; } &:focus { outline : 1px solid #d3d3d3; }
@@ -97,4 +102,3 @@
} }
} }
} }
}