Testing Commits - Change made to Future Imperfect Theme drafts bug

This commit is contained in:
MTECH, LLC 2016-06-05 14:12:41 -05:00
parent a77e22d93b
commit 59241f0170
10 changed files with 857 additions and 831 deletions

View File

@ -1407,7 +1407,7 @@
} }
body { body {
background: #f4f4f4; background: #ffffff;
} }
body.is-loading *, body.is-loading *:before, body.is-loading *:after { body.is-loading *, body.is-loading *:before, body.is-loading *:after {
@ -3249,7 +3249,7 @@
} }
#intro .logo:before { #intro .logo:before {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100px' height='100px' viewBox='0 0 100 100' preserveAspectRatio='none' zoomAndPan='disable'%3E%3Cpolygon points='0,0 100,0 100,25 50,0 0,25' style='fill:%23f4f4f4' /%3E%3Cpolygon points='0,100 100,100 100,75 50,100 0,75' style='fill:%23f4f4f4' /%3E%3C/svg%3E"); background-image: src("/bl-themes/future-imperfect/img/logo.png");
background-position: top left; background-position: top left;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
@ -3264,8 +3264,8 @@
#intro .logo img { #intro .logo img {
display: block; display: block;
margin-left: -0.25em; margin-left: 0em;
width: 4.5em; width: 4.0em;
} }
#intro header h2 { #intro header h2 {

View File

@ -1,115 +1,115 @@
/* /*
Future Imperfect by HTML5 UP Future Imperfect by HTML5 UP
html5up.net | @n33co html5up.net | @n33co
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
*/ */
(function($) { (function($) {
skel.breakpoints({ skel.breakpoints({
xlarge: '(max-width: 1680px)', xlarge: '(max-width: 1680px)',
large: '(max-width: 1280px)', large: '(max-width: 1280px)',
medium: '(max-width: 980px)', medium: '(max-width: 980px)',
small: '(max-width: 736px)', small: '(max-width: 736px)',
xsmall: '(max-width: 480px)' xsmall: '(max-width: 480px)'
}); });
$(function() { $(function() {
var $window = $(window), var $window = $(window),
$body = $('body'), $body = $('body'),
$menu = $('#menu'), $menu = $('#menu'),
$sidebar = $('#sidebar'), $sidebar = $('#sidebar'),
$main = $('#main'); $main = $('#main');
// Disable animations/transitions until the page has loaded. // Disable animations/transitions until the page has loaded.
$body.addClass('is-loading'); $body.addClass('is-loading');
$window.on('load', function() { $window.on('load', function() {
window.setTimeout(function() { window.setTimeout(function() {
$body.removeClass('is-loading'); $body.removeClass('is-loading');
}, 100); }, 100);
}); });
// Fix: Placeholder polyfill. // Fix: Placeholder polyfill.
$('form').placeholder(); $('form').placeholder();
// Prioritize "important" elements on medium. // Prioritize "important" elements on medium.
skel.on('+medium -medium', function() { skel.on('+medium -medium', function() {
$.prioritize( $.prioritize(
'.important\\28 medium\\29', '.important\\28 medium\\29',
skel.breakpoint('medium').active skel.breakpoint('medium').active
); );
}); });
// IE<=9: Reverse order of main and sidebar. // IE<=9: Reverse order of main and sidebar.
if (skel.vars.IEVersion <= 9) if (skel.vars.IEVersion <= 9)
$main.insertAfter($sidebar); $main.insertAfter($sidebar);
// Menu. // Menu.
$menu $menu
.appendTo($body) .appendTo($body)
.panel({ .panel({
delay: 500, delay: 500,
hideOnClick: true, hideOnClick: true,
hideOnSwipe: true, hideOnSwipe: true,
resetScroll: true, resetScroll: true,
resetForms: true, resetForms: true,
side: 'right', side: 'right',
target: $body, target: $body,
visibleClass: 'is-menu-visible' visibleClass: 'is-menu-visible'
}); });
// Search (header). // Search (header).
var $search = $('#search'), var $search = $('#search'),
$search_input = $search.find('input'); $search_input = $search.find('input');
$body $body
.on('click', '[href="#search"]', function(event) { .on('click', '[href="#search"]', function(event) {
event.preventDefault(); event.preventDefault();
// Not visible? // Not visible?
if (!$search.hasClass('visible')) { if (!$search.hasClass('visible')) {
// Reset form. // Reset form.
$search[0].reset(); $search[0].reset();
// Show. // Show.
$search.addClass('visible'); $search.addClass('visible');
// Focus input. // Focus input.
$search_input.focus(); $search_input.focus();
} }
}); });
$search_input $search_input
.on('keydown', function(event) { .on('keydown', function(event) {
if (event.keyCode == 27) if (event.keyCode == 27)
$search_input.blur(); $search_input.blur();
}) })
.on('blur', function() { .on('blur', function() {
window.setTimeout(function() { window.setTimeout(function() {
$search.removeClass('visible'); $search.removeClass('visible');
}, 100); }, 100);
}); });
// Intro. // Intro.
var $intro = $('#intro'); var $intro = $('#intro');
// Move to main on <=large, back to sidebar on >large. // Move to main on <=large, back to sidebar on >large.
skel skel
.on('+large', function() { .on('+large', function() {
$intro.prependTo($main); $intro.prependTo($main);
}) })
.on('-large', function() { .on('-large', function() {
$intro.prependTo($sidebar); $intro.prependTo($sidebar);
}); });
}); });
})(jQuery); })(jQuery);

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1005 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@ -1,108 +1,134 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<!-- <!--
Future Imperfect by HTML5 UP Imperfect by KreativMind
html5up.net | @n33co kreativmind.co | KreativMind
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
Bludit CMS Bludit CMS
bludit.com | @bludit bludit.com | @bludit
MIT license MIT license
--> -->
<html> <html>
<head> <head>
<!-- Include HTML meta tags --> <!-- Include favicon files here -->
<?php include(PATH_THEME_PHP.'head.php') ?> <link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
</head> <link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
<body> <link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png">
<!-- Wrapper --> <link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png">
<div id="wrapper"> <link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png">
<!-- Header --> <link rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png">
<header id="header"> <link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
<h1><a href="<?php echo $Site->url() ?>"><?php echo $Site->title() ?></a></h1> <link rel="icon" type="image/png" sizes="192x192" href="/android-icon-192x192.png">
<nav class="links"> <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<ul> <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
<?php <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
$parents = $pagesParents[NO_PARENT_CHAR]; <link rel="manifest" href="/manifest.json">
foreach($parents as $Parent) { <meta name="msapplication-TileColor" content="#ffffff">
echo '<li><a href="'.$Parent->permalink().'">'.$Parent->title().'</a></li>'; <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
} <meta name="theme-color" content="#ffffff">
?> <!-- Include HTML meta tags -->
</ul> <?php include(PATH_THEME_PHP.'head.php') ?>
</nav> </head>
<nav class="main"> <body>
<ul>
<li class="menu"><a class="fa-bars" href="#menu">Menu</a></li> <!-- Wrapper -->
</ul> <div id="wrapper">
</nav>
</header> <!-- Header -->
<header id="header">
<!-- Menu --> <h1><a href="<?php echo $Site->url() ?>"><?php echo $Site->title() ?></a></h1>
<section id="menu"> <nav class="links">
<ul>
<!-- Links --> <?php $parents = $pagesParents[NO_PARENT_CHAR];
<section> foreach($parents as $Parent)
<ul class="links"> {
<?php // Check if the parent is published
$parents = $pagesParents[NO_PARENT_CHAR]; if( $Parent->published() )
foreach($parents as $Parent) { {
echo '<li>'; echo '<li>';
echo '<a href="'.$Parent->permalink().'"> echo '<a href="'.$Parent->permalink().'">
<h3>'.$Parent->title().'</h3> <h3>'.$Parent->title().'</h3>
<p>'.$Parent->description().'</p> <p>'.$Parent->description().'</p>
</a>'; </a>';
echo '</li>'; echo '</li>';
} }
?> } ?>
</ul> </ul>
</section> </nav>
<nav class="main">
<!-- Actions --> <ul>
<section> <li class="menu"><a class="fa-bars" href="#menu">Menu</a></li>
<ul class="actions vertical"> </ul>
<li><a href="<?php echo $Site->url().'admin/' ?>" class="button big fit"><?php $L->p('Login') ?></a></li> </nav>
</ul> </header>
</section>
<!-- Menu -->
</section> <section id="menu">
<!-- Main --> <!-- Links -->
<div id="main"> <section>
<ul class="links">
<?php <?php
if( ($Url->whereAmI()=='home') || ($Url->whereAmI()=='tag') || ($Url->whereAmI()=='blog') ) $parents = $pagesParents[NO_PARENT_CHAR];
{ foreach($parents as $Parent) {
include(PATH_THEME_PHP.'home.php'); echo '<li>';
} echo '<a href="'.$Parent->permalink().'">
elseif($Url->whereAmI()=='post') <h3>'.$Parent->title().'</h3>
{ <p>'.$Parent->description().'</p>
include(PATH_THEME_PHP.'post.php'); </a>';
} echo '</li>';
elseif($Url->whereAmI()=='page') }
{ ?>
include(PATH_THEME_PHP.'page.php'); </ul>
} </section>
?>
<!-- Actions -->
</div> <section>
<ul class="actions vertical">
<!-- Sidebar --> <li><a href="<?php echo $Site->url().'admin/' ?>" class="button big fit"><?php $L->p('Login') ?></a></li>
<section id="sidebar"> </ul>
<?php include(PATH_THEME_PHP.'sidebar.php') ?> </section>
</section>
</section>
</div>
<!-- Main -->
<!-- Scripts --> <div id="main">
<?php Theme::jquery() ?>
<script src="<?php echo HTML_PATH_THEME ?>assets/js/skel.min.js"></script> <?php
<script src="<?php echo HTML_PATH_THEME ?>assets/js/util.js"></script> if( ($Url->whereAmI()=='home') || ($Url->whereAmI()=='tag') || ($Url->whereAmI()=='blog') )
<!--[if lte IE 8]><script src="<?php echo HTML_PATH_THEME ?>assets/js/ie/respond.min.js"></script><![endif]--> {
<script src="<?php echo HTML_PATH_THEME ?>assets/js/main.js"></script> include(PATH_THEME_PHP.'home.php');
}
<!-- Plugins Site Body End --> elseif($Url->whereAmI()=='post')
<?php Theme::plugins('siteBodyEnd') ?> {
include(PATH_THEME_PHP.'post.php');
</body> }
</html> elseif($Url->whereAmI()=='page')
{
include(PATH_THEME_PHP.'page.php');
}
?>
</div>
<!-- Sidebar -->
<section id="sidebar">
<?php include(PATH_THEME_PHP.'sidebar.php') ?>
</section>
</div>
<!-- Scripts -->
<?php Theme::jquery() ?>
<script src="<?php echo HTML_PATH_THEME ?>assets/js/skel.min.js"></script>
<script src="<?php echo HTML_PATH_THEME ?>assets/js/util.js"></script>
<!--[if lte IE 8]><script src="<?php echo HTML_PATH_THEME ?>assets/js/ie/respond.min.js"></script><![endif]-->
<script src="<?php echo HTML_PATH_THEME ?>assets/js/main.js"></script>
<!-- Plugins Site Body End -->
<?php Theme::plugins('siteBodyEnd') ?>
</body>
</html>

View File

@ -2,6 +2,11 @@
"theme-data": "theme-data":
{ {
"name": "Future Imperfect", "name": "Future Imperfect",
"description": "Tema limpio y adaptable para todo tipo de dispositivos creado por @n33co portado por Diego Najar para Bludit." "description": "Tema limpio y adaptable para todo tipo de dispositivos creado por @n33co portado por Diego Najar para Bludit.",
"author": "n33co",
"email": "",
"website": "http://html5up.net",
"version": "1.0",
"releaseDate": "2015-11-01"
} }
} }

View File

@ -3,8 +3,8 @@
"email": "", "email": "",
"website": "http://html5up.net", "website": "http://html5up.net",
"version": "1.1", "version": "1.1",
"releaseDate": "2015-11-11", "releaseDate": "2015-11.11",
"license": "CCA 3.0", "license": "CCA 3.0",
"compatible": "1.0,1.1,1.1.2,1.3", "requires": "Bludit v1.1",
"notes": "" "notes": ""
} }

View File

@ -1,33 +1,28 @@
<!-- For each post on this page -->
<?php foreach ($posts as $Post): ?> <?php foreach ($posts as $Post): ?>
<article class="post"> <article class="post">
<!-- Show plugins, Hook: Post Begin --> <!-- Plugins Post Begin -->
<?php Theme::plugins('postBegin') ?> <?php Theme::plugins('postBegin') ?>
<!-- Post's header --> <!-- Post's header -->
<header> <header>
<!-- Post's title and description -->
<div class="title"> <div class="title">
<h2><a href="<?php echo $Post->permalink() ?>"><?php echo $Post->title() ?></a></h2> <h2><a href="<?php echo $Post->permalink() ?>"><?php echo $Post->title() ?></a></h2>
<p><?php echo $Post->description() ?></p> <p><?php echo $Post->description() ?></p>
</div> </div>
<!-- Post's date, author name and author avatar -->
<div class="meta"> <div class="meta">
<?php <?php
// Post's username // Get the user who created the post.
$User = $Post->user(); $User = $Post->user();
// Default author is the username.
$author = $User->username();
// If the user complete the first name or last name this will be the author.
if( Text::isNotEmpty($User->firstName()) || Text::isNotEmpty($User->lastName()) ) { if( Text::isNotEmpty($User->firstName()) || Text::isNotEmpty($User->lastName()) ) {
// Author = First name and Last name
$author = $User->firstName().' '.$User->lastName(); $author = $User->firstName().' '.$User->lastName();
} }
else {
// Author = username
$author = $User->username();
}
?> ?>
<time class="published" datetime="2015-11-01"><?php echo $Post->date() ?></time> <time class="published" datetime="2015-11-01"><?php echo $Post->date() ?></time>
<div class="author"><span class="name"><?php echo $author ?></span><img src="<?php echo $User->profilePicture() ?>" alt=""></div> <div class="author"><span class="name"><?php echo $author ?></span><img src="<?php echo $User->profilePicture() ?>" alt=""></div>
@ -66,7 +61,7 @@
</ul> </ul>
</footer> </footer>
<!-- Show plugins, Hook: Post End --> <!-- Plugins Post End -->
<?php Theme::plugins('postEnd') ?> <?php Theme::plugins('postEnd') ?>
</article> </article>
@ -84,4 +79,4 @@
echo '<li><a href="'.Paginator::urlNextPage().'" class="button big next">Next Page</a></li>'; echo '<li><a href="'.Paginator::urlNextPage().'" class="button big next">Next Page</a></li>';
} }
?> ?>
</ul> </ul>