Skip to content

Commit c29c065

Browse files
authored
Merge pull request #25 from DashboardPack/test
Added mapbox-gl plugin
2 parents 9f0d615 + 31bf569 commit c29c065

File tree

9 files changed

+105
-1066
lines changed

9 files changed

+105
-1066
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
npm-debug.log*
44
dist
55
node_modules
6-
.idea
6+
.idea
7+
architectui-html-free
8+
package-lock.json

Changelog.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
### Changelog
22

3-
## Version 1.0.0 (17 January 2019)
3+
## Version 1.0.0 (17 January 2019)
4+
5+
## Version 1.2.3 (19 May 2021)
6+
7+
- Added mapbox-gl plugin
8+
- Alert Dismissing issue resolved
9+
- Card image issue resolved
10+
- Fontawesome icon issue resolved

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "architectui-html-free",
3-
"version": "1.1.1",
3+
"version": "1.2.3",
44
"description": "ArchitectUI - Free Bootstrap 4 Admin Dashboard Template",
55
"author": "DashboardPack.com",
66
"homepage": "https://dashboardpack.com",
@@ -57,10 +57,10 @@
5757
"animate.css": "^3.7.0",
5858
"bootstrap": "^4.1.3",
5959
"chart.js": "^2.7.3",
60-
"fullcalendar": "^3.9.0",
60+
"fullcalendar": "3.10.0",
6161
"gmaps": "^0.4.24",
6262
"jquery": "^3.3.1",
63-
"jvectormap-next": "^2.0.4",
63+
"mapbox-gl": "^2.2.0",
6464
"metismenu": "^3.0.3",
6565
"moment": "^2.23.0",
6666
"pe7-icon": "^1.0.4",

src/DemoPages/components/maps.hbs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
<div class="row">
77
<div class="col-md-6">
88
<div class="main-card mb-3 card">
9-
<div class="card-body">
10-
<div class="card-title">World Map</div>
11-
<div id="world-map-gdp" style="width: 100%; height: 300px;"></div>
9+
<div class="card-body" style="height: 400px;">
10+
<div class="card-title">World Map</div>
11+
<div id="map" style="position: absolute; top: 47px; left: 0px; height: 300px; width: 575px;">
1212
</div>
1313
</div>
14+
</div>
1415
</div>
1516
<div class="col-md-6">
1617
<div class="main-card mb-3 card">

src/DemoPages/components/notifications.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@
261261
<div class="main-card mb-3 card">
262262
<div class="card-body"><h5 class="card-title">Dismissable Alerts</h5>
263263
<div class="alert alert-info alert-dismissible fade show" role="alert">
264-
<button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button>
264+
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
265265
I am an alert and I can be dismissed!
266266
</div>
267267
</div>

src/DemoPages/elements/cards.hbs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</div>
4646
</div>
4747
<div class="col-md-4">
48-
<div class="main-card mb-3 card"><img width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&amp;txt=318%C3%97180&amp;w=318&amp;h=180" alt="Card image cap" class="card-img-top">
48+
<div class="main-card mb-3 card">
4949
<div class="card-body"><h5 class="card-title">Card title</h5><h6 class="card-subtitle">Card subtitle</h6>Some quick example text to build on the card title and make up the bulk of the card's content.
5050
<button class="btn btn-secondary">Button</button>
5151
</div>
@@ -54,17 +54,17 @@
5454
<div class="card-body"><h5 class="card-title">Card Title</h5>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.
5555
<small class="text-muted">Last updated 3 mins ago</small>
5656
</div>
57-
<img width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&amp;txt=318%C3%97180&amp;w=318&amp;h=180" alt="Card image cap" class="card-img-bottom"></div>
57+
</div>
5858
</div>
5959
<div class="col-md-4">
6060
<div class="main-card mb-3 card">
6161
<div class="card-body"><h5 class="card-title">Card title</h5><h6 class="mb-0 card-subtitle">Card subtitle</h6></div>
62-
<img width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&amp;txt=318%C3%97180&amp;w=318&amp;h=180" alt="Card image cap">
62+
6363
<div class="card-body">Some quick example text to build on the card title and make up the bulk of the card's content.<a href="javascript:void(0);" class="card-link">Card Link</a><a href="javascript:void(0);"
6464
class="card-link">Another
6565
Link</a></div>
6666
</div>
67-
<div class="main-card mb-3 card"><img width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&amp;txt=318%C3%97180&amp;w=318&amp;h=180" alt="Card image cap" class="card-img-top">
67+
<div class="main-card mb-3 card">
6868
<div class="card-body"><h5 class="card-title">Card Title</h5>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.
6969
<small class="text-muted">Last updated 3 mins ago</small>
7070
</div>
@@ -83,11 +83,6 @@
8383
<div class="card-shadow-info border mb-3 card card-body border-info"><h5 class="card-title">Info Card Shadow</h5>With supporting text below as a natural lead-in to additional content.</div>
8484
<div class="card-shadow-focus border mb-3 card card-body border-focus"><h5 class="card-title">Focus Card Shadow</h5>With supporting text below as a natural lead-in to additional content.</div>
8585
<div class="card-shadow-alternate border mb-3 card card-body border-alternate"><h5 class="card-title">Alternate Card Shadow</h5>With supporting text below as a natural lead-in to additional content.</div>
86-
<div class="mb-3 card text-white"><img width="100%" src="https://placeholdit.imgix.net/~text?txtsize=33&amp;txt=318%C3%97270&amp;w=318&amp;h=270&amp;bg=333333&amp;txtclr=666666" alt="Card image cap" class="card-img">
87-
<div class="card-img-overlay"><h5 class="text-white card-title">Card Title</h5>This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.
88-
<small class="text-white">Last updated 3 mins ago</small>
89-
</div>
90-
</div>
9186
</div>
9287
<div class="col-md-4">
9388
<div class="card-border mb-3 card card-body border-primary"><h5 class="card-title">Primary Card Border</h5>With supporting text below as a natural lead-in to additional content.</div>

0 commit comments

Comments
 (0)