From: Dylan Lloyd Date: Sat, 14 Nov 2015 03:49:29 +0000 (+0000) Subject: new title font, bg img, abstract title name to ini file X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=5f6c05fb2e7147dd96f16e00ba9e48aba978823c;hp=bc7141e7e29cfaf7fdcd93824d1a015fce88f8e7;p=dylansserver.git new title font, bg img, abstract title name to ini file --- diff --git a/font/breeserif-regular-webfont.eot b/font/breeserif-regular-webfont.eot new file mode 100644 index 0000000..2491aad Binary files /dev/null and b/font/breeserif-regular-webfont.eot differ diff --git a/font/breeserif-regular-webfont.svg b/font/breeserif-regular-webfont.svg new file mode 100644 index 0000000..fbefb7a --- /dev/null +++ b/font/breeserif-regular-webfont.svg @@ -0,0 +1,948 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/font/breeserif-regular-webfont.ttf b/font/breeserif-regular-webfont.ttf new file mode 100644 index 0000000..7a43ace Binary files /dev/null and b/font/breeserif-regular-webfont.ttf differ diff --git a/font/breeserif-regular-webfont.woff b/font/breeserif-regular-webfont.woff new file mode 100644 index 0000000..c066141 Binary files /dev/null and b/font/breeserif-regular-webfont.woff differ diff --git a/font/breeserif-regular-webfont.woff2 b/font/breeserif-regular-webfont.woff2 new file mode 100644 index 0000000..2d6449a Binary files /dev/null and b/font/breeserif-regular-webfont.woff2 differ diff --git a/images/noisy.png b/images/noisy.png new file mode 100644 index 0000000..8aa2f7a Binary files /dev/null and b/images/noisy.png differ diff --git a/includes/style.css b/includes/style.css index 596d072..38459c1 100644 --- a/includes/style.css +++ b/includes/style.css @@ -1,3 +1,16 @@ +@font-face { + font-family: 'bree_serifregular'; + src: url('/font/breeserif-regular-webfont.eot'); + src: url('/font/breeserif-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('/font/breeserif-regular-webfont.woff2') format('woff2'), + url('/font/breeserif-regular-webfont.woff') format('woff'), + url('/font/breeserif-regular-webfont.ttf') format('truetype'), + url('/font/breeserif-regular-webfont.svg#bree_serifregular') format('svg'); + font-weight: normal; + font-style: normal; + +} + @font-face { font-family: 'InconsolataMedium'; src: url('/font/inconsolata-webfont.eot'); @@ -26,18 +39,27 @@ padding:0; } body { -background-image: url('../images/gray_jean.png'); +background-image: url('../images/noisy.png'); +font-family:InconsolataMedium; margin-bottom: 15px; } h3 { margin-top:15px; -font-family:MuseoSlab500; +margin-bottom:5px; +font-family:'bree_serifregular'; +} + +.title { +margin-left:17px; +color:black; +font-family:'bree_serifregular'; +font-size: 404%; } h1,h2 { -font-size:150%; -font-family:MuseoSlab500; +font-size:256%; +font-family:'bree_serifregular'; } a { @@ -54,10 +76,6 @@ width:960px; margin:30px auto 0; } -#banner { -margin-left:15px; -} - #content { width:725px; min-height:300px; @@ -67,13 +85,10 @@ text-align:left; padding:5px 5px 25px 20px; } -#portfolio { +.portfolio { float:left; width:350px; -} - -#portfolio li { -font-family:InconsolataMedium; +margin-left:10px; } #exhibit { diff --git a/model/model.php b/model/model.php index f9bb164..fa75f65 100644 --- a/model/model.php +++ b/model/model.php @@ -2,7 +2,7 @@ class model { - private $config_file = '/etc/dylansserver.ini'; + private $config_file = '/etc/disinclined.ini'; protected $model; protected $recaptcha_publickey; protected $recaptcha_privatekey; @@ -23,7 +23,8 @@ class model { } $this->recaptcha_publickey = $config['recaptcha']['publickey']; $this->recaptcha_privatekey = $config['recaptcha']['privatekey']; - $this->title = $config['site']['default_title']; + $this->title = $config['site']['title']; + $this->tab_title = $config['site']['tab_title']; $this->home_link = $config['site']['home_link']; } @@ -31,7 +32,9 @@ class model { $args = func_get_args(); $statement = $this->db->prepare($args[0]); $args = array_slice($args, 1); - call_user_func_array(array($statement, 'bind_param'), &$args); + foreach($args as $key => $value) + $args[$key] = &$args[$key]; + call_user_func_array(array($statement, 'bind_param'), $args); $statement->execute(); $return = array(); $statement->store_result(); diff --git a/view/archive.php b/view/archive.php index 4bc6db7..043cefc 100644 --- a/view/archive.php +++ b/view/archive.php @@ -3,7 +3,7 @@ - <?php echo $this->title; ?> + <?php echo $this->tab_title; ?> @@ -28,11 +28,7 @@
- - + title ?>
- <?php echo $this->title ?> + <?php echo $this->tab_title ?> @@ -11,10 +11,7 @@
- + title ?>

diff --git a/view/note.php b/view/note.php index dfe0b58..5b39008 100644 --- a/view/note.php +++ b/view/note.php @@ -3,7 +3,7 @@ - <?php echo $this->title; ?> + <?php echo $this->tab_title; ?> @@ -28,11 +28,7 @@
- - + title ?>
diff --git a/view/page.php b/view/page.php index 482f543..6f1d0ee 100644 --- a/view/page.php +++ b/view/page.php @@ -3,7 +3,7 @@ - <?php echo $this->title; ?> + <?php echo $this->tab_title; ?> @@ -28,11 +28,7 @@
- - + title ?>
- dylansserver.com/notes/rss - https://dylansserver.com/notes - dylansserver.com/notes/rss - + disinclined.org/notes/rss + https://disinclined.org/notes + disinclined.org/notes/rss + items as $item) { echo "";