Skip to content

Homework done #6

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
Stef-Lev wants to merge 25 commits into
base: Stefanos-Leventis
Choose a base branch
from
Open

Homework done #6

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
047d357
Homework done
Stef-Lev Jan 14, 2020
c39774e
Update MAKEME.md
Stef-Lev Jan 15, 2020
3c2f67a
Update MAKEME.md
Stef-Lev Jan 15, 2020
4423f93
Add files via upload
Stef-Lev Jan 15, 2020
c05cf61
Add files via upload
Stef-Lev Jan 15, 2020
c1d9588
Delete index.html
Stef-Lev Jan 15, 2020
7270f62
Delete main.js
Stef-Lev Jan 15, 2020
66a7872
Delete style.css
Stef-Lev Jan 15, 2020
3c51e93
Add files via upload
Stef-Lev Jan 15, 2020
c63dd12
Delete index.html
Stef-Lev Jan 15, 2020
6bb8168
Delete main.js
Stef-Lev Jan 15, 2020
067af8e
Delete style.css
Stef-Lev Jan 15, 2020
b6266fa
Add files via upload
Stef-Lev Jan 15, 2020
3ff4d94
Recloning
Stef-Lev Jan 15, 2020
226bcf3
Created files
Stef-Lev Jan 17, 2020
23ad693
Files added
Stef-Lev Jan 17, 2020
7cc54ba
Only exercise left
Stef-Lev Jan 22, 2020
53a596d
Update style.css
Stef-Lev Jan 22, 2020
e3340c4
Temperature converter added
Stef-Lev Jan 22, 2020
cb8867f
Merge branch 'master' of https://github.com/Stef-Lev/JavaScript1
Stef-Lev Jan 22, 2020
a1e06f2
new files added
Stef-Lev Jan 24, 2020
75aeb9d
Project 2 ready
Stef-Lev Jan 25, 2020
97ef941
Week2 Finished
Stef-Lev Jan 26, 2020
ebec922
meditation app finished
Stef-Lev Jan 26, 2020
1e424c7
Javascript1 homework and projects completed
Stef-Lev Jan 27, 2020
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
Prev Previous commit
Next Next commit
Add files via upload
  • Loading branch information
@Stef-Lev
Stef-Lev authored Jan 15, 2020
commit c05cf61758a019c03c7e56712ee87f20dfdac046
3 changes: 0 additions & 3 deletions Week1/homework/calculatorCodeAlong/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,4 @@ deleteButton.addEventListener("click", button => {
calculator.delete()
calculator.updateDisplay()
})
<<<<<<< HEAD

=======
>>>>>>> 3c2f67a1b7e7d5606cf6b90c8fbc3b7f31fd2bdd
37 changes: 0 additions & 37 deletions Week1/homework/calculatorCodeAlong/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ body {

div.background{
background-color:#55818D;
<<<<<<< HEAD
width: 290px;
min-height:500px;
position: center;
Expand All @@ -23,28 +22,12 @@ div.background{
}
div.screen {
width:300px;
=======
width: 380px;
min-height:620px;
position: center;
margin-top: 120px;
border-radius: 5%;
padding-top: 25px;
padding-bottom: 25px;
}
div.screen {
width:344px;
>>>>>>> 3c2f67a1b7e7d5606cf6b90c8fbc3b7f31fd2bdd
min-height: 120px;
max-height: 160px;
background-color: rgba(0,0,0,0.9);
border: 1px solid black;
font-family: 'Orbitron', sans-serif;
<<<<<<< HEAD
letter-spacing:2px;
=======
letter-spacing:3px;
>>>>>>> 3c2f67a1b7e7d5606cf6b90c8fbc3b7f31fd2bdd
text-align: right;
display: flex;
align-items: flex-end;
Expand All @@ -58,7 +41,6 @@ div.screen {
}
div.previous-operand {
color: rgba(255,255,255,0.6);
<<<<<<< HEAD
font-size: 1.2rem;
}
div.current-operand {
Expand All @@ -72,21 +54,6 @@ button {
background-color: #172027!important;
font-family: 'Montserrat', sans-serif;
font-size: 1.4rem!important;
=======
font-size: 1.4rem;
}
div.current-operand {
color: white;
font-size: 2.4rem;
}

button {
width:80px;
height:80px;
background-color: #172027!important;
font-family: 'Montserrat', sans-serif;
font-size: 1.8rem!important;
>>>>>>> 3c2f67a1b7e7d5606cf6b90c8fbc3b7f31fd2bdd
font-weight: bolder!important;
}
button:hover {
Expand All @@ -113,11 +80,7 @@ button.equals:active {
}
button.clear {
color: rgb(236, 60, 60);
<<<<<<< HEAD
width: 128px;
=======
width: 168px;
>>>>>>> 3c2f67a1b7e7d5606cf6b90c8fbc3b7f31fd2bdd
}
button.clear:hover{
color: rgb(250, 86, 86);
Expand Down