commit 9f60667bb10ae5e9329024b6127f3bd2c148b6ee
parent fd0d506a9722e8a9cad856a7832bd0afdb8a4709
Author: markseu <mark2011@mayberg.se>
Date: Tue, 5 Nov 2013 21:27:20 +0100
Hello web fonts (November update and license)
Diffstat:
4 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
@@ -16,9 +16,17 @@ How to make a website?
----------------------
You already have everything you need, start by editing the default pages.
For more information see [Yellow documentation](https://github.com/markseu/yellowcms-extensions/blob/master/documentation/README.md).
-
+
+License and acknowledgments
+---------------------------
+* Yellow and Yellow extensions are licensed under [GPLv2](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+* [PHP Markdown](https://github.com/michelf/php-markdown) by Michel Fortin is licensed under [BSD license](http://opensource.org/licenses/BSD-3-Clause)
+* [Font Awesome](https://github.com/FortAwesome/Font-Awesome) by Dave Gandy is licensed under [OFLv1.1](http://opensource.org/licenses/OFL-1.1)
+
+Yellow is open source. You can use it for free.
+
Need help? Have a question?
---------------------------
-Looking for something, then get in touch with others.
+Looking for something, then get in touch with other users.
Visit [Yellow on Reddit](http://www.reddit.com/r/yellowcms/),
follow [Yellow on Twitter](https://twitter.com/yellowcms).
\ No newline at end of file
diff --git a/system/core/core.php b/system/core/core.php
@@ -5,7 +5,7 @@
// Yellow main class
class Yellow
{
- const Version = "0.1.20";
+ const Version = "0.1.21";
var $page; //current page data
var $pages; //current page tree from file system
var $toolbox; //toolbox with helpers
@@ -1306,6 +1306,7 @@ class Yellow_Toolbox
$elementOffsetBytes = $elementFound ? $matches[0][1] : strlenb($text);
$string = html_entity_decode(substrb($text, $offsetBytes, $elementOffsetBytes - $offsetBytes), ENT_QUOTES, "UTF-8");
if(preg_match("/^(blockquote|br|div|h\d|hr|li|ol|p|pre|ul)/i", $elementName)) $string .= ' ';
+ if(preg_match("/^\/(code|pre)/i", $elementName)) $string = preg_replace("/^(\d+\n){2,}$/", "", $string);
$string = preg_replace("/\s+/s", " ", $string);
if(substru($string, 0 , 1)==" " && (empty($output) || substru($output, -1)==' ')) $string = substru($string, 1);
$length = strlenu($string);
diff --git a/system/core/core_fontawesome.woff b/system/core/core_fontawesome.woff
Binary files differ.
diff --git a/system/core/core_webinterface.css b/system/core/core_webinterface.css
@@ -1,4 +1,4 @@
-/* Yellow web interface 0.1.1 */
+/* Yellow web interface 0.1.2 */
.yellow-bar { position:relative; overflow:hidden; line-height:2.0em; }
.yellow-barleft { display:block; float:left; }
@@ -48,4 +48,18 @@
#yellow-paneedit #yellow-editinfo { margin:0; padding:5px; border:1px solid #bbb; display:none; }
#yellow-paneedit #yellow-editbuttons { margin:5px 0; }
#yellow-paneshow { min-width:20em; overflow:auto; }
-#yellow-paneuser { }
-\ No newline at end of file
+#yellow-paneuser { }
+
+/* Font icons from Fontawesome */
+
+@font-face { font-family:'FontAwesome'; font-style:normal; font-weight:normal; src:url('core_fontawesome.woff'); }
+[class*="yellow-icon-"] {
+ font-family:FontAwesome;
+ font-style:normal;
+ font-weight:normal;
+ -webkit-font-smoothing:antialiased;
+}
+.yellow-icon-search:before { content:"\f002"; }
+.yellow-icon-trash-o:before { content:"\f014"; }
+.yellow-icon-caret-down:before { content:"\f0d7"; }
+.yellow-icon-caret-up:before { content:"\f0d8"; }
+\ No newline at end of file
