File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1+ < < < < < < < HEAD
12 < div class ="row ">
23 < div class ="col-xs-6 ">
34 < div id ="{{id}} "class ="lgcard ">
5+ =======
6+ < div class ="col-xs-6 ">
7+ < div id ="{{id}} " class ="lgcard ">
48
5- < img src ="{{collectionItem.background}} ">
9+ < img src ="{{collectionItem.background}} ">
10+ > > > > > > > a4cc4d5323ae42e20f9b6738b362919434348da4
611
7- < h1 > {{collectionItem.title}}</ h1 >
8- < h4 > {{collectionItem.subtitle}}</ h4 >
9- < p > {{collectionItem.text}}</ p >
12+ < h1 > {{collectionItem.title}}</ h1 >
13+ < h4 > {{collectionItem.subtitle}}</ h4 >
14+ < p > {{collectionItem.text}}</ p >
1015
11- < a href ="https://{{collectionItem.link}} "> < button type ="button "
12- class ="btn btn-primary "> {{collectionItem.link}}</ button > </ a >
13- </ div >
14- </ div >
15- </ div >
16+ < a href ="https://{{collectionItem.link}} "> < button type ="button "
17+ class ="btn btn-primary "> {{collectionItem.link}}</ button > </ a >
18+ </ div >
19+ </ div >
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ <h3>{{title_2}}</h3>
1515 < circle-progress [percent] ="30 " [radius] ="40 " [outerStrokeWidth] ="8 " [innerStrokeWidth] ="4 "
1616 [outerStrokeColor] ="'#000000' " [innerStrokeColor] ="'#3895D3' " [animation] ="true "
1717 [animationDuration] ="300 "> </ circle-progress >
18- < circle-progress [percent] ="13 " [radius] ="40 " [outerStrokeWidth] ="8 " [innerStrokeWidth] ="4 "
18+ < circle-progress [percent] ="20 " [radius] ="40 " [outerStrokeWidth] ="8 " [innerStrokeWidth] ="4 "
1919 [outerStrokeColor] ="'#000000' " [innerStrokeColor] ="'#3895D3' " [animation] ="true "
2020 [animationDuration] ="300 "> </ circle-progress >
2121 </ div >
You can’t perform that action at this time.
0 commit comments