Compare commits

..

No commits in common. "83a1fe244f94afc78f364956051f9e16a3141ed3" and "f52c257d41d1b65acef1402df543ea8848951dbf" have entirely different histories.

14 changed files with 11 additions and 27 deletions

View file

@ -3,9 +3,12 @@ MIXINS = $(shell find src/scss -name "_*.scss")
SCSS = $(shell find src/scss -name "*.scss" -not -name "_*") SCSS = $(shell find src/scss -name "*.scss" -not -name "_*")
CSS = $(patsubst src/scss/%.scss,src/public/css/%.css,$(SCSS)) CSS = $(patsubst src/scss/%.scss,src/public/css/%.css,$(SCSS))
.PHONY: all css clean .PHONY: all css dir clean
css: $(CSS) css: dir $(CSS)
dir:
@mkdir -p src/public/css
clean: clean:
@printf "\033[31m RM \033[0m%s\n" src/public/css @printf "\033[31m RM \033[0m%s\n" src/public/css
@ -15,6 +18,5 @@ all: clean css
$(CSS): src/public/css/%.css : src/scss/%.scss $(MIXINS) $(CSS): src/public/css/%.css : src/scss/%.scss $(MIXINS)
@printf "\033[33m SCSS \033[0m%s\n" $< @printf "\033[33m SCSS \033[0m%s\n" $<
@mkdir -p $(@D)
@sassc --style compressed $< $@ @sassc --style compressed $< $@

Binary file not shown.

Before

Width:  |  Height:  |  Size: 696 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 556 B

View file

@ -1 +0,0 @@
#webring{height:5px}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

View file

@ -2,14 +2,10 @@
@import "./variables"; @import "./variables";
#header, #footer { * {
behavior: url(boxsizing.htc); behavior: url(boxsizing.htc);
} }
.ie-nav {
margin-left: 90px;
}
#main .col { #main .col {
display: block !important; display: block !important;
width: 100% !important; width: 100% !important;
@ -20,8 +16,8 @@
padding-bottom: $outer-gap; padding-bottom: $outer-gap;
} }
#main .right { #nav {
margin-top: $outer-gap; behavior: url(display-table.htc);
} }
#new_comment { #new_comment {

View file

@ -153,8 +153,6 @@ body {
margin: 0 auto; margin: 0 auto;
@include display-table($inner-gap); @include display-table($inner-gap);
ul { padding: none;}
li { li {
@include display-table-cell; @include display-table-cell;
float: left; float: left;
@ -240,7 +238,6 @@ body {
.buttons { .buttons {
a, img { a, img {
height: 30px; height: 30px;
text-decoration: none;
} }
} }
} }

View file

@ -45,7 +45,7 @@ class Blog_controller extends Controller {
} }
$this->view('header', $data); $this->view('header', $data);
$this->view('apps/blog_post', $data); $this->view('apps/blog_post', $data);
$ref = "blog/post/{$name}"; $ref = "blog/post{$name}";
$this->comments_controller->comments($data['post']['meta']['name'], $ref); $this->comments_controller->comments($data['post']['meta']['name'], $ref);
$this->view('footer', $data); $this->view('footer', $data);
} }

View file

@ -22,9 +22,6 @@
<?=image('buttons/eyes', 'alt_button_eyes', animated: TRUE, width: '88', height: '30')?> <?=image('buttons/eyes', 'alt_button_eyes', animated: TRUE, width: '88', height: '30')?>
<?=image('buttons/vim', 'alt_button_vim', animated: TRUE, width: '88', height: '30')?> <?=image('buttons/vim', 'alt_button_vim', animated: TRUE, width: '88', height: '30')?>
<?=image('buttons/gnu-linux', 'alt_button_gnu_linux', width: '88', height: '30')?> <?=image('buttons/gnu-linux', 'alt_button_gnu_linux', width: '88', height: '30')?>
<a href="https://www.eff.org/join">
<?=image('buttons/eff', 'alt_button_eff', width: '96', height: '30')?>
</a>
<a href="https://citrons.xyz/a/memetic-apioform-page.html"> <a href="https://citrons.xyz/a/memetic-apioform-page.html">
<?=image('buttons/apiopage', 'alt_button_apiopage', width: '81', height: '30')?> <?=image('buttons/apiopage', 'alt_button_apiopage', width: '81', height: '30')?>
</a> </a>
@ -39,7 +36,6 @@
<iframe <iframe
height="40" height="40"
class="bucket" class="bucket"
scrolling="no"
title="<?=lang('bucket_title')?>" title="<?=lang('bucket_title')?>"
src="<?=$this->get_url('bucket?name=freya')?>" src="<?=$this->get_url('bucket?name=freya')?>"
></iframe> ></iframe>

View file

@ -17,8 +17,7 @@
</h1> </h1>
<div role="navigation"> <div role="navigation">
<ul id="nav"> <ul id="nav">
<li class="ie-nav"> <li><?=ilang('action_home',
<?=ilang('action_home',
href: $this->get_url('home'), href: $this->get_url('home'),
container: 'h2' container: 'h2'
)?></li> )?></li>

View file

@ -23,8 +23,6 @@ abstract class Core {
*/ */
public static function asset_stamp(string $path): int public static function asset_stamp(string $path): int
{ {
if (ENVIRONMENT == 'devlopment')
return time();
$path = PUBLIC_ROOT . '/' . $path; $path = PUBLIC_ROOT . '/' . $path;
return @filemtime($path); return @filemtime($path);
} }
@ -82,6 +80,6 @@ abstract class Core {
*/ */
public static function format_date(string $iso_date): string public static function format_date(string $iso_date): string
{ {
return date("Y-m-d D H:i", strtotime($iso_date)) . ' EST'; return date("Y-m-d D H:m", strtotime($iso_date));
} }
} }

View file

@ -73,7 +73,6 @@ function image(
if ($alt) { if ($alt) {
$alt = lang($alt); $alt = lang($alt);
$attrs['alt'] = $alt; $attrs['alt'] = $alt;
$attrs['title'] = $alt;
} }
if ($width) { if ($width) {
$attrs['width'] = $width; $attrs['width'] = $width;

View file

@ -3,7 +3,6 @@
// ========================= ENVIRONMENT == // ========================= ENVIRONMENT ==
ini_set('html_errors', '1'); ini_set('html_errors', '1');
date_default_timezone_set('America/New_York');
// ENVIRONMENT // ENVIRONMENT
// //

View file

@ -28,7 +28,6 @@ $lang['action_blog_tip'] = 'View my blog';
$lang['alt_button_eyes'] = 'Best viewed with eyes'; $lang['alt_button_eyes'] = 'Best viewed with eyes';
$lang['alt_button_vim'] = 'Edited with VIM'; $lang['alt_button_vim'] = 'Edited with VIM';
$lang['alt_button_gnu_linux'] = 'Made with GNU/Linux'; $lang['alt_button_gnu_linux'] = 'Made with GNU/Linux';
$lang['alt_button_eff'] = 'Support the Electronic Frontier Foundation!';
$lang['alt_button_apiopage'] = 'Memetic apiopage'; $lang['alt_button_apiopage'] = 'Memetic apiopage';
$lang['alt_website_logo'] = 'Website Logo'; $lang['alt_website_logo'] = 'Website Logo';