Skip to content

Commit 25a524c

Browse files
authored
Merge pull request #428 from fablabbcn/monolith-onboarding
Monolith onboarding
2 parents e813c66 + 55bfbe0 commit 25a524c

36 files changed

Lines changed: 815 additions & 61 deletions

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ gem 'sinatra'
6868
#gem 'skylight'
6969
gem 'stamp'
7070
gem "treetop"
71-
gem 'versionist', github: 'bploetz/versionist'
71+
gem 'versionist'
7272
gem 'webrick'
7373
gem 'workflow'
7474
gem 'workflow-activerecord'

Gemfile.lock

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
GIT
2-
remote: https://github.com/bploetz/versionist.git
3-
revision: 80b09ce472c0661d3994eeede17b96feb636a17e
4-
specs:
5-
versionist (2.0.1)
6-
activesupport (>= 3)
7-
railties (>= 3)
8-
yard (~> 0.9.20)
9-
101
GIT
112
remote: https://github.com/presidentbeef/brakeman.git
123
revision: 6af53c63feb909d19bab970aedb3b0c583073eb6
@@ -567,6 +558,10 @@ GEM
567558
unicode-display_width (1.8.0)
568559
vcr (6.1.0)
569560
version_gem (1.1.2)
561+
versionist (2.0.1)
562+
activesupport (>= 3)
563+
railties (>= 3)
564+
yard (~> 0.9.20)
570565
webmock (3.18.1)
571566
addressable (>= 2.8.0)
572567
crack (>= 0.3.2)
@@ -681,7 +676,7 @@ DEPENDENCIES
681676
turbolinks
682677
uglifier
683678
vcr
684-
versionist!
679+
versionist
685680
webmock
686681
webpacker
687682
webrick

app/assets/images/arrow_down.svg

Lines changed: 1 addition & 0 deletions
Loading

app/assets/images/arrow_right.svg

Lines changed: 1 addition & 0 deletions
Loading

app/assets/images/sckit_1.png

-269 KB
Loading

app/assets/images/sckit_2.png

-3.99 MB
Loading

app/assets/stylesheets/application.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@
3232
@import "components/devices_typeahead";
3333
@import "components/extra_info";
3434
@import "components/blurable";
35+
@import "components/onboarding_device";

app/assets/stylesheets/components/devices_typeahead.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.devices-typeahead {
22
.devices-list {
3-
border-radius: 2rem !important;
3+
border-radius: 0.5rem !important;
44
.device-select-list-item:last-child {
55
border-bottom: none !important;
66
}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
@keyframes blink {
2+
0%, 100% { background-color: transparent; }
3+
50% { background-color: $black; }
4+
}
5+
6+
.onboarding-device {
7+
.progress-dot {
8+
transition: border-color,background-color 0.15s ease-in-out;
9+
border: $white 2px solid;
10+
border-radius: 0.5rem;
11+
height: 1rem;
12+
&.dot-1 {
13+
background-color: $white;
14+
}
15+
width: 1rem;
16+
}
17+
a:hover .progress-dot {
18+
border-color: $black;
19+
}
20+
21+
a:hover .progress-dot.dot-1 {
22+
background-color: $black;
23+
}
24+
25+
.step-2 {
26+
.progress-dot {
27+
border-color: $black;
28+
&.dot-1 {
29+
background-color: $black;
30+
}
31+
&.dot-2 {
32+
animation: blink 2s ease-in-out infinite;
33+
}
34+
}
35+
36+
}
37+
.step-3 .progress-dot {
38+
background-color: $black !important;
39+
animation: none !important;
40+
}
41+
42+
}

app/assets/stylesheets/global.scss

Lines changed: 56 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
h1, h2, h3, h4, h5, h6 {
22
text-transform: uppercase;
33
letter-spacing: 0.0325rem;
4+
text-decoration: none;
45
}
56

67

@@ -26,10 +27,37 @@ body{
2627
color: $black;
2728
}
2829

30+
.bg-primary {
31+
::selection {
32+
background-color: $black !important;
33+
color: $white !important;
34+
}
35+
}
36+
2937
body > .container {
3038
flex-grow: 1;
3139
}
3240

41+
.bg-primary {
42+
background-color: $yellow !important;
43+
}
44+
45+
.bg-danger {
46+
background-color: $red !important;
47+
}
48+
49+
.bg-success {
50+
background-color: $green !important;
51+
}
52+
53+
.bg-optional {
54+
background-color: $grey-200 !important;
55+
}
56+
57+
code {
58+
color: $black !important;
59+
}
60+
3361
.border-medium {
3462
border-width: 2px !important;
3563
}
@@ -143,11 +171,11 @@ body > .container {
143171
}
144172

145173
.form-control, .form-select {
146-
border-radius: 2rem;
174+
border-radius: 0.5rem;
147175
.input-group-lg & {
148-
border-radius: 2rem;
176+
border-radius: 0.5rem;
149177
}
150-
padding: 0.75rem 1.5rem;
178+
padding: 0.75rem 0.75rem;
151179
border-width: 2px;
152180
&:focus {
153181
outline: $primary solid 3px;
@@ -156,14 +184,14 @@ body > .container {
156184
box-shadow:inset 0px 0px 0px 1px $black
157185
}
158186
&.dropdown {
159-
padding: 0.75rem 1.5rem 0.75rem 0.75rem;
187+
padding: 0.75rem 0.75rem 0.75rem 0.75rem;
160188
}
161189
}
162190

163191
.form-check {
164192
padding-left: 0;
165193
.form-check-input {
166-
margin-left: 1rem;
194+
margin-left: 0;
167195
border-radius: 0.33rem;
168196
float: none;
169197
margin-right: 0.5rem;
@@ -209,11 +237,11 @@ input[type="file"] {
209237
}
210238

211239
.form-label {
212-
margin-left: 1rem;
240+
margin-left: 0.5rem;
213241
}
214242

215243
.form-text {
216-
margin-left: 1rem;
244+
margin-left: 0.5rem;
217245
}
218246

219247
.form-check-label {
@@ -228,7 +256,7 @@ input[type="file"] {
228256
margin-left: 1rem;
229257
}
230258

231-
.danger {
259+
.danger, .text-red {
232260
color: $red;
233261
}
234262

@@ -259,6 +287,14 @@ input[type="file"] {
259287
}
260288
}
261289

290+
.link-discreet {
291+
color: $black !important;
292+
text-decoration: none !important;
293+
&:hover {
294+
text-decoration: underline !important;
295+
}
296+
}
297+
262298
.inline-list {
263299
margin: 0;
264300
padding: 0;
@@ -365,3 +401,15 @@ a.subtle-link {
365401
}
366402
}
367403

404+
405+
textarea {
406+
resize: none;
407+
}
408+
409+
.focus-to-front:focus-within {
410+
z-index: 10;
411+
}
412+
413+
.no-hover-border:hover {
414+
border: none !important;
415+
}

0 commit comments

Comments
 (0)