Skip to content

Commit 3e680c3

Browse files
khoadnguyenkhoadnguyen
authored
Merge pull request #28 from SoftStackFactory/revert-26-9-timeline=page
Revert "9 timeline page"
2 parents 67f8705 + bc4ae43 commit 3e680c3

4 files changed

Lines changed: 1 addition & 562 deletions

File tree

‎src/app/app.module.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import { TransitionPage } from '../pages/transition/transition';
1515
import { AssessmentPage } from '../pages/assessment/assessment';
1616
import { TimelinePage } from '../pages/timeline/timeline';
1717

18-
import { ChartsModule } from 'ng2-charts';
19-
2018
@NgModule({
2119
declarations: [
2220
MyApp,
@@ -32,8 +30,7 @@ import { ChartsModule } from 'ng2-charts';
3230
],
3331
imports: [
3432
BrowserModule,
35-
IonicModule.forRoot(MyApp),
36-
ChartsModule
33+
IonicModule.forRoot(MyApp)
3734
],
3835
bootstrap: [IonicApp],
3936
entryComponents: [

‎src/index.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
<!-- cordova.js required for cordova apps (remove if not needed) -->
1919
<script src="cordova.js"></script>
20-
<script src="https://cdn.zingchart.com/zingchart.min.js"></script>
2120

2221
<!-- un-comment this code to enable service worker
2322
<script>

‎src/pages/timeline/timeline.html‎

Lines changed: 0 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -15,110 +15,5 @@
1515

1616

1717
<ion-content padding>
18-
<section class="cd-timeline">
19-
<div class="cd-timeline__container">
20-
<div class="cd-timeline__block">
21-
<div class="cd-timeline__img cd-timeline__img--1">
22-
<!-- <img src="img/cd-icon-picture.svg" alt="Picture"> -->
23-
</div> <!-- cd-timeline__img -->
2418

25-
<div class="cd-timeline__content">
26-
<h2>Joining</h2>
27-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum aut hic quasi placeat iure tempora laudantium ipsa ad debitis unde? Iste voluptatibus minus veritatis qui ut.</p>
28-
<a href="#0" class="cd-timeline__read-more">Read more</a>
29-
<span class="cd-timeline__date">Jan 14</span>
30-
</div> <!-- cd-timeline__content -->
31-
</div> <!-- cd-timeline__block -->
32-
33-
<div class="cd-timeline__block">
34-
<div class="cd-timeline__img cd-timeline__img--2">
35-
<!-- <img src="img/cd-icon-movie.svg" alt="Movie"> -->
36-
</div> <!-- cd-timeline__img -->
37-
38-
<div class="cd-timeline__content">
39-
<h2>Serving</h2>
40-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum aut hic quasi placeat iure tempora laudantium ipsa ad debitis unde?</p>
41-
<a href="#0" class="cd-timeline__read-more">Read more</a>
42-
<span class="cd-timeline__date">Jan 18</span>
43-
</div> <!-- cd-timeline__content -->
44-
</div> <!-- cd-timeline__block -->
45-
46-
<div class="cd-timeline__block">
47-
<div class="cd-timeline__img cd-timeline__img--3">
48-
<!-- <img src="img/cd-icon-picture.svg" alt="Picture"> -->
49-
</div> <!-- cd-timeline__img -->
50-
51-
<div class="cd-timeline__content">
52-
<h2>Getting Out</h2>
53-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Excepturi, obcaecati, quisquam id molestias eaque asperiores voluptatibus cupiditate error assumenda delectus odit similique earum voluptatem doloremque dolorem ipsam quae rerum quis. Odit, itaque, deserunt corporis vero ipsum nisi eius odio natus ullam provident pariatur temporibus quia eos repellat consequuntur perferendis enim amet quae quasi repudiandae sed quod veniam dolore possimus rem voluptatum eveniet eligendi quis fugiat aliquam sunt similique aut adipisci.</p>
54-
<a href="#0" class="cd-timeline__read-more">Read more</a>
55-
<span class="cd-timeline__date">Jan 24</span>
56-
</div> <!-- cd-timeline__content -->
57-
</div> <!-- cd-timeline__block -->
58-
59-
<div class="cd-timeline__block">
60-
<div class="cd-timeline__img cd-timeline__img--4">
61-
<!-- <img src="img/cd-icon-location.svg" alt="Location"> -->
62-
</div> <!-- cd-timeline__img -->
63-
64-
<div class="cd-timeline__content">
65-
<h2>Starting Up</h2>
66-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum aut hic quasi placeat iure tempora laudantium ipsa ad debitis unde? Iste voluptatibus minus veritatis qui ut.</p>
67-
<a href="#0" class="cd-timeline__read-more">Read more</a>
68-
<span class="cd-timeline__date">Feb 14</span>
69-
</div> <!-- cd-timeline__content -->
70-
</div> <!-- cd-timeline__block -->
71-
72-
<div class="cd-timeline__block">
73-
<div class="cd-timeline__img cd-timeline__img--5">
74-
<!-- <img src="img/cd-icon-location.svg" alt="Location"> -->
75-
</div> <!-- cd-timeline__img -->
76-
77-
<div class="cd-timeline__content">
78-
<h2>Taking care of yourself</h2>
79-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum.</p>
80-
<a href="#0" class="cd-timeline__read-more">Read more</a>
81-
<span class="cd-timeline__date">Feb 18</span>
82-
</div> <!-- cd-timeline__content -->
83-
</div> <!-- cd-timeline__block -->
84-
85-
<div class="cd-timeline__block">
86-
<div class="cd-timeline__img cd-timeline__img--6">
87-
<!-- <img src="img/cd-icon-movie.svg" alt="Movie"> -->
88-
</div> <!-- cd-timeline__img -->
89-
90-
<div class="cd-timeline__content">
91-
<h2>Reinventing myself</h2>
92-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum.</p>
93-
<a href="#0" class="cd-timeline__read-more">Read more</a>
94-
<span class="cd-timeline__date">Feb 18</span>
95-
</div> <!-- cd-timeline__content -->
96-
</div> <!-- cd-timeline__block -->
97-
98-
<div class="cd-timeline__block">
99-
<div class="cd-timeline__img cd-timeline__img--7">
100-
<!-- <img src="img/cd-icon-movie.svg" alt="Movie"> -->
101-
</div> <!-- cd-timeline__img -->
102-
103-
<div class="cd-timeline__content">
104-
<h2>Putting down roots</h2>
105-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum.</p>
106-
<a href="#0" class="cd-timeline__read-more">Read more</a>
107-
<span class="cd-timeline__date">Feb 18</span>
108-
</div> <!-- cd-timeline__content -->
109-
</div> <!-- cd-timeline__block -->
110-
111-
<div class="cd-timeline__block">
112-
<div class="cd-timeline__img cd-timeline__img--movie">
113-
<!-- <img src="img/cd-icon-movie.svg" alt="Movie"> -->
114-
</div> <!-- cd-timeline__img -->
115-
116-
<div class="cd-timeline__content">
117-
<h2>What's next?</h2>
118-
<p>This is the content of the last section</p>
119-
<span class="cd-timeline__date">Feb 26</span>
120-
</div> <!-- cd-timeline__content -->
121-
</div> <!-- cd-timeline__block -->
122-
</div>
123-
</section> <!-- cd-timeline -->
12419
</ion-content>

0 commit comments

Comments
 (0)