Skip to content

Commit 7076a44

Browse files
vdvibhu20vdvibhu20
committed
Merge branch 'master' of https://github.com/coding-blocks/motley into review-section
2 parents 4e11a76 + 1e7c4c4 commit 7076a44

File tree

12 files changed

+213
-125
lines changed

12 files changed

+213
-125
lines changed

‎examples/components/nav-bar.hbs

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,45 +64,49 @@
6464
<span class="notify-dot new"></span>
6565
<i class="fas fa-bell"></i>
6666
</div>
67-
<div class="dropdown-ul o-notification display-none">
68-
<div class="dropdown-li row no-gutters">
69-
<div class="notify-type col-2 ">
67+
<div class="dropdown-ul o-notification">
68+
<div class="dropdown-li row">
69+
<div class="notify-type col-2 justify-content-center align-items-center">
7070
<div class="notify-icon">
7171
<span class="notify-dot new"></span>
72-
<img src="images/announcement.png" alt="">
72+
<img src="images/announcement.svg" alt="">
7373
</div>
7474
</div>
75+
7576
<div class="notify-text col-10">Please hard refresh (Ctrl Shift R) your web app to make sure that you are on latest version of the app. We just deployed some major changes so that might be causing
7677
issues for you.</div>
7778
</div>
7879

79-
<div class="dropdown-li row no-gutters">
80-
<div class="notify-type col-2 ">
80+
<div class="dropdown-li row">
81+
82+
<div class="notify-type col-2 justify-content-center align-items-center">
8183
<div class="notify-icon">
8284
<span class="notify-dot new"></span>
83-
<img src="images/announcement.png" alt="">
85+
<img src="images/announcement.svg" alt="">
8486
</div>
8587
</div>
8688
<div class="notify-text col-10">Please hard refresh (Ctrl Shift R) your web app to make sure that you are on latest version of the app. We just deployed some major changes so that might be causing
8789
issues for you.</div>
8890
</div>
8991

90-
<div class="dropdown-li row no-gutters">
91-
<div class="notify-type col-2 ">
92+
<div class="dropdown-li row">
93+
94+
<div class="notify-type col-2 justify-content-center align-items-center">
9295
<div class="notify-icon">
9396
<span class="notify-dot new"></span>
94-
<img src="images/announcement.png" alt="">
97+
<img src="images/announcement.svg" alt="">
9598
</div>
9699
</div>
97100
<div class="notify-text col-10">Please hard refresh (Ctrl Shift R) your web app to make sure that you are on latest version of the app. We just deployed some major changes so that might be causing
98101
issues for you.</div>
99102
</div>
100103

101-
<div class="dropdown-li row no-gutters">
102-
<div class="notify-type col-2 ">
104+
<div class="dropdown-li row">
105+
106+
<div class="notify-type col-2 justify-content-center align-items-center">
103107
<div class="notify-icon">
104108
<span class="notify-dot new"></span>
105-
<img src="images/announcement.png" alt="">
109+
<img src="images/announcement.svg" alt="">
106110
</div>
107111
</div>
108112
<div class="notify-text col-10">Please hard refresh (Ctrl Shift R) your web app to make sure that you are on latest version of the app. We just deployed some major changes so that might be causing
@@ -115,10 +119,12 @@
115119
{{>button type='solid' text='Login'}}
116120
</li> --}}
117121
</ul>
118-
122+
119123
<div class="round-img">
120124
<img src="/images/c++ode-red.svg" alt="">
121125
</div>
126+
127+
122128

123129
<div class="card">
124130
<div class="top-offset"></div>

‎examples/views/about-course.hbs

Lines changed: 164 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
<div class="o-summary">
3434
<div class="classroom-container row">
35-
<div class="classroom-header-box col-md-7 col-sm-12 col-xs-12">
35+
<div class="classroom-header-box col-md-8 col-sm-12 col-xs-12">
3636
<div class="classroom-header row">
3737
<div class="classroom-image col-md-2 col-2 col-sm-2">
3838
<img src="images/c++" alt="">
@@ -51,96 +51,11 @@
5151
<span class="key">Taught By : </span> Prateek Narang, Arnav Gupta
5252
</div>
5353

54-
55-
<div class="o-buy-right">
56-
<div class="card">
57-
<div class="card-video">
58-
<div class="fader"></div>
59-
60-
<div class="status-circle">
61-
<div class="circle-back"></div>
62-
<div class="circle-front"></div>
63-
</div>
64-
65-
<div class="preview">
66-
<iframe src="https://www.youtube.com/embed/mFbitwLUCRs" controls allowfullscreen></iframe>
67-
</div>
68-
69-
</div>
70-
<div class="button-container row justify-content-center">
71-
<div class="button-solid col-5">
72-
<button>BUY NOW TO ENROLL</button>
73-
</div>
74-
75-
<div class="button-dashed col-5">
76-
<button>ENROLL VIA OTP</button>
77-
</div>
78-
</div>
79-
80-
81-
<div class="course-features">
82-
<div class="row justify-content-center">
83-
<div class="col-2 align-self-center">
84-
<div class="img-container">
85-
<div class="round-img">
86-
<img src="" alt="">
87-
</div>
88-
</div>
89-
90-
</div>
91-
<div class="para col-4 align-self-center">
92-
30+ Hours Video Content
93-
</div>
94-
95-
<div class="col-2 align-self-center">
96-
<div class="img-container">
97-
<div class="round-img">
98-
<img src="" alt="">
99-
</div>
100-
</div>
101-
102-
</div>
103-
<div class="para col-4 align-self-center">
104-
Full Lifetime Access
105-
</div>
106-
</div>
107-
108-
<div class="row justify-content-center">
109-
<div class="col-2 align-self-center">
110-
<div class="img-container">
111-
<div class="round-img">
112-
<img src="" alt="">
113-
</div>
114-
</div>
115-
116-
</div>
117-
<div class="para col-4 align-self-center">
118-
Certification of Completion
119-
</div>
120-
121-
<div class="col-2 align-self-center">
122-
<div class="img-container">
123-
<div class="round-img">
124-
<img src="" alt="">
125-
</div>
126-
</div>
127-
128-
</div>
129-
<div class="para col-4 align-self-center">
130-
Supplemental Resources
131-
</div>
132-
</div>
133-
134-
</div>
135-
136-
</div>
137-
</div>
138-
13954
<div class="heading-u">
14055
Summary
14156
</div>
14257

143-
<div class="para">
58+
<div class="para summary">
14459
Coding Blocks is pleased to bring you the ultimate competitive programming course, hand crafted to ensure your success in challenges such as Google CodeJam, Google Kickstart, ACM-ICPC, and more. This 8 week programme will kickstart your foray in to the exciting world of competitive coding. You will master commonly used problem solving techniques, hone your mathematical analysis skills, and push the boundaries of your reasoning abilities. The course will cover Advanced Data Structures like Segment Trees, Binary Index / Fenwick Trees.
14560

14661
You shall learn construct algorithms involving Dynamic Programming, Bitmasking, Greedy Algorithms, and Divide & Conquer. The course will also cover other advanced competitive topics. The course will also cover other advanced competitive topics. The course will also cover.
@@ -150,7 +65,7 @@
15065

15166
<div class="heading-u">Student Feedback</div>
15267

153-
<div class="row o-review-stats no-gutters">
68+
<div class="row o-rating-stats no-gutters">
15469
<div class="col-1 score">
15570
<span class="font-lg bold">4.9</span> <span class="bold">out of 5</span>
15671

@@ -273,9 +188,9 @@
273188
</div>
274189
</div>
275190

276-
<div class="row">
277-
<div class="col-12 col-md-4 col-lg-3">
278-
<div class="card round o-review-card">
191+
<div class="row rating-carousel">
192+
<div class="col-8 col-md-4 col-lg-3">
193+
<div class="card round o-rating-card">
279194
<div class="row justify-content-between">
280195
<div>Sid_90</div>
281196
<div class="grey font-sm i">8 hours ago</div>
@@ -308,8 +223,8 @@
308223
</div>
309224
</div>
310225
</div>
311-
<div class="col-12 col-md-4 col-lg-3">
312-
<div class="card round o-review-card">
226+
<div class="col-8 col-md-4 col-lg-3">
227+
<div class="card round o-rating-card">
313228
<div class="row justify-content-between">
314229
<div>Sid_90</div>
315230
<div class="grey font-sm i">8 hours ago</div>
@@ -343,8 +258,78 @@
343258
</div>
344259
</div>
345260

346-
<div class="col-12 col-md-4 col-lg-3">
347-
<div class="card round o-review-card">
261+
<div class="col-8 col-md-4 col-lg-3">
262+
<div class="card round o-rating-card">
263+
<div class="row justify-content-between">
264+
<div>Sid_90</div>
265+
<div class="grey font-sm i">8 hours ago</div>
266+
</div>
267+
268+
<div class="heading">
269+
Great Experience
270+
</div>
271+
272+
<div class="rating">
273+
<span class="pos-rating">
274+
<i class="fas fa-star"></i>
275+
</span>
276+
<span class="pos-rating">``
277+
<i class="fas fa-star"></i>
278+
</span>
279+
<span class="pos-rating">
280+
<i class="fas fa-star"></i>
281+
</span>
282+
<span class="pos-rating">
283+
<i class="fas fa-star"></i>
284+
</span>
285+
<span class="neg-rating">
286+
<i class="fas fa-star"></i>
287+
</span>
288+
</div>
289+
290+
<div class="review grey i">
291+
The course was pretty basic but good. The teacher was clear while speakin so I definitely reccomend this to start and get an idea about how Shopify works.
292+
</div>
293+
</div>
294+
</div>
295+
296+
<div class="col-8 col-md-4 col-lg-3">
297+
<div class="card round o-rating-card">
298+
<div class="row justify-content-between">
299+
<div>Sid_90</div>
300+
<div class="grey font-sm i">8 hours ago</div>
301+
</div>
302+
303+
<div class="heading">
304+
Great Experience
305+
</div>
306+
307+
<div class="rating">
308+
<span class="pos-rating">
309+
<i class="fas fa-star"></i>
310+
</span>
311+
<span class="pos-rating">
312+
<i class="fas fa-star"></i>
313+
</span>
314+
<span class="pos-rating">
315+
<i class="fas fa-star"></i>
316+
</span>
317+
<span class="pos-rating">
318+
<i class="fas fa-star"></i>
319+
</span>
320+
<span class="neg-rating">
321+
<i class="fas fa-star"></i>
322+
</span>
323+
</div>
324+
325+
<div class="review grey i">
326+
The course was pretty basic but good. The teacher was clear while speakin so I definitely reccomend this to start and get an idea about how Shopify works.
327+
</div>
328+
</div>
329+
</div>
330+
331+
<div class="col-8 col-md-4 col-lg-3">
332+
<div class="card round o-rating-card">
348333
<div class="row justify-content-between">
349334
<div>Sid_90</div>
350335
<div class="grey font-sm i">8 hours ago</div>
@@ -384,6 +369,90 @@
384369
</div>
385370
</div>
386371

372+
<div class="o-buy-right">
373+
<div class="card">
374+
<div class="card-video">
375+
<div class="fader"></div>
376+
377+
<div class="status-circle">
378+
<div class="circle-back"></div>
379+
<div class="circle-front"></div>
380+
</div>
381+
382+
<div class="preview">
383+
<iframe src="https://www.youtube.com/embed/mFbitwLUCRs" controls allowfullscreen></iframe>
384+
</div>
385+
386+
</div>
387+
<div class="button-container row justify-content-center">
388+
<div class="button-solid col-5">
389+
<button>BUY NOW TO ENROLL</button>
390+
</div>
391+
392+
<div class="button-dashed col-5">
393+
<button>ENROLL VIA OTP</button>
394+
</div>
395+
</div>
396+
397+
398+
<div class="course-features">
399+
<div class="row justify-content-center">
400+
<div class="col-2 align-self-center">
401+
<div class="img-container">
402+
<div class="round-img">
403+
<img src="" alt="">
404+
</div>
405+
</div>
406+
407+
</div>
408+
<div class="para col-4 align-self-center">
409+
30+ Hours Video Content
410+
</div>
411+
412+
<div class="col-2 align-self-center">
413+
<div class="img-container">
414+
<div class="round-img">
415+
<img src="" alt="">
416+
</div>
417+
</div>
418+
419+
</div>
420+
<div class="para col-4 align-self-center">
421+
Full Lifetime Access
422+
</div>
423+
</div>
424+
425+
<div class="row justify-content-center">
426+
<div class="col-2 align-self-center">
427+
<div class="img-container">
428+
<div class="round-img">
429+
<img src="" alt="">
430+
</div>
431+
</div>
432+
433+
</div>
434+
<div class="para col-4 align-self-center">
435+
Certification of Completion
436+
</div>
437+
438+
<div class="col-2 align-self-center">
439+
<div class="img-container">
440+
<div class="round-img">
441+
<img src="" alt="">
442+
</div>
443+
</div>
444+
445+
</div>
446+
<div class="para col-4 align-self-center">
447+
Supplemental Resources
448+
</div>
449+
</div>
450+
451+
</div>
452+
453+
</div>
454+
</div>
455+
387456
<div class="o-about-accordian">
388457
<div class="custom-heading accordian-head">
389458
<div class="heading-u">

‎sass/styles/_objects.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@
5656
@import "objects/o-side-nav/o-side-nav";
5757
@import "objects/o-skeleton/o-skeleton-card";
5858
@import "objects/o-player-modal/o-player-modal";
59-
@import "objects/course-review/o-review-card";
60-
@import "objects/course-review/o-review-stats";
59+
@import "objects/course-rating/o-rating-card";
60+
@import "objects/course-rating/o-rating-stats";

0 commit comments

Comments
 (0)