Hello web fonts (November update and license)
This commit is contained in:
parent
fd0d506a97
commit
9f60667bb1
4 changed files with 28 additions and 5 deletions
12
README.md
12
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).
|
|
@ -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);
|
||||
|
|
BIN
system/core/core_fontawesome.woff
Normal file
BIN
system/core/core_fontawesome.woff
Normal file
Binary file not shown.
|
@ -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 { }
|
||||
#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"; }
|
Loading…
Add table
Reference in a new issue