Skip to content

Commit 3193814

Browse files
committed
Checking new interface
1 parent bba194e commit 3193814

File tree

2 files changed

+377
-204
lines changed

2 files changed

+377
-204
lines changed

Diff for: app/assets/stylesheets/new-capture.css

+185-72
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,3 @@
1-
/*.navbar-fixed-top .nav li {*/
2-
/* padding-top: 3px;*/
3-
/* font-family: junction, sans-serif;*/
4-
/*}*/
5-
/*#webcam-msg {*/
6-
/* position: absolute;*/
7-
/* z-index: 2;*/
8-
/* background: #777;*/
9-
/* color: #aaa;*/
10-
/* text-align: center;*/
11-
/* height: 240px;*/
12-
/* width: 320px;*/
13-
/* font-size: 14px;*/
14-
/*}*/
15-
/*a {*/
16-
/* color: #0af;*/
17-
/*}*/
18-
/*#webcam-msg p {*/
19-
/* padding: 80px 20px;*/
20-
/*}*/
21-
/*#webcam {*/
22-
/* position: absolute;*/
23-
/* z-index: 1;*/
24-
/*}*/
25-
/*#header.navbar-inner {*/
26-
/* margin-right: -40px;*/
27-
/*}*/
28-
291
html {
302
display: block;
313
width: 100%;
@@ -41,10 +13,11 @@ body {
4113
.full-strecth-block {
4214
display: block;
4315
width: 100%;
44-
height: 100%;
16+
height: auto;
4517
}
4618

4719
div.full-strecth-flex-vertical.content, div.full-strecth-flex-vertical {
20+
padding-top: 8rem;
4821
display: flex;
4922
flex-direction: column;
5023
width: 100%;
@@ -58,6 +31,37 @@ div.full-strecth-flex-horizontal {
5831
height: 100%;
5932
}
6033

34+
div#capture-phase-right {
35+
background-color: #353535;
36+
height: fit-content;
37+
box-shadow: 1px 1px 11px 2px #151515;
38+
border-radius: 5px;
39+
}
40+
41+
div#canvas-prev-responsive {
42+
background-color: #353535;
43+
height: fit-content;
44+
box-shadow: 1px 1px 11px 2px #151515;
45+
border-radius: 5px;
46+
}
47+
48+
div#capture-phase-right {
49+
margin-left: 1.5rem;
50+
margin-right: 1.5rem;
51+
margin-top: 10rem;
52+
}
53+
54+
div#capture-settings {
55+
height: 100vh;
56+
width: 100%;
57+
}
58+
59+
60+
div#canvas-prev-responsive {
61+
margin-top: 1rem;
62+
margin-left: 1rem;
63+
}
64+
6165
.bs-stepper .content.dstepper-block {
6266
display: flex;
6367
flex-direction: column;
@@ -88,34 +92,6 @@ div.full-strecth-flex-horizontal {
8892
justify-content: center;
8993
}
9094

91-
.btn-group-justified {
92-
display: table;
93-
width: 100%;
94-
table-layout: fixed;
95-
border-collapse: separate;
96-
}
97-
98-
.btn-group-justified .btn, .btn-group-justified .btn-group {
99-
float: none;
100-
display: table-cell;
101-
width: 1%;
102-
}
103-
104-
.btn-group-justified .btn .btn, .btn-group-justified .btn-group .btn {
105-
width: 100%;
106-
}
107-
108-
.btn-group-justified .btn .dropdown-menu, .btn-group-justified .btn-group .dropdown-menu {
109-
left: auto;
110-
}
111-
112-
/*hr {*/
113-
/* border-color: #666;*/
114-
/*}*/
115-
116-
/*.modal {*/
117-
/* color: #333;*/
118-
/*}*/
11995
#graph {
12096
width: 1024px;
12197
height: 200px;
@@ -138,7 +114,7 @@ div.bs-stepper-content {
138114
}
139115

140116
.bs-stepper .content.fade.active, .bs-stepper-pane.fade.active {
141-
z-index: 90;
117+
z-index: 9999;
142118
}
143119

144120
.bs-stepper .line {
@@ -149,43 +125,146 @@ div.bs-stepper-content {
149125
color: #007bff;
150126
}
151127

128+
.navbar {
129+
border-radius: 0px;
130+
}
152131

132+
@media screen and (max-width: 350px), screen and (max-height: 570px) {
133+
body {
134+
font-size: 10px;
135+
}
136+
}
153137

154138
@media only screen and (max-width: 1200px) {
155139
#graph {
156140
width: 800px;
157141
}
142+
div#capture-settings {
143+
height: 100vh;
144+
}
158145
}
159146

160147
@media only screen and (max-width: 992px) {
148+
div#testnav {
149+
padding: 0rem;
150+
}
151+
161152
#graph {
162153
width: 650px;
163154
}
155+
156+
.full-strecth-block {
157+
padding-left: 0rem;
158+
padding-right: 0rem;
159+
}
160+
161+
.bs-stepper-header {
162+
margin: 0rem;
163+
}
164+
165+
div#capture-phase-right {
166+
margin-top: 10rem;
167+
}
168+
169+
div#capture-settings {
170+
height: 100vh;
171+
}
164172
}
165173

166-
@media only screen and (max-width: 760px) {
174+
@media only screen and (max-width: 767px) {
175+
div#testnav {
176+
padding: 0rem;
177+
}
178+
167179
#graph {
168180
width: 520px;
169181
}
182+
183+
.full-strecth-block {
184+
padding-left: 0rem;
185+
padding-right: 0rem;
186+
}
187+
170188
div#canvas-prev-responsive {
171189
display: none;
172190
}
173-
div#test-save-hide {
174-
display: none;
191+
192+
.bs-stepper-header {
193+
margin: 0rem;
194+
}
195+
196+
div#capture-phase-right {
197+
margin-top: 10rem;
198+
}
199+
200+
div#capture-settings {
201+
height: auto;
175202
}
176203
}
177204

178205
@media only screen and (max-width: 576px) {
206+
body {
207+
font-size: 10px;
208+
}
209+
210+
div#testnav {
211+
padding: 0rem;
212+
}
213+
179214
#graph {
180215
width: auto;
181216
}
217+
218+
.full-strecth-block {
219+
padding-left: 0rem;
220+
padding-right: 0rem;
221+
}
222+
223+
div#canvas-prev-responsive {
224+
display: none;
225+
}
226+
227+
.bs-stepper-header {
228+
margin: 0rem;
229+
}
230+
231+
div#capture-phase-right {
232+
margin-top: 10rem;
233+
}
234+
235+
div#capture-settings {
236+
height: 100vh;
237+
}
182238
}
183239

240+
@media screen and (min-height: 360px) and (max-height: 600px) {
241+
div#capture-settings {
242+
height: auto;
243+
}
244+
}
245+
246+
@media only screen and (max-width: 1000px) and (orientation:landscape) {
247+
div#capture-settings {
248+
height: auto;
249+
position: absolute;
250+
}
251+
}
252+
253+
@media (max-width: 767px) {
254+
.navbar-inner {
255+
margin-right: 0px !important;
256+
}
257+
258+
.navbar {
259+
margin-bottom: 0px;
260+
z-index: 9999;
261+
}
262+
}
184263

185264
/* Individual Component Style -------------------------------------------*/
186265

187266
#landing-page:before {
188-
background-image: url('./asset/landing-wallpaper.jpg');
267+
background-image: url('/images/landing-wallpaper.jpg');
189268
background-repeat: no-repeat;
190269
background-size: cover;
191270
background-position: center;
@@ -199,15 +278,29 @@ div.bs-stepper-content {
199278
z-index: -1;
200279
opacity: 0.3;
201280
}
281+
202282
#landing-page, #landing-page2 {
203283
justify-content: center;
204284
align-items: center;
205285
}
286+
206287
#landing-page-content {
207288
width: 100%;
208-
max-width: 100%;
289+
justify-content: space-around;
209290
text-align: center;
291+
align-items: center;
292+
padding: 5rem;
293+
margin: 0 auto;
294+
margin-top: 7rem;
295+
margin-bottom: 2rem;
296+
position: absolute;
297+
z-index: 100;
210298
}
299+
300+
#landing-page-content h1 {
301+
margin-top: 0px;
302+
}
303+
211304
#landing-page-content p {
212305
color: grey
213306
}
@@ -224,7 +317,7 @@ div.bs-stepper-content {
224317
align-items: center;
225318
padding: 0 25rem;
226319
margin: 0 auto;
227-
margin-top: 4rem;
320+
margin-top: 1rem;
228321
position: absolute;
229322
z-index: 100;
230323
}
@@ -234,7 +327,6 @@ div.bs-stepper-content {
234327
height: 0;
235328
}
236329

237-
238330
#webcam {
239331
position: relative;
240332
}
@@ -243,12 +335,17 @@ div.bs-stepper-content {
243335
text-align: center;
244336
}
245337

338+
.spectrum-example-vertical {
339+
text-align: center;
340+
}
341+
246342
#settings, #capture {
247343
background: #272727;
248344
color: #b7b7b7
249345
}
250346

251347
#capture .full-strecth-flex-horizontal {
348+
margin-top: 6rem;
252349
height: 60%;
253350
}
254351

@@ -269,8 +366,23 @@ div.bs-stepper-content {
269366
margin: 1rem
270367
}
271368

369+
div#capture-settings {
370+
background: #272727;
371+
color: #b7b7b7;
372+
position: absolute;
373+
top: 0;
374+
left: 0;
375+
}
376+
377+
div#capture-page-content {
378+
background: #272727;
379+
color: #b7b7b7;
380+
}
381+
272382
#capture-page-next {
273-
margin-top: 4rem
383+
margin:0 auto;
384+
display:block;
385+
margin-top: 2rem;
274386
}
275387

276388
#plotting > div:first-child {
@@ -289,14 +401,15 @@ div.bs-stepper-content {
289401
height: 300px !important;
290402
}
291403

292-
293404
.fade.in {
294405
opacity: 0;
295406
}
296407

408+
.navbar-inner {
409+
margin-right: 0px !important;
410+
}
297411

298-
299-
/* #setting {
300-
height: 100%;
301-
overflow: hidden;
302-
} */
412+
.navbar {
413+
margin-bottom: 0px;
414+
z-index: 9999;
415+
}

0 commit comments

Comments
 (0)