Skip to content

Commit

Permalink
updated icons
Browse files Browse the repository at this point in the history
  • Loading branch information
ilovehotcakes committed Jun 8, 2024
1 parent 67fa309 commit dee170f
Show file tree
Hide file tree
Showing 14 changed files with 1,226 additions and 94 deletions.
Binary file modified src/frontend/img/icon_back_100x100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/frontend/img/icon_backward_100x100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/frontend/img/icon_close_100x100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/frontend/img/icon_dropdown_100x100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/frontend/img/icon_forward_100x100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/frontend/img/icon_more_100x100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/frontend/img/icon_motor_100x100.png
Binary file not shown.
Binary file modified src/frontend/img/icon_open_100x100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/frontend/img/icon_stop_100x100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,134 changes: 1,134 additions & 0 deletions src/frontend/img/icons.ai

Large diffs are not rendered by default.

Binary file not shown.
79 changes: 40 additions & 39 deletions src/frontend/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,24 @@ body {
background-color: rgb(50, 50, 50);
overflow: hidden;
}
h2 {
margin: 0;
font-size: 1.4em;
}
h3 {
margin: 0;
font-size: 1.25em;
font-weight: 500;
}
h4 {
margin: 0;
color: rgb(245,245,245);
}
h5 {
margin: 0;
font-size: 0.7em;
font-weight: 500;
}
@property --hue1 {
syntax: '<integer>';
inherits: false;
Expand Down Expand Up @@ -87,24 +105,6 @@ body {
--hue8: 352;
}
}
h2 {
margin: 0;
font-size: 1.4em;
}
h3 {
margin: 0;
font-size: 1.2em;
font-weight: 500;
}
h4 {
margin: 0;
color: rgb(245,245,245);
}
h5 {
margin: 0;
font-size: 0.7em;
font-weight: 500;
}



Expand Down Expand Up @@ -187,13 +187,13 @@ h5 {
}
.name-txt {
position: absolute;
top: 10%;
left: 8%;
top: 9%;
left: 7%;
}
.serial-txt {
position: absolute;
top: 53%;
left: 8%;
top: 54%;
left: 7%;
color: rgb(200, 200, 200);
}
.percent-slider {
Expand Down Expand Up @@ -345,7 +345,7 @@ input[type="range"]:hover ~ .hundred-mkr {
background-size: 2.4rem;
}
.stop-btn {
left: 43%;
left: 43.5%;
background-image: url(./img/icon_stop_100x100.png);
}
.close-btn {
Expand Down Expand Up @@ -379,7 +379,7 @@ input[type="range"]:hover ~ .hundred-mkr {
.advanced-controls-dropdown {
position: absolute;
top: 6%;
left: 73.4%;
left: 73.5%;
width: 8%;
height: 52.1%;
}
Expand All @@ -397,7 +397,7 @@ input[type="range"]:hover ~ .hundred-mkr {
background-repeat: no-repeat;
background-position: center;
transform: rotate(180deg);
transition: 0.2s;
transition: 0.1s linear;
}
input:checked + .dropdown-cbx::before {
background-color: rgba(122, 122, 122, 0.582);
Expand All @@ -409,7 +409,7 @@ input[type="checkbox"], input[type="range"] {
-moz-appearance: none;
}
.more-settings-cbx::before {
background-size: 64%;
background-size: 80%;
background-image: url(./img/icon_more_100x100.png);
transform: none;
}
Expand All @@ -421,20 +421,27 @@ input[type="checkbox"], input[type="range"] {
top: 2%;
height: 6%;
}
.back-arrow {
.back-btn {
position: absolute;
top: 24%;
left: -1.5%;
width: 5.5%;
height: 50%;
top: 15%;
left: 0;
height: 72%;
width: 8%;
padding: 0;
content: '';
border-radius: 3em;
background-size: 1.3em;
background-position: center;
background-image: url(./img/icon_back_100x100.png);
background-color: rgba(172, 172, 172, 0.548);
background-repeat: no-repeat;
background-position: center;
border: none;
transition: 0.2s;
}
.settings-header-txt {
position: absolute;
top: 7%;
left: 26%;
left: 27%;
font-weight: 500;
}
.four-settings {
Expand Down Expand Up @@ -615,12 +622,6 @@ input:checked + .toggle-cbx::before {
.form-btn:active {
color: rgb(31, 105, 216);
}
.back-btn {
position: absolute;
top: 11%;
left: 3.5%;
cursor: pointer;
}
.dialog-title-txt {
font-size: 1.1em;
color: rgb(255, 255, 255);
Expand Down
8 changes: 3 additions & 5 deletions src/frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ <h3 class="more-settings-txt" style="top:23%;">System Settings</h3>
<!-- To display and change motor settings -->
<div id="motor_settings" class="default default-hide" style="border:none;">
<div class="settings-header container">
<div class="back-arrow" onclick="toggleSettings('motor_settings')"></div>
<button class="back-btn form-btn" onclick="toggleSettings('motor_settings')">Back</button>
<button class="back-btn clickable" onclick="toggleSettings('motor_settings')"></button>
<h2 class="settings-header-txt">Motor Settings</h2>
</div>

Expand Down Expand Up @@ -179,9 +178,8 @@ <h3 id="stallguard_threshold" class="setting-value-txt">10</h3>
<!-- To display and change system and wifi settings -->
<div id="system_settings" class="default default-hide" style="border:none;">
<div class="settings-header container">
<div class="back-arrow" onclick="toggleSettings('system_settings')"></div>
<button class="back-btn form-btn" onclick="toggleSettings('system_settings')">Back</button>
<h2 class="settings-header-txt">System Settings</h2>
<button class="back-btn clickable" onclick="toggleSettings('system_settings')"></button>
<h2 class="settings-header-txt" style="left:25%;">System Settings</h2>
</div>


Expand Down
99 changes: 49 additions & 50 deletions src/index.h

Large diffs are not rendered by default.

0 comments on commit dee170f

Please sign in to comment.