Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.

Commit 8e6d9ac

Browse files
committed
[UI] Allign to red line
1 parent f50af3a commit 8e6d9ac

File tree

2 files changed

+40
-25
lines changed

2 files changed

+40
-25
lines changed

src/component/helpOverlay/helpOverlay.css

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
display: flex;
2323
flex-direction: column;
2424
position: absolute;
25-
width: 700px;
26-
height: 486px;
25+
width: 720px;
26+
height: 500px;
2727
margin: -243px 0 0 -350px;
2828
top: 50%;
2929
left: 50%;
@@ -70,12 +70,16 @@
7070
.step-label {
7171
flex: 2;
7272
color: white;
73+
font-family: 'Segoe UI';
74+
font-size: 15px;
75+
line-height: 20px;
7376
}
7477

7578
.close-button {
7679
flex: 1;
7780
font-size: 25px;
7881
text-align: center;
82+
align-self: center;
7983
color: white;
8084
}
8185

@@ -84,25 +88,31 @@
8488
}
8589

8690
.content {
87-
flex: 5;
91+
flex: 9;
8892
display: flex;
8993
flex-direction: row;
90-
padding: 0 30px;
9194
}
9295

9396
.text-instruction {
94-
flex: 5;
97+
flex: 6;
9598
display: flex;
9699
flex-direction: column;
100+
justify-content: flex-start;
101+
padding: 80px 30px;
97102
}
98103

99104
.text-instruction-title {
100-
flex: 1;
101-
font-size: 17px;
105+
flex: 2;
106+
font-family: 'Segoe UI';
107+
font-weight: 300;
108+
color: #333333;
109+
line-height: 27px;
110+
font-size: 20px;
111+
margin-bottom: 20px
102112
}
103113

104114
.text-instruction-description {
105-
flex: 3;
115+
flex: 6;
106116
display: flex;
107117
overflow: hidden;
108118
}
@@ -114,13 +124,17 @@
114124
}
115125

116126
.paragraph {
117-
margin-bottom: 20px;
127+
padding-bottom: 10px;
118128
transition: 0.5s all ease;
119129
font-weight: 400;
130+
font-family: 'Segoe UI';
131+
color: #333333;
132+
font-size: 15px;
133+
line-height: 20px;
120134
}
121135

122136
.paragraph-selected {
123-
font-weight: 500;
137+
color: #000000;
124138
}
125139

126140
.paragraph-scrollbar {
@@ -149,6 +163,7 @@
149163
flex-direction: column;
150164
align-items: center;
151165
justify-content: center;
166+
padding: 80px 30px;
152167
}
153168

154169
.picture-container {
@@ -188,10 +203,13 @@
188203
}
189204

190205
.operation {
191-
flex: 2;
206+
flex: 1;
192207
display: flex;
193208
align-items: center;
194-
margin-left: 30px;
209+
font-family: 'Segoe UI';
210+
font-size: 15px;
211+
line-height: 20px;
212+
margin-top: 30px;
195213
}
196214

197215
.operation-button-1 {
@@ -210,12 +228,12 @@
210228
.operation-button-2 {
211229
display: inline-block;
212230
padding: 4px 30px;
213-
background-color: rgb(0,120,215);
231+
background-color: #0078d7;
214232
color: white;
215233
}
216234

217235
.operation-button-2:hover {
218-
background-color: #2497f2;
236+
background-color: #0063b1;
219237
}
220238

221239
.space-1 {

src/component/helpOverlay/helpOverlay.js

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ class HelpOverlay extends Component {
127127
×
128128
</div>
129129
</div>
130-
<div className="space-2" />
131130
<div className="content">
132131
<div onWheel={this.changeSubStep} className="text-instruction">
133132
<div className="text-instruction-title">
@@ -177,6 +176,14 @@ class HelpOverlay extends Component {
177176
<div className={`scrollbar-indicator ${this.state.numOfSubStep[this.state.step] <= 2 ? 'element-none':''} ${this.state.subStep === 2 ? 'scrollbar-indicator-selected':''}`}/>
178177
</div>
179178
</div>
179+
<div className="operation">
180+
<div className={`operation-button-1 ${this.state.step === 0 ? 'element-none':''}`} onClick={this.prevStep}>
181+
Back
182+
</div>
183+
<div className="operation-button-2" onClick={this.nextStep}>
184+
{this.state.step === this.state.numOfSteps - 1 ? "Got it" : "Next"}
185+
</div>
186+
</div>
180187
</div>
181188
<div onWheel={this.changeSubStep} className="picture-instruction">
182189
<div className={`picture-container ${this.state.step === 0 ? '':'element-none'}`} >
@@ -198,16 +205,6 @@ class HelpOverlay extends Component {
198205
</div>
199206
</div>
200207
</div>
201-
<div className="operation">
202-
<div className={`operation-button-1 ${this.state.step === 0 ? 'element-none':''}`} onClick={this.prevStep}>
203-
Back
204-
</div>
205-
<div className="operation-button-2" onClick={this.nextStep}>
206-
{this.state.step === this.state.numOfSteps - 1 ? "Got it" : "Next"}
207-
</div>
208-
</div>
209-
<div className="space-1" onClick={this.testscroll} />
210-
211208
</div>
212209
</div>
213210
);

0 commit comments

Comments
 (0)