Skip to content

Commit

Permalink
v1.4.2 Final update
Browse files Browse the repository at this point in the history
  Changes to be committed:
	modified:   LICENSE
	modified:   assets/head.php
Add material theme. Fix bugs.
  • Loading branch information
Root3287 committed Sep 17, 2016
1 parent bb3e49c commit b02e8fc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

Social-Media Copyright (C) 2015-2016 Timothy A. Gibbons
Social-Media Copyright (C) 2015 Timothy A. Gibbons
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Expand Down
9 changes: 5 additions & 4 deletions assets/head.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
<?php if($cache_settings->retrieve('css') != "18"):?>
<link rel="stylesheet" href="/assets/css/<?php echo $cache_settings->retrieve('css');?>">
<?php else:?>
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700">
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="/assets/css/1.css">
<link rel="stylesheet" href="/assets/css/bootstrap-material-design.min.css">
<link rel="stylesheet" href="/assets/css/ripples.min.css">
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700">
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/icon?family=Material+Icons">
<script src="/assets/js/material.min.js"></script>
<script src="/assets/js/material.min.js"></script>
<script src="/assets/js/ripples.min.js"></script>
<script>$(document).ready(function(){$.material.init(); $('.btn').addClass('btn-raised');})</script>
<?php endif;?>
<?php }else{?>
<?php if(Setting::get('bootstrap-theme') != "18"):?>
Expand All @@ -37,7 +38,7 @@
<link rel="stylesheet" href="/assets/css/ripples.min.css">
<script src="/assets/js/material.min.js"></script>
<script src="/assets/js/ripples.min.js"></script>
<script>$(document).ready(function(){$.material.init();})</script>
<script>$(document).ready(function(){$.material.init();$('.btn').addClass('btn-raised');})</script>
<?php endif;?>
<?php } ?>
<style>
Expand Down

0 comments on commit b02e8fc

Please sign in to comment.