Skip to content

Made more changes #9

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

Merged
merged 2 commits into from
Nov 8, 2023
Merged

Made more changes #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ab9914
added more codes
jen67 Nov 8, 2023
9a16222
made more changes
jen67 Nov 8, 2023
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
65 changes: 58 additions & 7 deletions tip-calculator-app-main/dist/css/main.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tip-calculator-app-main/dist/css/main.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 16 additions & 12 deletions tip-calculator-app-main/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<body>
<main>
<header>
<h1>SPILI <br> TTER</h1>
<h1>SPLI <br> TTER</h1>
</header>

<section class="bill-section">
Expand All @@ -39,28 +39,32 @@ <h3>Select Tip %</h3>

<div class="No-of-people">
<h4>Number of People</h4>
<div>
<div class="screen">
<img src="./images/icon-person.svg" alt="person icon">
<p>5</p>
</div>
</div>
</div>

<div class="green-background">
<div>
<div>
<h5>Tip Amount</h5>
<span>/ person</span>
<div class="Tip">
<div class="Tip-amount">
<div class="flex-items">
<h5>Tip Amount</h5>
<span>/ person</span>
</div>
</div>
<div>$0.00</div>
<div class="price" id="price">$0.00</div>
</div>

<div>
<div>
<h5>Total</h5>
<span>/ person</span>
<div class="Tip">
<div class="Tip-total">
<div class="flex-items">
<h5>Total</h5>
<span>/ person</span>
</div>
</div>
<div>$0.00</div>
<div class="price" id="price">$0.00</div>
</div>

<button>RESET</button>
Expand Down
82 changes: 74 additions & 8 deletions tip-calculator-app-main/src/scss/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ body {
justify-content: center;
min-height: 100vh;
background-color: $Light-grayish-cyan;
padding: 0 0.4rem;
}

header {
Expand All @@ -29,7 +30,7 @@ header {
section {
background-color: $white;
border-radius: 1rem;
padding: 1rem;
padding: 1rem 1.5rem 1.5rem;

.bill-section {
display: flex;
Expand All @@ -42,7 +43,7 @@ section {
.white-background {
h2 {
color: $Dark-grayish-cyan;
font-size: 0.7rem;
font-size: 1rem;
font-weight: 400;
letter-spacing: 0.04rem;
}
Expand All @@ -55,24 +56,24 @@ section {
background-color: $Very-light-grayish-cyan;
padding: 0.5rem 1rem;
margin: 0.4rem 0;
border-radius: 0.5rem;
border-radius: 0.3rem;
}

.screen p {
color: $Very-dark-cyan;
font-size: 0.7rem;
font-size: 1rem;
font-weight: 700;
letter-spacing: 0.04rem;
}

.screen img {
width: 8px;
width: 10px;
}

.amounts {
h3 {
color: $Dark-grayish-cyan;
font-size: 0.6rem;
font-size: 1rem;
font-weight: 400;
}

Expand All @@ -90,15 +91,80 @@ section {
padding: 0.5rem 1rem;
border-radius: 0.2rem;
text-align: center;
font-size: 0.8rem;
font-size: 1rem;
}

.custom{
background-color:$Very-light-grayish-cyan;
color:$Very-dark-cyan;
color:$Dark-grayish-cyan;
}
}
}


.No-of-people{
margin: 1rem 0;

h4{
font-size: 1rem;
color:$Dark-grayish-cyan;
}
}
}

.green-background{
display: flex;
flex-direction: column;
background-color: $Very-dark-cyan;
padding: 0 1rem;
border-radius: 0.3rem;

.Tip{
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;


.Tip-total, .Tip-amount{

margin-top: 1rem;
.flex-items{
display: flex;
flex-direction: column;

h5{
color:$Light-grayish-cyan;
}
}
}
.Tip-total span, .Tip-amount span{
font-size: 0.7rem;
color: $Grayish-cyan;
margin-top: -0.1rem;
}

.price{
color: $Strong-cyan;
}


}

button{
background-color: $Strong-cyan;
color: $Very-dark-cyan;
border: none;
border-radius: 0.3rem;
padding: 0.5rem 0;
margin: 1rem 0;
font-size: 1rem;
font-weight: 700;
letter-spacing: 0.04rem;
cursor: pointer;

}

}
}

Expand Down