Miscellaneous improvemnts, Code highlightinn => Version 0.3

2015-06-11 11:39:54 +02:00 · 2015-06-11 11:39:54 +02:00 · 6d97a486d5
commit 6d97a486d5
parent 72e7f24db0
6 changed files with 224 additions and 204 deletions
--- a/config.php
+++ b/config.php
@ -12,7 +12,7 @@ $blogdescription = 'Rangitaki - A PHP blog engine without any database dependenc
 $blogfavicon = '../res/favicon.png';
 // Home - set yes if you want to link to your homepage and no if not
 $bloghome = 'yes';
-// Home URL - Set here the url to your main page. Either relative (e.g. '../') or absolute ('http://github.com')
+// Home URL - Set here the url to your main page. Either relative (e.g. '../') or absolute (e.g. 'http://github.com')
 $bloghomeurl = '../';
 // Home name - Set here an individual name for your main page
 $bloghomename = 'Home';
@ -21,7 +21,7 @@ $blogintro = 'yes';
 // Disqus - Provide here your Disqus shortname. Leave empty if you don't want to use it.
 $blogdisqus = 'rangitaki';
 // Google Analytics - Provide here your Google Analytics Tracking-ID. Leave empty if you don't want to use it.
-$bloganalytics = 'UA-41767647-3';
+$bloganalytics = '';
 // Footer - set here the text for your footer (e.g. a copyright info).  You can replace the whole text after the '=' with your own one.
 $blogfooter = 'Rangitaki ' .  date("Y") . ' <a href="https://github.com/mmk2410/Rangitaki" target="blank">github.com/mmk2410/Rangitaki</a>';
 ?>
--- a/index.php
+++ b/index.php
@ -39,6 +39,9 @@ THE SOFTWARE.
    <link rel="stylesheet" type="text/css" href="res/css/blog.css" />
    <link href='http://fonts.googleapis.com/css?family=Roboto:400,500,700,300,400italic,100,100italic,900' rel='stylesheet' type='text/css'>
    <link rel="shortcut icon" href="res/favicon.png">
+    <link rel="stylesheet" href="./res/css/github-gist.css">
+    <script src="./res/js/highlight.pack.js"></script>
+    <script>hljs.initHighlightingOnLoad();</script>
 </head>

 <body>
@ -58,8 +61,6 @@ THE SOFTWARE.
                    $intro = Parsedown::instance()
                        ->setBreaksEnabled(true)
                        ->text($file);
-                    $UmlautConverter = new UmlautConverter;
-                    $intro = $UmlautConverter->convert($intro);
                    echo $intro;
                }
            ?>
--- a/res/css/blog.css
+++ b/res/css/blog.css
@ -168,11 +168,6 @@ Usage: <a class=".text_button_flat_colored">YOUR TEXT</a>
    max-width: 35%;
 }

-code{
-    background-color: #e8e6e6;
-    padding: 5px;
-}
-
 .texttitle{
    font-family: 'Roboto', sans-serif;
    font-weight: 500;
--- a/res/css/design.scss
+++ b/res/css/design.scss
@ -1,195 +0,0 @@
-/*
-The MIT License
-
-Copyright 2015 mmk.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-/* 
-    Created on : Jun 10, 2015, 9:57:04 AM
-    Author     : mmk2410
-*/
-
-$primary-color: #ff4415;
-$font-family: 'Roboto', sans-serif;
-
-body{
-    margin-right: 15%;
-    margin-left: 15%;
-    margin-bottom: 0px;
-    margin-top: 100px;
-    font-family: $font-family;
-    font-size: 14px;
-    line-height: 20px;
-    letter-spacing: 0.01px;
-    background-color: #ffffff;
-    color: rgba(0, 0, 0, 0.87);
-}
-
-img{
-    max-width: 100%;
-    max-height: 400px;
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-
-.header{
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    float: center;
-    z-index: 40;
-    background: $primary-color;
-    width: 100%;
-    box-shadow: 0px 0px 4px 4px rgba(189, 189, 189, 0.5);
-    -moz-box-shadow: 0px 0px 4px 4px rgba(189, 189, 189, 0.5);
-    -webkit-box-shadow: 0px 0px 4px 4px rgba(189, 189, 189, 0.5);
-    height: 60px;
-    padding-right: 0px;
-    padding-top: 0px;
-    white-space: nowrap;
-}
-.text{    
-    font-family: $font-family;
-    font-size: 14px;
-    line-height: 20px;
-    letter-spacing: 0.01px;
-    background-color: #ffffff;
-    z-index: 10;
-    color: rgba(0, 0, 0, 0.87);
-}
-.text a{
-    font-family: $font-family;
-    font-size: 14px;
-    line-height: 20px;
-    letter-spacing: 0.01px;
-    color: $primary-color;
-    text-decoration: none;
-}
-section{
-    margin-bottom: 50px;
-}
-
-.title{
-    padding-left:15%;
-    height: 60px;
-    line-height: 60px;
-    display:inline-block;
-    text-decoration: none;
-    color: #FFFFFF;
-    vertical-align: middle;
-    font-size: 24px;
-    overflow-x: hidden;
-    max-width: 35%;
-}
-
-.home{
-    float: right;
-    padding-right: 15%;
-    height: 60px;
-    line-height: 60px;
-    vertical-align: middle;
-    color: #fff;
-    overflow-x: hidden;
-    font-size: 20px;
-    display: inline-block;
-    text-decoration: none;
-    max-width: 35%;
-}
-
-code{
-    background-color: #e8e6e6;
-    padding: 5px;
-}
-
-.texttitle{
-    font-family: $font-family;
-    font-weight: 500;
-    font-size: 20px;
-    color: rgb(33, 33, 33);
-    line-height: 24px;
-    letter-spacing: 0.05px;
-    text-decoration: none;
-}
-
-.texttitle:hover{
-    color: $primary-color;
-}
-
-.texttitlemono{
-    font-family: $font-family;
-    font-weight: 500;
-    font-size: 20px;
-    color: rgb(33, 33, 33);
-    line-height: 24px;
-    letter-spacing: 0.05px;
-    text-decoration: none;
-}
-
-.cc{
-    font-family: $font-family;
-    font-size: 12px;
-    line-height: 14px;
-    letter-spacing: 0.01px;
-    text-align: center;
-}
-
-.cc a{
-    font-family: 'Roboto', sans-serif;
-    font-size: 12px;
-    line-height: 14px;
-    letter-spacing: 0.01px;
-    color: rgba(0, 0, 0, 0.87);
-    text-decoration: none;
-}
-
-.cc a:hover{
-    text-decoration: underline;
-}
-
-.socialbar{
-    display: inline-block;
-    height: 68px;
-    margin-top: 10px;
-}
-
-.socialimg{
-    height: 40px;
-    display: inline-block;
-    padding-right: 5px;
-}
-
-@media screen and (max-width: 700px){
-    body {
-        margin-right: 40px;
-        margin-left: 20px;
-    }
-    .title{
-        padding-left: 10px;
-        max-width: 45%;
-    }
-    .home{
-        padding-right: 10px;
-        max-width: 45%;
-    }
-}
-
--- a/res/css/github-gist.css
+++ b/res/css/github-gist.css
@ -0,0 +1,218 @@
+/**
+ * GitHub Gist Theme
+ * Author : Louis Barranqueiro - https://github.com/LouisBarranqueiro
+ */
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+  -webkit-text-size-adjust: none;
+}
+
+.hljs-comment,
+.bash .hljs-shebang,
+.java .hljs-javadoc,
+.javascript .hljs-javadoc,
+.rust .hljs-preprocessor {
+  color: #969896;
+}
+
+.hljs-string,
+.apache .hljs-sqbracket,
+.coffeescript .hljs-subst,
+.coffeescript .hljs-regexp,
+.cpp .hljs-preprocessor,
+.c .hljs-preprocessor,
+.javascript .hljs-regexp,
+.json .hljs-attribute,
+.makefile .hljs-variable,
+.markdown .hljs-value,
+.markdown .hljs-link_label,
+.markdown .hljs-strong,
+.markdown .hljs-emphasis,
+.markdown .hljs-blockquote,
+.nginx .hljs-regexp,
+.nginx .hljs-number,
+.objectivec .hljs-preprocessor .hljs-title,
+.perl .hljs-regexp,
+.php .hljs-regexp,
+.xml .hljs-value,
+.less .hljs-built_in,
+.scss .hljs-built_in {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.css .hljs-at_rule,
+.css .hljs-important,
+.http .hljs-request,
+.ini .hljs-setting,
+.haskell .hljs-type,
+.java .hljs-javadoctag,
+.javascript .hljs-tag,
+.javascript .hljs-javadoctag,
+.nginx .hljs-title,
+.objectivec .hljs-preprocessor,
+.php .hljs-phpdoc,
+.sql .hljs-built_in,
+.less .hljs-tag,
+.less .hljs-at_rule,
+.scss .hljs-tag,
+.scss .hljs-at_rule,
+.scss .hljs-important,
+.stylus .hljs-at_rule,
+.go .hljs-typename,
+.swift .hljs-preprocessor {
+  color: #a71d5d;
+}
+
+.apache .hljs-common,
+.apache .hljs-cbracket,
+.apache .hljs-keyword,
+.bash .hljs-literal,
+.bash .hljs-built_in,
+.coffeescript .hljs-literal,
+.coffeescript .hljs-built_in,
+.coffeescript .hljs-number,
+.cpp .hljs-number,
+.cpp .hljs-built_in,
+.c .hljs-number,
+.c .hljs-built_in,
+.cs .hljs-number,
+.cs .hljs-built_in,
+.css .hljs-attribute,
+.css .hljs-hexcolor,
+.css .hljs-number,
+.css .hljs-function,
+.haskell .hljs-number,
+.http .hljs-literal,
+.http .hljs-attribute,
+.java .hljs-number,
+.javascript .hljs-built_in,
+.javascript .hljs-literal,
+.javascript .hljs-number,
+.json .hljs-number,
+.makefile .hljs-keyword,
+.markdown .hljs-link_reference,
+.nginx .hljs-built_in,
+.objectivec .hljs-literal,
+.objectivec .hljs-number,
+.objectivec .hljs-built_in,
+.php .hljs-literal,
+.php .hljs-number,
+.python .hljs-number,
+.ruby .hljs-prompt,
+.ruby .hljs-constant,
+.ruby .hljs-number,
+.ruby .hljs-subst .hljs-keyword,
+.ruby .hljs-symbol,
+.rust .hljs-number,
+.sql .hljs-number,
+.puppet .hljs-function,
+.less .hljs-number,
+.less .hljs-hexcolor,
+.less .hljs-function,
+.less .hljs-attribute,
+.scss .hljs-preprocessor,
+.scss .hljs-number,
+.scss .hljs-hexcolor,
+.scss .hljs-function,
+.scss .hljs-attribute,
+.stylus .hljs-number,
+.stylus .hljs-hexcolor,
+.stylus .hljs-attribute,
+.stylus .hljs-params,
+.go .hljs-built_in,
+.go .hljs-constant,
+.swift .hljs-built_in,
+.swift .hljs-number {
+  color: #0086b3;
+}
+
+.apache .hljs-tag,
+.cs .hljs-xmlDocTag,
+.css .hljs-tag,
+.xml .hljs-title,
+.stylus .hljs-tag {
+  color: #63a35c;
+}
+
+.bash .hljs-variable,
+.cs .hljs-preprocessor,
+.cs .hljs-preprocessor .hljs-keyword,
+.css .hljs-attr_selector,
+.css .hljs-value,
+.ini .hljs-value,
+.ini .hljs-keyword,
+.javascript .hljs-tag .hljs-title,
+.makefile .hljs-constant,
+.nginx .hljs-variable,
+.xml .hljs-tag,
+.scss .hljs-variable {
+  color: #333333;
+}
+
+.bash .hljs-title,
+.coffeescript .hljs-title,
+.cpp .hljs-title,
+.c .hljs-title,
+.cs .hljs-title,
+.css .hljs-id,
+.css .hljs-class,
+.css .hljs-pseudo,
+.ini .hljs-title,
+.haskell .hljs-title,
+.haskell .hljs-pragma,
+.java .hljs-title,
+.javascript .hljs-title,
+.makefile .hljs-title,
+.objectivec .hljs-title,
+.perl .hljs-sub,
+.php .hljs-title,
+.python .hljs-decorator,
+.python .hljs-title,
+.ruby .hljs-parent,
+.ruby .hljs-title,
+.rust .hljs-title,
+.xml .hljs-attribute,
+.puppet .hljs-title,
+.less .hljs-id,
+.less .hljs-pseudo,
+.less .hljs-class,
+.scss .hljs-id,
+.scss .hljs-pseudo,
+.scss .hljs-class,
+.stylus .hljs-class,
+.stylus .hljs-id,
+.stylus .hljs-pseudo,
+.stylus .hljs-title,
+.swift .hljs-title,
+.diff .hljs-chunk {
+  color: #795da3;
+}
+
+.coffeescript .hljs-reserved,
+.coffeescript .hljs-attribute {
+  color: #1d3e81;
+}
+
+.diff .hljs-chunk {
+  font-weight: bold;
+}
+
+.diff .hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.diff .hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.markdown .hljs-link_url {
+  text-decoration: underline;
+}
--- a/res/js/highlight.pack.js
+++ b/res/js/highlight.pack.js