diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index b76032c..189990a 100644 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -7,5 +7,16 @@ .nav-usertools { ul{ float: right; + li{ + display: inline-block; + float: right; + border: 1px solid @color-border; + *{ + font-size: .8rem; + } + a{ + .profile; + } + } } } diff --git a/css/base.less b/css/base.less index 2f2208c..b4c198b 100755 --- a/css/base.less +++ b/css/base.less @@ -83,7 +83,7 @@ - +@color-border: __border__; /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* all media */ diff --git a/css/base_fonts.less b/css/base_fonts.less index f851b33..5f3142e 100755 --- a/css/base_fonts.less +++ b/css/base_fonts.less @@ -4,7 +4,7 @@ * @author Jana Deutschlaender */ - +/* web font */ .setLocalFontFace('roboto',300,'Roboto Light','Roboto-Light','roboto-light'); /* roboto light */ .setLocalFontFace('roboto',400,'Roboto','Roboto-Regular','roboto-regular'); /* roboto regular */ .setLocalFontFace('roboto',500,'Roboto Medium','Roboto-Medium','roboto-medium'); /* roboto medium */ @@ -12,3 +12,21 @@ .setLocalFontFace('roboto',400,'Roboto Condensed','RobotoCondensed-Regular','roboto-condensed'); /* roboto condensed */ .setLocalFontFace('roboto',700,'Roboto Condensed Bold','RobotoCondensed-Bold','roboto-boldcondensed'); /* roboto condensed */ + +/* icon font */ +.setIconFontFace('fontello','fontello'); + +.icon, [class^="icon-"], [class*=" icon-"], +.profile, +.log-in, +.log-out{ + .fontello(); +} + +/* custom icon font */ +@import (less) "../fonts/icons/fontello-codes.css"; + +.profile{ + .icon-user; +} + diff --git a/css/base_mixins.less b/css/base_mixins.less index fc23ffd..e34ea1a 100644 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -12,11 +12,59 @@ font-family: @fontFamily; font-style: normal; font-weight: @fontWeight; - src: ~"local('@{localFontName}'), local("~"'@{localFontNameVar}'), url("~"@{filename}.eot)"; - src: ~"url("~"@{filename}.eot?#iefix') format('embedded-opentype'), url("~"@{filename}.woff') format('woff')"; + src: ~"local('@{localFontName}'), local("~"'@{localFontNameVar}'), url(fonts/"~"@{filename}.eot)"; + src: ~"url(fonts/"~"@{filename}.eot?#iefix) format('embedded-opentype'), url(fonts/"~"@{filename}.woff) format('woff')"; } } +.setIconFontFace(@fontFamily,@filename){ + @font-face { + font-family: @fontFamily; + src: ~"url('fonts/icons/"~"@{filename}.eot?6762325')"; + src: ~"url('fonts/icons/"~"@{filename}.eot?6762325#iefix') format('embedded-opentype'), url('fonts/icons/"~"@{filename}.woff2?6762325') format('woff2'), url('fonts/icons/"~"@{filename}.woff?6762325') format('woff'), url('fonts/icons/"~"@{filename}.ttf?6762325') format('truetype'), url('fonts/icons/"~"@{filename}.svg?6762325#fontello') format('svg')"; + font-weight: normal; + font-style: normal; + } +} + +.fontello(){ + &:before{ + font-family: "topmeteo"; + font-style: normal; + font-weight: normal; + speak: none; + + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + + /* For safety - reset parent styles, that can break glyph codes*/ + font-variant: normal; + text-transform: none; + + /* fix buttons height, for twitter bootstrap */ + line-height: 1em; + + /* Animation center compensation - margins should be symmetric */ + /* remove if not needed */ + margin-left: .2em; + + /* you can be more comfortable with increased icons size */ + /* font-size: 120%; */ + + /* Font smoothing. That was taken from TWBS */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + /* Uncomment for 3D effect */ + /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ + } + +} + + /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* Screenreader / Hide */ diff --git a/fonts/icons/LICENSE.txt b/fonts/icons/LICENSE.txt new file mode 100644 index 0000000..3d253ab --- /dev/null +++ b/fonts/icons/LICENSE.txt @@ -0,0 +1,57 @@ +Font license info + + +## Entypo + + Copyright (C) 2012 by Daniel Bruce + + Author: Daniel Bruce + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://www.entypo.com + + +## Font Awesome + + Copyright (C) 2016 by Dave Gandy + + Author: Dave Gandy + License: SIL () + Homepage: http://fortawesome.github.com/Font-Awesome/ + + +## Elusive + + Copyright (C) 2013 by Aristeides Stathopoulos + + Author: Aristeides Stathopoulos + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://aristeides.com/ + + +## Fontelico + + Copyright (C) 2012 by Fontello project + + Author: Crowdsourced, for Fontello project + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://fontello.com + + +## Typicons + + (c) Stephen Hutchings 2012 + + Author: Stephen Hutchings + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://typicons.com/ + + +## Linecons + + Copyright (C) 2013 by Designmodo + + Author: Designmodo for Smashing Magazine + License: CC BY () + Homepage: http://designmodo.com/linecons-free/ + + diff --git a/fonts/icons/README.txt b/fonts/icons/README.txt new file mode 100644 index 0000000..beaab33 --- /dev/null +++ b/fonts/icons/README.txt @@ -0,0 +1,75 @@ +This webfont is generated by http://fontello.com open source project. + + +================================================================================ +Please, note, that you should obey original font licenses, used to make this +webfont pack. Details available in LICENSE.txt file. + +- Usually, it's enough to publish content of LICENSE.txt file somewhere on your + site in "About" section. + +- If your project is open-source, usually, it will be ok to make LICENSE.txt + file publicly available in your repository. + +- Fonts, used in Fontello, don't require a clickable link on your site. + But any kind of additional authors crediting is welcome. +================================================================================ + + +Comments on archive content +--------------------------- + +- /font/* - fonts in different formats + +- /css/* - different kinds of css, for all situations. Should be ok with + twitter bootstrap. Also, you can skip style and assign icon classes + directly to text elements, if you don't mind about IE7. + +- demo.html - demo file, to show your webfont content + +- LICENSE.txt - license info about source fonts, used to build your one. + +- config.json - keeps your settings. You can import it back into fontello + anytime, to continue your work + + +Why so many CSS files ? +----------------------- + +Because we like to fit all your needs :) + +- basic file, .css - is usually enough, it contains @font-face + and character code definitions + +- *-ie7.css - if you need IE7 support, but still don't wish to put char codes + directly into html + +- *-codes.css and *-ie7-codes.css - if you like to use your own @font-face + rules, but still wish to benefit from css generation. That can be very + convenient for automated asset build systems. When you need to update font - + no need to manually edit files, just override old version with archive + content. See fontello source code for examples. + +- *-embedded.css - basic css file, but with embedded WOFF font, to avoid + CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain. + We strongly recommend to resolve this issue by `Access-Control-Allow-Origin` + server headers. But if you ok with dirty hack - this file is for you. Note, + that data url moved to separate @font-face to avoid problems with + + +Copyright (C) 2016 by original authors @ fontello.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/icons/fontello.ttf b/fonts/icons/fontello.ttf new file mode 100644 index 0000000..aa40c3c Binary files /dev/null and b/fonts/icons/fontello.ttf differ diff --git a/fonts/icons/fontello.woff b/fonts/icons/fontello.woff new file mode 100644 index 0000000..62b8d5d Binary files /dev/null and b/fonts/icons/fontello.woff differ diff --git a/fonts/icons/fontello.woff2 b/fonts/icons/fontello.woff2 new file mode 100644 index 0000000..f6583e0 Binary files /dev/null and b/fonts/icons/fontello.woff2 differ diff --git a/style.ini b/style.ini index ccba310..ca7342e 100755 --- a/style.ini +++ b/style.ini @@ -101,7 +101,7 @@ __text_neu__ = "#656565" ; @ini_text_neu __background_neu__ = "#ffffff" ; @ini_background_neu ; border color -__border__ = "#3c3c3c" ; @ini_border +__border__ = "#cccccc" ; @ini_border ; highlighted text (e.g. search snippets) __highlight__ = "#efefef" ; @ini_highlight diff --git a/template.info.txt b/template.info.txt index 5afcda3..a9ad526 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ -base starter -author Anika Henke -email anika@selfthinker.org -date 2015-08-01 -name Starter Template -desc The template that gets you started -url https://www.dokuwiki.org/template:starter +base sprintdoc +author Jana Deutschlaender +email deutschlaender@cosmocode.de +date 2016-12-05 +name sprintDoc Template +desc DokuWiki Template for sprintDoc Project +url FIXME URL