1
0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-08 14:16:54 +02:00

Site Url without trailing slashes

This commit is contained in:
Awilum
2014-01-03 18:39:03 +02:00
parent c3fe4d16bc
commit 9da99040e1
5 changed files with 69 additions and 73 deletions

View File

@@ -4,11 +4,7 @@ styles.css
*************************************
CONTENTS
1. GENERAL
2. HEADER
3. CONTENT
4. LEFT MENU
5. AUTHORIZATION
6. MEDIA QUERIES
2. MEDIA QUERIES
*************************************
1. GENERAL
@@ -24,19 +20,19 @@ styles.css
}
body {
background: #FAFAFA;
background: #FAFAFA;
}
.navbar-inverse {
background: #252525;
background: #252525;
}
.navbar-brand {
font-size: 24px;
font-size: 24px;
}
h1,h2,h3,h4,h5 {
color: #222;
color: #222;
}
td, th {
@@ -45,15 +41,15 @@ td, th {
}
.navbar-default {
border-radius: 0px;
border-radius: 0px;
}
.nav-tabs>li>a {
border-radius: 0px;
.nav-tabs > li > a {
border-radius: 0px;
}
.tab-page {
background: #fff;
background: #fff;
}
.form-control,
@@ -68,67 +64,75 @@ code {
}
.badge,
.label {
font-weight: normal;
text-shadow:none;
font-weight: normal;
text-shadow: none;
}
/* Tabs */
.datapicker {
width: 200px;
}
.tab-pane > table {
margin-top:-20px;
}
.breadcrumb {
background: #fff;
border-radius: 0px;
}
.tab-pane > table {
border-top:none!important;
}
/* Tabs */
.tab-pane > table {
margin-top:-20px;
}
.tab-content {
.tab-pane > table {
border-top:none!important;
}
.tab-content {
overflow: visible;
}
}
.tab-page {
border-bottom: 1px solid #DDDDDD;
border-left: 1px solid #DDDDDD;
border-right: 1px solid #DDDDDD;
padding: 20px 10px 10px;
}
.tab-page {
border-bottom: 1px solid #DDDDDD;
border-left: 1px solid #DDDDDD;
border-right: 1px solid #DDDDDD;
padding: 20px 10px 10px;
}
.small-grey-text {
color:#333;
font-size: 10px;
}
.small-grey-text {
color:#333;
font-size: 10px;
}
.small-grey-text:hover {
color:#000;
}
.small-grey-text:hover {
color:#000;
}
.small-white-text {
color:#fff;
font-size: 10px;
}
.small-white-text {
color:#fff;
font-size: 10px;
}
.small-white-text:hover {
color:#fdfdfd;
}
.small-white-text:hover {
color:#fdfdfd;
}
.error-none {display:none;}
.error-field {border:1px solid red!important;}
.container-fluid {padding-left:0px;}
img {max-width:none;}
.error-none {display:none;}
.error-field {border:1px solid red!important;}
.container-fluid {padding-left:0px;}
img {max-width:none;}
a.btn-expand{
a.btn-expand{
color: #333;
font-weight:bold;
font-size:14px;
text-decoration: none;
padding-left:4px;
padding-right:4px;
}
}
footer a , footer{
footer a , footer{
color:#333;
font-size:10px;
}
}
/* Inputs */
@@ -283,10 +287,5 @@ td, th {
}
footer {
margin-top: 40px;
margin-top: 40px;
}
.datapicker {
width: 200px;
}

View File

@@ -9,18 +9,18 @@
<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.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.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" />
<?php Stylesheet::add('public/assets/css/chocolat.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); ?>
<?php Stylesheet::load(); ?>
<!-- JavaScripts -->
<script src="<?php echo Site::url(); ?>public/assets/js/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/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>
<?php Javascript::add('public/assets/js/jquery.chocolat.js', 'backend', 3); ?>
<?php Javascript::add('public/assets/js/bootstrap-fileupload.js', 'backend', 4); ?>