1
0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-04 12:17:42 +02:00

Frontend Improvements

This commit is contained in:
Awilum
2014-01-02 19:54:18 +02:00
parent 4d16d07b2c
commit 73abb00785
2 changed files with 17 additions and 2 deletions

View File

@@ -13,6 +13,16 @@ styles.css
*************************************
1. GENERAL
*************************************/
@font-face {
font-family: 'Glyphicons Halflings';
src: url('@site_url/public/assets/fonts/glyphicons-halflings-regular.eot');
src: url('@site_url/public/assets/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
url('@site_url/public/assets/fonts/glyphicons-halflings-regular.woff') format('woff'),
url('@site_url/public/assets/fonts/glyphicons-halflings-regular.ttf') format('truetype'),
url('@site_url/public/assets/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
}
body {
background: #FAFAFA;
}
@@ -274,4 +284,9 @@ td, th {
footer {
margin-top: 40px;
}
.datapicker {
width: 200px;
}

View File

@@ -9,9 +9,10 @@
<link rel="shortcut icon" href="<?php echo Option::get('siteurl'); ?>favicon.ico" type="image/x-icon" />
<!-- Styles -->
<link rel="stylesheet" href="<?php echo Site::url(); ?>public/assets/css/bootstrap.min.css" type="text/css" />
<link rel="stylesheet" href="<?php echo Site::url(); ?>public/assets/css/bootstrap.css" type="text/css" />
<link rel="stylesheet" href="<?php echo Site::url(); ?>public/assets/css/messenger.css" type="text/css" />
<link rel="stylesheet" href="<?php echo Site::url(); ?>public/assets/css/messenger-theme-flat.css" type="text/css" />
<link rel="stylesheet" href="<?php echo Site::url(); ?>public/assets/css/bootstrap-datetimepicker.min.css" type="text/css" />
<?php Stylesheet::add('public/assets/css/bootstrap-lightbox.css', 'backend', 2); ?>
<?php Stylesheet::add('public/assets/css/bootstrap-fileupload.css', 'backend', 3); ?>
<?php Stylesheet::add('admin/themes/default/css/default.css', 'backend', 5); ?>
@@ -21,7 +22,6 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="<?php echo Site::url(); ?>public/assets/js/bootstrap.min.js"></script>
<script src="<?php echo Site::url(); ?>public/assets/js/messenger.min.js"></script>
<script src="<?php echo Site::url(); ?>public/assets/js/messenger-theme-flat.js"></script>
<?php Javascript::add('public/assets/js/bootstrap-lightbox.js', 'backend', 3); ?>
<?php Javascript::add('public/assets/js/bootstrap-fileupload.js', 'backend', 4); ?>