Skip to content

Commit 900c53a

Browse files
authored
Merge pull request #11 from jen67/develop
made some changes
2 parents f226022 + 8d63dd2 commit 900c53a

File tree

4 files changed

+45
-23
lines changed

4 files changed

+45
-23
lines changed

tip-calculator-app-main/dist/css/main.css

Lines changed: 17 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tip-calculator-app-main/dist/css/main.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tip-calculator-app-main/src/scss/main.scss

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ body {
1313
padding: 0 0.4rem;
1414
}
1515

16-
header {
16+
header {
1717
display: flex;
1818
flex-direction: column;
1919
align-items: center;
@@ -55,22 +55,20 @@ section {
5555
align-items: center;
5656
justify-content: space-between;
5757
background-color: $Very-light-grayish-cyan;
58-
padding: 0.5rem 1rem;
58+
padding: 1rem;
5959
margin: 0.4rem 0;
6060
border-radius: 0.3rem;
6161
}
6262

63-
.screen p {
64-
color: $Very-dark-cyan;
65-
font-size: 1rem;
66-
font-weight: 700;
67-
letter-spacing: 0.04rem;
68-
}
6963

7064
.screen img {
7165
width: 10px;
7266
}
7367

68+
.screen:hover{
69+
border: 1.5px solid $button-hover;
70+
}
71+
7472
.amounts {
7573
margin-top: 2rem;
7674

@@ -92,18 +90,29 @@ section {
9290

9391
background-color: $Very-dark-cyan;
9492
color: $white;
95-
padding: 0.5rem 1rem;
93+
padding:0.5rem 1rem;
9694
border-radius: 0.2rem;
9795
text-align: center;
98-
font-size: 1rem;
96+
font-size: 1.2rem;
97+
}
98+
div:hover{
99+
background-color: $button-hover;
100+
color: $Very-dark-cyan;
99101
}
100102

103+
104+
101105
.custom{
102106
background-color:$Very-light-grayish-cyan;
103107
color:$Dark-grayish-cyan;
104108
}
109+
110+
.custom:hover{
111+
background-color:transparent ;
112+
border: 2px solid $button-hover;
105113
}
106114
}
115+
}
107116

108117

109118
.No-of-people{
@@ -114,6 +123,8 @@ section {
114123
font-size: 1rem;
115124
color:$Dark-grayish-cyan;
116125
}
126+
127+
117128
}
118129
}
119130

@@ -169,12 +180,14 @@ section {
169180
cursor: pointer;
170181

171182
}
172-
183+
button:hover{
184+
background-color: $button-hover;
185+
}
173186
}
174187
}
175188

176189
footer{
177-
margin-top: 1rem;
190+
margin: 1rem 1rem 1.2rem;
178191
text-align: center;
179192
color: $Very-dark-cyan;
180193
letter-spacing: 0.04rem;

tip-calculator-app-main/src/scss/utils/_variables.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

2-
$Strong-cyan: hsl(172, 67%, 45%);
2+
$Strong-cyan: hsl(172, 67%, 45%);
3+
$button-hover: hsl(173, 61%, 77%);
34
$Very-dark-cyan: hsl(183, 100%, 15%);
45
$Dark-grayish-cyan: hsl(186, 14%, 43%);
56
$Grayish-cyan: hsl(184, 14%, 56%);

0 commit comments

Comments
 (0)