diff --git a/pelicanconf.py b/pelicanconf.py index 2dc1183..0819db3 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -33,4 +33,4 @@ AUTHOR_FEED_RSS = None DEFAULT_PAGINATION = 500 # Uncomment following line if you want document-relative URLs when developing -#RELATIVE_URLS = True +# RELATIVE_URLS = True diff --git a/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Bold.otf b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Bold.otf new file mode 100644 index 0000000..f6161b6 Binary files /dev/null and b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Bold.otf differ diff --git a/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-ExtraBold.otf b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-ExtraBold.otf new file mode 100644 index 0000000..9148892 Binary files /dev/null and b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-ExtraBold.otf differ diff --git a/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-ExtraLight.otf b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-ExtraLight.otf new file mode 100644 index 0000000..de5d4fe Binary files /dev/null and b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-ExtraLight.otf differ diff --git a/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Light.otf b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Light.otf new file mode 100644 index 0000000..f33b892 Binary files /dev/null and b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Light.otf differ diff --git a/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Medium.otf b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Medium.otf new file mode 100644 index 0000000..d428eb2 Binary files /dev/null and b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Medium.otf differ diff --git a/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Regular.otf b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Regular.otf new file mode 100644 index 0000000..fbb3483 Binary files /dev/null and b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Regular.otf differ diff --git a/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-SemiBold.otf b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-SemiBold.otf new file mode 100644 index 0000000..e64835a Binary files /dev/null and b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-SemiBold.otf differ diff --git a/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Thin.otf b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Thin.otf new file mode 100644 index 0000000..8644bba Binary files /dev/null and b/theme/wttf/static/fonts/arima-koshi/ArimaKoshi-Thin.otf differ diff --git a/theme/wttf/static/fonts/arima-koshi/OFL.txt b/theme/wttf/static/fonts/arima-koshi/OFL.txt new file mode 100644 index 0000000..3388006 --- /dev/null +++ b/theme/wttf/static/fonts/arima-koshi/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2015 The Arima Project Authors (info@ndiscovered.com) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/theme/wttf/static/fonts/liberation-serif/AUTHORS b/theme/wttf/static/fonts/liberation-serif/AUTHORS new file mode 100644 index 0000000..3bb7b6a --- /dev/null +++ b/theme/wttf/static/fonts/liberation-serif/AUTHORS @@ -0,0 +1,12 @@ +AUTHORS + +Current Contributors (sorted alphabetically): + - Pravin Satpute + Project Owner (Current) + Red Hat, Inc. + +Previous Contributors + + - Steve Matteson + Original Designer + Ascender, Inc. diff --git a/theme/wttf/static/fonts/liberation-serif/ChangeLog b/theme/wttf/static/fonts/liberation-serif/ChangeLog new file mode 100644 index 0000000..cd50871 --- /dev/null +++ b/theme/wttf/static/fonts/liberation-serif/ChangeLog @@ -0,0 +1,14 @@ +* Thu Oct 04 2012 Pravin Satpute +- Resolved "Glyphs with multiple unicode encodings inhibit subsetting" #851790 +- Resolved #851791, #854601 and #851825 +- Following GASP table version as per Liberation old version. (Anti-aliasing disabled) +- Added support for Serbian glyphs for wikipedia #657849 +- In Monospace fonts, isFixedPitch bit set via script for getting it recognized as Monospace in putty.exe + +* Fri Jul 06 2012 Pravin Satpute +- Initial version of Liberation fonts based on croscore fonts version 1.21.0 +- Converted TTF files into SFD files to be open source. +- Update Copyright and License file +- set fsType bit to 0, Installable Embedding is allowed. +- Absolute value in HHeadAscent/Descent values for maintaining Metric compatibility. + diff --git a/theme/wttf/static/fonts/liberation-serif/LICENSE b/theme/wttf/static/fonts/liberation-serif/LICENSE new file mode 100644 index 0000000..aba73e8 --- /dev/null +++ b/theme/wttf/static/fonts/liberation-serif/LICENSE @@ -0,0 +1,102 @@ +Digitized data copyright (c) 2010 Google Corporation + with Reserved Font Arimo, Tinos and Cousine. +Copyright (c) 2012 Red Hat, Inc. + with Reserved Font Name Liberation. + +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + +PREAMBLE The goals of the Open Font License (OFL) are to stimulate +worldwide development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to provide +a free and open framework in which fonts may be shared and improved in +partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. +The fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + + + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. +This may include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components +as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting ? in part or in whole ? +any of the components of the Original Version, by changing formats or +by porting the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical writer +or other person who contributed to the Font Software. + + +PERMISSION & CONDITIONS + +Permission is hereby granted, free of charge, to any person obtaining a +copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components,in + Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the + corresponding Copyright Holder. This restriction only applies to the + primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + +5) The Font Software, modified or unmodified, in part or in whole, must + be distributed entirely under this license, and must not be distributed + under any other license. The requirement for fonts to remain under + this license does not apply to any document created using the Font + Software. + + + +TERMINATION +This license becomes null and void if any of the above conditions are not met. + + + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER +DEALINGS IN THE FONT SOFTWARE. + diff --git a/theme/wttf/static/fonts/liberation-serif/LiberationSerif-Bold.ttf b/theme/wttf/static/fonts/liberation-serif/LiberationSerif-Bold.ttf new file mode 100644 index 0000000..db3d6f3 Binary files /dev/null and b/theme/wttf/static/fonts/liberation-serif/LiberationSerif-Bold.ttf differ diff --git a/theme/wttf/static/fonts/liberation-serif/LiberationSerif-BoldItalic.ttf b/theme/wttf/static/fonts/liberation-serif/LiberationSerif-BoldItalic.ttf new file mode 100644 index 0000000..8b21277 Binary files /dev/null and b/theme/wttf/static/fonts/liberation-serif/LiberationSerif-BoldItalic.ttf differ diff --git a/theme/wttf/static/fonts/liberation-serif/LiberationSerif-Italic.ttf b/theme/wttf/static/fonts/liberation-serif/LiberationSerif-Italic.ttf new file mode 100644 index 0000000..768b833 Binary files /dev/null and b/theme/wttf/static/fonts/liberation-serif/LiberationSerif-Italic.ttf differ diff --git a/theme/wttf/static/fonts/liberation-serif/LiberationSerif-Regular.ttf b/theme/wttf/static/fonts/liberation-serif/LiberationSerif-Regular.ttf new file mode 100644 index 0000000..6fa9a59 Binary files /dev/null and b/theme/wttf/static/fonts/liberation-serif/LiberationSerif-Regular.ttf differ diff --git a/theme/wttf/static/fonts/liberation-serif/README b/theme/wttf/static/fonts/liberation-serif/README new file mode 100644 index 0000000..572952a --- /dev/null +++ b/theme/wttf/static/fonts/liberation-serif/README @@ -0,0 +1,80 @@ + 1. What's this? + ================= + + The Liberation Fonts is font collection which aims to provide document + layout compatibility as usage of Times New Roman, Arial, Courier New. + + + 2. Requirements + ================= + + * fontforge is installed. + (http://fontforge.sourceforge.net) + + + 3. Install + ============ + + 3.1 Decompress tarball + + You can extract the files by following command: + + $ tar zxvf liberation-fonts-[VERSION].tar.gz + + 3.2 Build from the source + + Change into directory liberation-fonts-[VERSION]/ and build from sources by + following commands: + + $ cd liberation-fonts-[VERSION] + $ make + + The built font files will be available in 'build' directory. + + 3.3 Install to system + + For Fedora, you could manually install the fonts by copying the TTFs to + ~/.fonts for user wide usage, or to /usr/share/fonts/truetype/liberation + for system-wide availability. Then, run "fc-cache" to let that cached. + + For other distributions, please check out corresponding documentation. + + + 4. Usage + ========== + + Simply select preferred liberation font in applications and start using. + + + 5. License + ============ + + This Font Software is licensed under the SIL Open Font License, + Version 1.1. + + Please read file "LICENSE" for details. + + + 6. For Maintainers + ==================== + + Before packaging a new release based on a new source tarball, you have to + update the version suffix in the Makefile: + + VER = [VERSION] + + Make sure that the defined version corresponds to the font software metadata + which you can check with ftinfo/otfinfo or fontforge itself. It is highly + recommended that file 'ChangeLog' is updated to reflect changes. + + Create a tarball with the following command: + + $ make dist + + The new versioned tarball will be available in the dist/ folder as + 'liberation-fonts-[NEW_VERSION].tar.gz'. + + 7. Credits + ============ + + Please read file "AUTHORS" for list of contributors. diff --git a/theme/wttf/static/fonts/liberation-serif/TODO b/theme/wttf/static/fonts/liberation-serif/TODO new file mode 100644 index 0000000..efc0177 --- /dev/null +++ b/theme/wttf/static/fonts/liberation-serif/TODO @@ -0,0 +1,5 @@ +Here are todo for next release +1) Serbian glyph for wikipedia https://bugzilla.redhat.com/show_bug.cgi?id=657849 + - Improving shape of S_BE https://bugzilla.redhat.com/show_bug.cgi?id=657849#c96 +2) Liberation Mono not recognizing as Mono in Windows application #861003 + - presently it is patch, we have to update zero width characters to fixed width diff --git a/theme/wttf/static/main.css b/theme/wttf/static/main.css index 5476a2e..53bd527 100644 --- a/theme/wttf/static/main.css +++ b/theme/wttf/static/main.css @@ -1,97 +1,195 @@ - +@font-face{ + font-family: "serif"; + src:url('/theme/fonts/liberation-serif/LiberationSerif-Regular.ttf'); + font-weight: normal; + font-variant: normal; +} +@font-face{ + font-family: "headers"; + src:url('/theme/fonts/arima-koshi/ArimaKoshi-ExtraBold.otf'); + font-weight: normal; + font-variant: normal; +} body{ margin:0px; - font: 14px "ArimaKoshiRegular"; + font-size: 14px; + font-family: "serif"; color:midnightblue; -} -#menu select{ - height:3em; - vertical-align: middle; + background-color: #ff6341; + word-break: normal; } h1{ font-size: 42px; line-height:45px; margin-top: 0.3em; margin-bottom: 0.3em; - font: 36px "ArimaKoshiBlack"; - text-align:center; + font-size: 36px; + font-family: "headers"; + /*color:midnightblue;*/ + /*text-align:center;*/ font-weight: bold; } -article a{ - font-weight:bold; -} -article { +a, a:visited, a:active{ + color:black; } blockquote{ font-weight:bold; } a{ - color:lightseagreen; + /*color:lightseagreen;*/ text-decoration: none; } - -#content{ - width: 100%; +hr{ + border:0; + border-bottom:1px solid black; } -.featured { - max-width: calc(50% - 6em); - float: left; - margin: 2em; - padding:1em; - background-color: gainsboro; - /*background-color: powderblue;*/ - box-shadow: 1.1em 1.1em gainsboro; - font: 20px "ArimaKoshiRegular"; - line-height: 30px; - font-weight:500; +section{ + width: calc(100% - 4em); + padding:0 2em; } - -.featured:nth-child(even) { - float:right; +header{ + top:0; + height: auto; + margin:0 0 5em 0; + text-align: center; } + #menu{ + width: 100%; + margin:0; + font-size: 9vw; + line-height: 1.2; + color:white; + padding:90px 0; + background-color: black; + } + #menu.main{ + position: relative; + z-index: 10; + } + #menu select{ + height:5vw; + vertical-align: middle; + color:black; + padding: 0 0 0 1em; + margin:0 1em; + } + #menu.sticky{ + position: fixed; + font-size: 2em; + width: 100%; + top:0; + left:0; + padding:10px 0; + margin:0; + background-color: black; + } + #menu.sticky{ + z-index: 1; + } + #menu.sticky a{ + color:white; + } + #menu.sticky select{ + padding:0; + height: auto; + margin:0 0.5em; + } -.entry-title{ - text-align:right; - margin-right:2em; - margin-bottom:0em; -} -.entry-subtitle{ - font-size: 14px; - text-align:right; - margin-bottom:2em; - margin-right: 5.5em; -} -.entry-content{ - margin-right: auto; - margin-left: auto; - max-width:75%; - line-break:strict; -} -.entry-tags{ - font-weight:bold; -} -.entry-category{ - font-weight:bold; -} -.entry-date{ - font-style:italic; +#content{ + margin-bottom:5em; } + + .featured { + max-width: calc(50% - 1.5em); + float: left; + margin:2em 0; + color:rgb(0, 5, 33); + } + + .featured:nth-child(even) { + float:right; + margin-top: 10em; + } + .featured:nth-child(odd) { + clear: left; + } + .featured:last-of-type{ + margin-bottom:5em; + } + .entry-title{ + border: 0; + border-radius: 15px 50px; + background-color: white; + padding: 2em; + text-align: center; + } + .entry-title a{ + color:#ff6341; + } + .entry-subtitle{ + font-size: 12px; + line-height: 1.5; + text-align:left; + margin:2em 0 1em; + padding:0 20px; + color:white; + /*margin-left:50px;*/ + } + .entry-content{ + font: 16px serif; + line-height: 28px; + letter-spacing: 0.01em; + /*background-color: midnightblue;*/ + padding:0 20px; + color:black; + } + .entry-readmore a{ + text-decoration: underline; + } + .entry-tags a{ + font-weight:bold; + text-decoration: underline; + color:white; + } + +/* article pages */ +#content.article{ + max-width:900px; + margin:0 auto 5em auto; +} + #content.article .entry-content{ + font-size: 21px; + line-height: 1.7; + } + #list{ - width:100%; + margin:3em 0; clear: both; } + #list ul, #list li{ + list-style: none; + padding:0; + margin:2em 0; + } + #list .entry-title{ + margin-top:0; /* reset */ + margin-bottom:0; /* reset */ + padding:1em 2em; + } -#menu{ - max-width: calc(50% - 4em); - float:right; - margin-right: 4em; +footer{ + width: calc(100% - 4em); + margin:0; + padding:2em; + left:0; + background-color: rgb(228, 43, 3); + color:white; + clear:both; } -footer{clear:both;} - @media only screen and (orientation:portrait) { body { diff --git a/theme/wttf/templates/article.html b/theme/wttf/templates/article.html index 307256e..0e27f79 100644 --- a/theme/wttf/templates/article.html +++ b/theme/wttf/templates/article.html @@ -7,7 +7,7 @@ {% endblock %} {% block content %} -
+

{{ article.title }}

diff --git a/theme/wttf/templates/base.html b/theme/wttf/templates/base.html index 25eb1ad..67e5687 100644 --- a/theme/wttf/templates/base.html +++ b/theme/wttf/templates/base.html @@ -5,7 +5,8 @@ {% block title %}{{ SITENAME }}{% endblock title %} - + + {% if FEED_ALL_ATOM %} @@ -36,15 +37,25 @@ {% block content %} diff --git a/theme/wttf/templates/index.html b/theme/wttf/templates/index.html index 8b5cfa6..3b2b3ff 100644 --- a/theme/wttf/templates/index.html +++ b/theme/wttf/templates/index.html @@ -3,7 +3,7 @@ {% if articles %}
{% for article in articles_page.object_list %} - {% if loop.index <= 3 %} + {% if loop.index <= 5 %}

@@ -28,15 +28,15 @@
{{ article.content }}

- {% if loop.index < 3 %} + {% if loop.index < 5 %} {% if loop.last %}
{% endif %} {% endif %} - {% if loop.index == 3 %} + {% if loop.index == 5 %}
-

Other articles

+ Other articles
    {% endif %} @@ -49,8 +49,8 @@ {% endif %}
  • diff --git a/theme/wttf2/templates/article.html b/theme/wttf2/templates/article.html index 307256e..0e27f79 100644 --- a/theme/wttf2/templates/article.html +++ b/theme/wttf2/templates/article.html @@ -7,7 +7,7 @@ {% endblock %} {% block content %} -
    +

    {{ article.title }}