Skip to content

Commit

Permalink
Merge pull request #2297 from REJack/v3-dev
Browse files Browse the repository at this point in the history
rc.3 fix
  • Loading branch information
REJack authored Oct 2, 2019
2 parents 9dc6d1d + 4e8de76 commit 43786cd
Show file tree
Hide file tree
Showing 58 changed files with 59 additions and 58 deletions.
4 changes: 1 addition & 3 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
/docs/
/plugins/
!/plugins/flot-old/
!/docs_html/
2 changes: 1 addition & 1 deletion build/scss/AdminLTE-raw.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* AdminLTE v3.0.0-rc.2
* AdminLTE v3.0.0-rc.3
* Author: Colorlib
* Website: AdminLTE.io <http://adminlte.io>
* License: Open source - MIT <http://opensource.org/licenses/MIT>
Expand Down
2 changes: 1 addition & 1 deletion build/scss/AdminLTE.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* AdminLTE v3.0.0-rc.2
* AdminLTE v3.0.0-rc.3
* Author: Colorlib
* Website: AdminLTE.io <http://adminlte.io>
* License: Open source - MIT <http://opensource.org/licenses/MIT>
Expand Down
2 changes: 1 addition & 1 deletion dist/css/adminlte.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@charset "UTF-8";
/*!
* AdminLTE v3.0.0-rc.2
* AdminLTE v3.0.0-rc.3
* Author: Colorlib
* Website: AdminLTE.io <http://adminlte.io>
* License: Open source - MIT <http://opensource.org/licenses/MIT>
Expand Down
2 changes: 1 addition & 1 deletion dist/css/adminlte.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/adminlte.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/adminlte.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/adminlte.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/adminlte.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions docs/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*
2 changes: 1 addition & 1 deletion docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins:
- jekyll-seo-tag

title: AdminLTE v3 Documentaion
version: v3.0.0-rc.2
version: v3.0.0-rc.3
description: >- # this means to ignore newlines until "baseurl:"
AdminLTE v3 Documentaion
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,7 @@ <h3 class="card-title">
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong>
All rights reserved.
<div class="float-right d-none d-sm-inline-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
</footer>

Expand Down
2 changes: 1 addition & 1 deletion index2.html
Original file line number Diff line number Diff line change
Expand Up @@ -1536,7 +1536,7 @@ <h3 class="card-title">Recently Added Products</h3>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong>
All rights reserved.
<div class="float-right d-none d-sm-inline-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion index3.html
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ <h3 class="card-title">Online Store Overview</h3>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong>
All rights reserved.
<div class="float-right d-none d-sm-inline-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "admin-lte",
"description": "Responsive open source admin dashboard and control panel.",
"version": "3.0.0-rc.2",
"version": "3.0.0-rc.3",
"license": "MIT",
"author": "Colorlib <http://colorlib.com>",
"main": "dist/js/adminlte.min.js",
Expand Down
2 changes: 1 addition & 1 deletion pages/UI/buttons.html
Original file line number Diff line number Diff line change
Expand Up @@ -2004,7 +2004,7 @@ <h3 class="card-title">Radio Button Group</h3>
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/UI/general.html
Original file line number Diff line number Diff line change
Expand Up @@ -1689,7 +1689,7 @@ <h3 class="card-title">
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/UI/icons.html
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ <h3 class="card-title">Icons</h3>
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/UI/modals.html
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,7 @@ <h4 class="modal-title">Extra Large Modal</h4>
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/UI/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ <h4 class="mt-5 ">Custom Content Above</h4>
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/UI/ribbons.html
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ <h3 class="card-title">Ribbons</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/UI/sliders.html
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ <h3 class="card-title">Bootstrap Slider</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/UI/timeline.html
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ <h3 class="timeline-header"><a href="#">Mr. Doe</a> shared a video</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/calendar.html
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ <h3 class="card-title">Create Event</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/charts/chartjs.html
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ <h3 class="card-title">Stacked Bar Chart</h3>
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/charts/flot.html
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ <h3 class="card-title">

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/charts/inline.html
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ <h3 class="card-title">
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ <h3><i class="fas fa-exclamation-triangle text-warning"></i> Oops! Page not foun
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/500.html
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ <h3><i class="fas fa-exclamation-triangle text-danger"></i> Oops! Something went
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/blank.html
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ <h3 class="card-title">Title</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/contacts.html
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ <h2 class="lead"><b>Nicole Pearson</b></h2>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/e_commerce.html
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ <h4 class="mt-0">

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/invoice.html
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@ <h4>
<!-- /.content-wrapper -->
<footer class="main-footer no-print">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/language-menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ <h3 class="card-title">Title</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/legacy-user-menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ <h3 class="card-title">Title</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/pace.html
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ <h3 class="card-title">Title</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ <h3 class="timeline-header"><a href="#">Mina Lee</a> uploaded new photos</h3>
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/project_add.html
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ <h3 class="card-title">Budget</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/project_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ <h5 class="mt-5 text-muted">Project files</h5>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/project_edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ <h3 class="card-title">Files</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/examples/projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -1259,7 +1259,7 @@ <h3 class="card-title">Projects</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/forms/advanced.html
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,7 @@ <h3 class="card-title">Bootstrap Switch</h3>
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/forms/editors.html
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ <h3 class="card-title">
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/forms/general.html
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ <h3 class="card-title">Custom Elements</h3>
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/gallery.html
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ <h1>Gallery</h1>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/layout/boxed.html
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ <h3 class="card-title">Title</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/layout/collapsed-sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ <h3 class="card-title">Title</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
2 changes: 1 addition & 1 deletion pages/layout/fixed-footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ <h3 class="card-title">Title</h3>

<footer class="main-footer">
<div class="float-right d-none d-sm-block">
<b>Version</b> 3.0.0-rc.2
<b>Version</b> 3.0.0-rc.3
</div>
<strong>Copyright &copy; 2014-2019 <a href="http://adminlte.io">AdminLTE.io</a>.</strong> All rights
reserved.
Expand Down
Loading

0 comments on commit 43786cd

Please sign in to comment.