Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Monstra 3.1.0, 2017-06-08 #424

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Monstra 3.1.0, 2017-06-08 #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13b0bd9
Module Blog : multi blogs, améliorations globales
Jun 6, 2017
5c99fb5
- Module Blog changed to module Category and integrated into box
Jun 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Monstra 3.1.0, 2017-06-08
------------------------
- Module Blog changed to module Category and integrated into box
- New look on Public and Admin theme
- Adding to box module Comments
- Including Font Awesomeand removing glyphi...

Monstra 3.0.4, 2016-04-05
------------------------
- Fixed User Security by adding a check that compares POST id with SESSION
Expand Down
17 changes: 13 additions & 4 deletions admin/themes/default/index.template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@

<!-- 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/bootstrap.flatty.min.css" type="text/css" />
<link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/font-awesome.min.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/chocolat.css', 'backend', 2); ?>
<?php Stylesheet::add('public/assets/css/bootstrap-fileupload.css', 'backend', 3); ?>
<?php Stylesheet::add('public/assets/css/icheck-blue.css', 'backend', 4); ?>
<?php Stylesheet::add('admin/themes/default/css/default.css', 'backend', 5); ?>
<?php //Stylesheet::add('admin/themes/default/css/default.css', 'backend', 5); ?>
<?php Stylesheet::load(); ?>

<!-- JavaScripts -->
Expand Down Expand Up @@ -56,6 +58,13 @@
});
</script>

<style>
td{
vertical-align: middle !important;
padding-left: 2% !important;
}
</style>

<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7/html5shiv.js"></script>
Expand All @@ -65,9 +74,9 @@

<body class="page-<?php echo Request::get('id'); ?>">

<nav class="navbar navbar-default navbar-inverse" role="navigation">
<nav class="navbar navbar-default" role="navigation">
<div class="container">
<div class="navbar-header">
<div class="navbar-header ">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
Expand Down
40 changes: 0 additions & 40 deletions plugins/blog/README.md
View file
Open in desktop

This file was deleted.

Loading