Skip to content

Commit

Permalink
Merge pull request Anankke#69 from neoFelhz/master
Browse files Browse the repository at this point in the history 
feat/fix/refactor: update cdn
  • Loading branch information
@NimaQu
NimaQu authored May 6, 2018
2 parents 29e4e43 + 2526ee5 commit 5ccbe18
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 20 deletions.
1 change: 0 additions & 1 deletion public/theme/material/css/base.css
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import url(/theme/material/css/roboto.css);
/*!
* normalize.css v3.0.3
* github.com/necolas/normalize.css
Expand Down
2 changes: 1 addition & 1 deletion public/theme/material/css/base.min.css
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url(/theme/material/css/roboto.css);/*!
/*!
* normalize.css v3.0.3
* github.com/necolas/normalize.css
*/body,legend {
Expand Down
2 changes: 1 addition & 1 deletion public/theme/material/css/project.css
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url(/theme/material/css/roboto.css);

body {
padding-bottom: 69px;
}
Expand Down
2 changes: 1 addition & 1 deletion public/theme/material/css/project.min.css
View file

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

2 changes: 1 addition & 1 deletion resources/views/material/admin/footer.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</footer>

<!-- js -->
<script src="//cdn.staticfile.org/jquery/2.2.1/jquery.js"></script>
<script src="https://cdn.jsdelivr.net/gh/sspuic/p@0x02/public/theme/material/js/jquery.min.js"></script>
<script src="//cdn.staticfile.org/jquery-validate/1.15.0/jquery.validate.min.js"></script>
<script src="//cdn.staticfile.org/datatables/1.10.13/js/jquery.dataTables.min.js"></script>
<script src="//cdn.staticfile.org/datatables/1.10.13/js/dataTables.material.min.js"></script>
Expand Down
9 changes: 5 additions & 4 deletions resources/views/material/admin/main.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@


<!-- css -->
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/css/base.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/css/project.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/css/icon.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/css/material.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x03/public/theme/material/css/base.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x03/public/theme/material/css/project.css" rel="stylesheet">
<link href="https://fonts.loli.net/css?family=Roboto:300,300italic,400,400italic,500,500italic" rel="stylesheet">
<link href="https://fonts.loli.net/css?family=Material+Icons">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x03/public/theme/material/css/material.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/css/dataTables.material.min.css" rel="stylesheet">


Expand Down
2 changes: 1 addition & 1 deletion resources/views/material/footer.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


<!-- js -->
<script src="/theme/material/js/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/sspuic/p@0x02/public/theme/material/js/jquery.min.js"></script>
<script src="//static.geetest.com/static/tools/gt.js"></script>

<script src="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/js/base.min.js"></script>
Expand Down
9 changes: 5 additions & 4 deletions resources/views/material/header.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
<meta name="theme-color" content="#3f51b5">
<title>{$config["appName"]}</title>
<!-- css -->
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/css/base.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/css/project.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/css/icon.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x03/public/theme/material/css/base.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x03/public/theme/material/css/project.min.css" rel="stylesheet">
<link href="https://fonts.loli.net/css?family=Roboto:300,300italic,400,400italic,500,500italic" rel="stylesheet">
<link href="https://fonts.loli.net/css?family=Material+Icons">

<!-- favicon -->
<!-- ... -->
Expand Down Expand Up @@ -87,7 +88,7 @@
<li>
<div class="divcss5">
<img src="/images/Ambassador-menu.png" width="230" height="300"/>
<img src="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/imagesAmbassador-menu.png" width="230" height="300"/>
</div>
</li>
{/if}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/material/user/footer.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</footer>

<!-- js -->
<script src="//cdn.staticfile.org/jquery/2.2.1/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/sspuic/p@0x02/public/theme/material/js/jquery.min.js"></script>
<script src="//cdn.staticfile.org/jquery-validate/1.15.0/jquery.validate.min.js"></script>
<script src="//static.geetest.com/static/tools/gt.js"></script>

Expand Down
6 changes: 4 additions & 2 deletions resources/views/material/user/header_info.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@


<!-- css -->
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/css/base.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/css/project.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x03/public/theme/material/css/base.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x03/public/theme/material/css/project.min.css" rel="stylesheet">
<link href="https://fonts.loli.net/css?family=Roboto:300,300italic,400,400italic,500,500italic" rel="stylesheet">
<link href="https://fonts.loli.net/css?family=Material+Icons">



Expand Down
7 changes: 4 additions & 3 deletions resources/views/material/user/main.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@


<!-- css -->
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/css/base.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/css/project.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x01/public/theme/material/css/icon.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x03/public/theme/material/css/base.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/sspuic/p@0x03/public/theme/material/css/project.min.css" rel="stylesheet">
<link href="https://fonts.loli.net/css?family=Roboto:300,300italic,400,400italic,500,500italic" rel="stylesheet">
<link href="https://fonts.loli.net/css?family=Material+Icons">

<style>
body {
Expand Down

0 comments on commit 5ccbe18

Please sign in to comment.