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

UI Improvements - Default Theme - Updates #194

This commit is contained in:
Awilum
2014-02-13 22:07:14 +02:00
parent 1085953b3b
commit f2d0bd2745
4 changed files with 81 additions and 18 deletions

View File

@@ -11,7 +11,7 @@
<div class="col-xs-8">
<?php echo Blog::getPosts(3); ?>
</div>
<div class="col-xs-4">
<div class="col-xs-4 tags">
<h3>Tags</h3>
<?php echo Blog::getTags(); ?>
</div>

View File

@@ -1,19 +1,15 @@
body {
padding-top: 60px;
padding-bottom: 40px;
}
.user-panel {
margin-top: 16px;
a {
color: #4169E1;
text-decoration: none;
}
.user-panel {
color: #fff;
}
.user-panel a {
color: #fff;
text-decoration: underline;
a:hover {
color: #DC143C;
text-decoration: none;
}
.error {
@@ -53,4 +49,57 @@ code {
a.monstra-blog-tag {
text-decoration: none;
}
.masthead {
min-height: 300px;
padding-top: 30px;
background: -webkit-linear-gradient(45deg, #b39c68, #a56365, #412e4c);
background: -moz-linear-gradient(45deg, #b39c68, #a56365, #412e4c);
background: -o-linear-gradient(45deg, #b39c68, #a56365, #412e4c);
background: linear-gradient(45deg, #b39c68, #a56365, #412e4c);
}
.navbar {
border: 0;
border-radius: 0;
margin-bottom: 0;
background-color: transparent;
}
.navbar-nav a {
color: #fff;
}
.navbar-nav a:hover {
color: #333;
background: #fff;
}
.navbar-nav > li.active > a {
background: #fff;
color: #333;
}
a.navbar-brand {
color: #fff;
font-size: 36px;
}
.page-header {
color: #fff;
border:none;
}
.page-header h1 {
font-size: 64px;
}
.tags .label {
font-size: 16px;
}
footer {
padding-bottom: 40px;
color: #aaa;
}

View File

@@ -1,6 +1,6 @@
<footer>
<div style="float:left;"><?php echo Chunk::get('footer-links'); ?></div>
<div style="float:right;"><?php Action::run('theme_footer'); ?><?php echo Site::powered(); ?></div>
<div class="pull-left"><?php echo Chunk::get('footer-links'); ?></div>
<div class="pull-right"><?php Action::run('theme_footer'); ?><?php echo Site::powered(); ?></div>
</footer>
</div> <!-- /container -->

View File

@@ -47,7 +47,9 @@
<body>
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="masthead">
<div class="navbar" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@@ -59,12 +61,24 @@
<a class="navbar-brand" href="<?php echo Site::url(); ?>"><?php echo Site::name(); ?></a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<ul class="nav navbar-nav pull-right">
<?php echo Menu::get(); ?>
</ul>
<div class="pull-right user-panel">
<!--<div class="pull-right user-panel">
<?php Users::getPanel(); ?>
</div>
</div>-->
</div>
</div>
</div>
<div class="page-header container text-center">
<?php if (Uri::segment(0) == 'users') { ?>
<h1><?php echo __('Users', 'users'); ?></h1>
<?php } elseif (Uri::segment(0) == 'sitemap') { ?>
<h1><?php echo __('Sitemap', 'sitemap'); ?></h1>
<?php } else { ?>
<h1><?php echo Page::title(); ?></h1>
<?php } ?>
</div>
</div>