Skip to content

Updated functionality and CSS #11

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
Piyush-203 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Updated functionality and CSS #11

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
25 changes: 24 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,30 @@ <h1>CalcMate - Your Open-Source Calculator</h1>
<button onclick="appendToDisplay('%')" class="operator">%</button>
<button onclick="appendToDisplay('+')" class="operator">+</button>
<button onclick="calculateResult()" class="operator">=</button>
<!--Hello World-->
<button onclick="shiftMode()" class="mode">Mode1</button>
</div>

<div class="buttons2">
<button onclick="clearDisplay()" class="operator">C</button>
<button onclick="appendToDisplay(9)">9</button>
<button onclick="appendToDisplay(8)">8</button>
<button onclick="backspace()"><i class="fa-solid fa-delete-left"></i></button>
<button onclick="appendToDisplay('Math.sqrt(')" class="operator">√</button>
<button onclick="appendToDisplay(7)">7</button>
<button onclick="appendToDisplay(6)">6</button>
<button onclick="appendToDisplay(5)">5</button>
<button onclick="appendToDisplay('Math.sin(')" class="operator">sin</button>
<button onclick="appendToDisplay(4)">4</button>
<button onclick="appendToDisplay(3)">3</button>
<button onclick="appendToDisplay(2)">2</button>
<button onclick="appendToDisplay('Math.cos(')" class="operator">cos</button>
<button onclick="appendToDisplay(',')">,</button>
<button onclick="appendToDisplay('(')">(</button>
<button onclick="appendToDisplay(')')">)</button>
<button onclick="appendToDisplay('Math.tan(')" class="operator">tan</button>
<button onclick="appendToDisplay('Math.pow(')" class="operator">^</button>
<button onclick="calculateResult()" class="operator">=</button>
<button onclick="shiftMode()" class="mode">Mode2</button>
</div>
</div>
</div>
Expand Down
13 changes: 13 additions & 0 deletions script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,16 @@ function calculateResult() {
document.getElementById('display').value = 'Error';
}
}

// Mode shift
let shiftOn = 0;
function shiftMode() {
if (shiftOn == 0){
document.querySelector('.buttons2').style.display = "grid";
document.querySelector('.buttons').style.display = "none";
shiftOn = 1;
}else{
document.querySelector('.buttons2').style.display = "none";
document.querySelector('.buttons').style.display = "grid";
shiftOn = 0;}
}
20 changes: 16 additions & 4 deletions styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ body {
}

.container {
background: rgba(255, 255, 255, 0.1);
background: rgba(30, 29, 29, 0.051);
backdrop-filter: blur(10px);
border-radius: 10px;
padding: 20px;
width: 55%;
text-align: center;
box-shadow: 10px 10px 15px #2d2727,
-5px -5px 15px #fcf9f9;
}

h1 {
Expand All @@ -27,23 +30,32 @@ h1 {
}



input {
width: 100%;
height: 40px;
height: 45px;
font-size: 1.5em;
color: #0e0a0a;
margin-bottom: 2rem;
border: none;
outline: none;
}

.buttons {
.screen #display{
text-align: right ;
padding-right: 0.3em;
box-shadow: inset 4px 4px 5px #2d2727,
inset -4px -4px 5px #fcf9f9 ;
}
.buttons, .buttons2 {
display: grid;
grid-template-columns: repeat(4, 1fr);
grid-column-gap: 10px;
grid-row-gap: 15px;
}

.buttons2{
display: none;
}
button {
width: 100%;
border: none;
Expand Down