Octavia/odin-calculator
Watch
1
0
Fork
You've already forked odin-calculator
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bring back style and function changes

Browse source
This commit is contained in:
lolabird 2023-12-29 14:43:51 -07:00
commit 56e90f4ec0
2 changed files with 6 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
script.js
View file

@ -173,7 +173,7 @@ function Calculator(str) {
if ((a || a == "0") && !op && !b) { if ((a || a == "0") && !op && !b) {
return a; return formatResult(a);
} }
if (isNaN(a) || isNaN(b)) { if (isNaN(a) || isNaN(b)) {
return NaN; return NaN;

38
style.css
View file

@ -6,11 +6,6 @@
url("./fonts/SixteenSegments.ttf") format("truetype") url("./fonts/SixteenSegments.ttf") format("truetype")
} }
/* * {
box-sizing: border-box;
} */
html { html {
--digi-green: #79ff54; --digi-green: #79ff54;
--dark-green: #094909; --dark-green: #094909;
@ -38,7 +33,6 @@ header {
flex: 0 0 auto; flex: 0 0 auto;
padding: 15px 0; padding: 15px 0;
background-color: var(--dark-trans); background-color: var(--dark-trans);
max-width: 100%;
} }
header h1 { header h1 {
@ -87,20 +81,20 @@ main {
.top-screen { .top-screen {
height: 40%; height: 40%;
font-size: 30px; font-size: 30px;
max-width: 100%; max-width: 415px;
overflow: hidden; overflow: hidden;
} }
.main-screen { .main-screen {
height: 60%; height: 60%;
font-size: 70px; font-size: 70px;
max-width: 100%; max-width: 415px;
overflow: hidden; overflow: hidden;
} }
button { button {
font-family: "Fira Sans", sans-serif; font-family: "Fira Sans", sans-serif;
height: 100%; height: 100px;
width: 100%; width: 100px;
font-size: 50px; font-size: 50px;
text-align: center; text-align: center;
border-color: var(--light-text); border-color: var(--light-text);
@ -169,7 +163,7 @@ button:active, .active {
.equal { .equal {
grid-column: span 2; grid-column: span 2;
width: 100%; width: 205px;
background-color: var(--digi-green); background-color: var(--digi-green);
} }
@ -178,7 +172,6 @@ footer {
padding: 10px; padding: 10px;
background-color: var(--dark-trans); background-color: var(--dark-trans);
letter-spacing: 2px; letter-spacing: 2px;
max-width: 100%;
} }
footer a { footer a {
@ -189,25 +182,4 @@ footer a:hover, footer a:focus {
color: rgb(170, 255, 0); color: rgb(170, 255, 0);
text-decoration: none; text-decoration: none;
margin: 0; margin: 0;
}
@media only screen and (max-width: 600px) {
header h1 {
font-size: 50px;
}
.calculator {
max-width: 90vw;
height: 70%;
}
.main-screen {
font-size: 45px;
word-wrap: break-word;
}
button {
font-size: 40px;
}
} }