Skip to content

Commit c14d63c

Browse files
vdvibhu20vdvibhu20
committed
Merge branch 'master' of https://github.com/coding-blocks/motley into nav-image-circle
2 parents 6ab0b29 + dfd1e2f commit c14d63c

39 files changed

+512
-357
lines changed

‎examples/views/about-course.hbs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@
444444

445445
<div class="grid row">
446446
<div class="card-layout col-lg-3 col-md-4 col-sm-6">
447-
<div class="card my-course o-layout-card ">
447+
<div class="card o-run-card o-layout-card ">
448448
<div class="card-heading o-text-card">
449449
MARCH' 18
450450
</div>
@@ -492,7 +492,7 @@
492492
</div>
493493
</div>
494494
<div class="card-layout col-lg-3 col-md-4 col-sm-6">
495-
<div class="card my-course o-layout-card ">
495+
<div class="card o-run-card o-layout-card ">
496496
<div class="card-heading o-text-card">
497497
MARCH' 18
498498
</div>
@@ -540,7 +540,7 @@
540540
</div>
541541
</div>
542542
<div class="card-layout col-lg-3 col-md-4 col-sm-6">
543-
<div class="card my-course o-layout-card ">
543+
<div class="card o-run-card o-layout-card ">
544544
<div class="card-heading o-text-card">
545545
MARCH' 18
546546
</div>
@@ -588,7 +588,7 @@
588588
</div>
589589
</div>
590590
<div class="card-layout col-lg-3 col-md-4 col-sm-6">
591-
<div class="card my-course o-layout-card ">
591+
<div class="card o-run-card o-layout-card ">
592592
<div class="card-heading o-text-card">
593593
MARCH' 18
594594
</div>
@@ -636,7 +636,7 @@
636636
</div>
637637
</div>
638638
<div class="card-layout col-lg-3 col-md-4 col-sm-6">
639-
<div class="card my-course o-layout-card ">
639+
<div class="card o-run-card o-layout-card ">
640640
<div class="card-heading o-text-card">
641641
MARCH' 18
642642
</div>

‎examples/views/add-address.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="row e-arrangement">
1+
<div class="row o-arrangement">
22
{{>side-nav}}
33
<div class="col-md-8 o-add-address">
44
<div class="card">
@@ -70,7 +70,7 @@
7070
<input class="input-text col-md-8 col-sm-8" value="Office Address" />
7171
</div>
7272
</div>
73-
<div class="row justify-content-end button-row">
73+
<div class="row justify-content-end">
7474
<div class="grey reset-button">
7575
<button>RESET</button>
7676
</div>

‎examples/views/add-client.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="row e-arrangement">
1+
<div class="row o-arrangement">
22
{{>side-nav}}
33
<div class="col-md-8 o-client-add">
44
<div class="card">
@@ -18,7 +18,7 @@
1818
<div class="label-input col-md-4 col-sm-3">CallBack Url</div>
1919
<input class="input-text col-md-8 col-sm-8" value="" />
2020
</div>
21-
<div class="row justify-content-end button-row">
21+
<div class="row justify-content-end">
2222
<div class="button-solid">
2323
<button>ADD CLIENT</button>
2424
</div>

‎examples/views/address-page.hbs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{{>nav-account}}
2-
<div class="row e-arrangement">
2+
3+
<div class="row o-arrangement">
34
{{>side-nav}}
45
<div class="col-md-8 o-address-page">
56
<div class="card">

‎examples/views/app-page.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="row e-arrangement">
1+
<div class="row o-arrangement">
22
{{>side-nav}}
33
<div class="col-md-8 o-app-page">
44
<div class="card">

‎examples/views/client-page.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="row e-arrangement">
1+
<div class="row o-arrangement">
22
{{>side-nav}}
33
<div class="col-md-8 o-client-page">
44
<div class="card">

‎examples/views/mycourse-card.hbs

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{> nav-bar }}
22
<div class="grid row">
3-
<div class="card-layout col-lg-3 col-md-4 col-sm-6">
4-
<div class="card my-course o-layout-card ">
3+
<div class="card-layout col-md-4 col-sm-6">
4+
<div class="card o-run-card o-layout-card ">
55
<div class="card-heading o-text-card">
66
MARCH' 18
77
</div>
@@ -45,6 +45,33 @@
4545

4646
</div>
4747

48+
<div class="card-mentor-divider"></div>
49+
<div class="font-sm">Major topics covered</div>
50+
51+
<div class="tag-container">
52+
<div class="pill">
53+
Flow Charts
54+
</div>
55+
<div class="pill">
56+
Conditionals and Loops
57+
</div>
58+
<div class="pill">
59+
Functions
60+
</div>
61+
<div class="pill">
62+
Strings
63+
</div>
64+
<div class="pill">
65+
2D Arrays
66+
</div>
67+
<div class="pill">
68+
Operators and Patterns
69+
</div>
70+
<div class="pill">
71+
Arrays
72+
</div>
73+
74+
</div>
4875
<div class="card-mentor-divider"></div>
4976

5077
<div class="row no-gutters">
@@ -60,8 +87,8 @@
6087
</div>
6188
</div>
6289
</div>
63-
<div class="card-layout col-lg-3 col-md-4 col-sm-6">
64-
<div class="card my-course o-layout-card ">
90+
<div class="card-layout col-md-4 col-sm-6">
91+
<div class="card o-run-card o-layout-card ">
6592
<div class="card-heading o-text-card">
6693
MARCH' 18
6794
</div>
@@ -119,8 +146,8 @@
119146
</div>
120147
</div>
121148
</div>
122-
<div class="card-layout col-lg-3 col-md-4 col-sm-6">
123-
<div class="card my-course o-layout-card ">
149+
<div class="card-layout col-md-4 col-sm-6">
150+
<div class="card o-run-card o-layout-card ">
124151
<div class="card-heading o-text-card">
125152
MARCH' 18
126153
</div>
@@ -178,8 +205,8 @@
178205
</div>
179206
</div>
180207
</div>
181-
<div class="card-layout col-lg-3 col-md-4 col-sm-6">
182-
<div class="card my-course o-layout-card ">
208+
<div class="card-layout col-md-4 col-sm-6">
209+
<div class="card o-run-card o-layout-card ">
183210
<div class="card-heading o-text-card">
184211
MARCH' 18
185212
</div>
@@ -237,8 +264,8 @@
237264
</div>
238265
</div>
239266
</div>
240-
<div class="card-layout col-lg-3 col-md-4 col-sm-6">
241-
<div class="card my-course o-layout-card ">
267+
<div class="card-layout col-md-4 col-sm-6">
268+
<div class="card o-run-card o-layout-card ">
242269
<div class="card-heading o-text-card">
243270
MARCH' 18
244271
</div>

‎examples/views/pills.hbs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<div class="heading row">Small Pills</div>
2+
<div class="row">
3+
<div class="pill-sm">
4+
Pill Default
5+
</div>
6+
7+
<div class="pill-sm bg-green">
8+
Pill Green
9+
</div>
10+
11+
<div class="pill-sm bg-red">
12+
Pill Red
13+
</div>
14+
</div>
15+
16+
17+
<div class="heading row">Default Pills</div>
18+
<div class="row">
19+
<div class="pill">
20+
Pill Default
21+
</div>
22+
<div class="pill bg-green">
23+
Pill Green
24+
</div>
25+
26+
27+
<div class="pill bg-red">
28+
Pill Red
29+
</div>
30+
</div>
31+
32+
<div class="heading row">Large Pills</div>
33+
<div class="row">
34+
<div class="pill-lg">
35+
Pill Default
36+
</div>
37+
38+
<div class="pill-lg bg-green">
39+
Pill Green
40+
</div>
41+
42+
<div class="pill-lg bg-red">
43+
Pill Red
44+
</div>
45+
</div>
46+
47+

‎examples/views/profile-page-edit.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="row e-arrangement">
1+
<div class="row o-arrangement">
22
{{>side-nav}}
33
<div class="col-md-8 o-profile-edit">
44
<div class="card">

‎examples/views/profile-page.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="row e-arrangement">
1+
<div class="row o-arrangement">
22
{{>side-nav}}
33
<div class="col-md-8 o-profile">
44
<div class="card">

0 commit comments

Comments
 (0)