roboto and roboto condensed font
nav-direct and magicMatcher
This commit is contained in:
Jana Deutschländer
parent
e3c2980513
commit
40e8d24498
18 changed files with 283 additions and 40 deletions
155
css/base.less
155
css/base.less
|
|
@ -3,3 +3,158 @@
|
|||
*
|
||||
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
|
||||
*/
|
||||
|
||||
@media screen{
|
||||
|
||||
html {
|
||||
-ms-text-size-adjust: 100%;
|
||||
-webkit-text-size-adjust: 100%;
|
||||
}
|
||||
|
||||
article, aside, details, figcaption, figure, footer, header,
|
||||
main, menu, nav, section, summary {
|
||||
display: block;
|
||||
}
|
||||
|
||||
audio, canvas, progress, video {
|
||||
display: inline-block;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
audio:not([controls]) {
|
||||
display: none;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
[hidden],
|
||||
template {
|
||||
display: none;
|
||||
}
|
||||
|
||||
a:active,
|
||||
a:hover {
|
||||
outline: 0;
|
||||
}
|
||||
|
||||
abbr[title] {
|
||||
border-bottom: 1px dotted;
|
||||
}
|
||||
|
||||
small {
|
||||
font-size: 80%;
|
||||
}
|
||||
|
||||
sub,
|
||||
sup {
|
||||
font-size: 75%;
|
||||
line-height: 0;
|
||||
position: relative;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
sup {
|
||||
top: -0.5em;
|
||||
}
|
||||
|
||||
sub {
|
||||
bottom: -0.25em;
|
||||
}
|
||||
|
||||
svg:not(:root) {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
hr {
|
||||
box-sizing: content-box;
|
||||
height: 0;
|
||||
}
|
||||
pre {
|
||||
overflow: auto;
|
||||
}
|
||||
code,
|
||||
kbd,
|
||||
pre,
|
||||
samp {
|
||||
font-family: monospace, monospace;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
button,
|
||||
input,
|
||||
optgroup,
|
||||
select,
|
||||
textarea {
|
||||
color: inherit;
|
||||
font: inherit;
|
||||
margin: 0;
|
||||
}
|
||||
button {
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
button,
|
||||
select {
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
input[type="checkbox"],
|
||||
input[type="radio"] {
|
||||
box-sizing: border-box;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
input[type="number"]::-webkit-inner-spin-button,
|
||||
input[type="number"]::-webkit-outer-spin-button {
|
||||
height: auto;
|
||||
}
|
||||
|
||||
input[type="search"] {
|
||||
-webkit-appearance: textfield;
|
||||
box-sizing: content-box;
|
||||
}
|
||||
|
||||
input[type="search"]::-webkit-search-cancel-button,
|
||||
input[type="search"]::-webkit-search-decoration {
|
||||
-webkit-appearance: none;
|
||||
}
|
||||
legend {
|
||||
border: 0;
|
||||
padding: 0;
|
||||
}
|
||||
textarea {
|
||||
overflow: auto;
|
||||
}
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
border-spacing: 0;
|
||||
}
|
||||
|
||||
td,
|
||||
th {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
html, body, div, span, applet, object, iframe,
|
||||
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
|
||||
a, abbr, acronym, address, big, cite, del, dfn, em, img, ins, kbd, q, s, samp,
|
||||
small, strike, strong, sub, sup, tt, var,
|
||||
b, u, i, center,
|
||||
dl, dt, dd, ol, ul, li,
|
||||
fieldset, form, label, legend,
|
||||
table, caption, tbody, tfoot, thead, tr, th, td,
|
||||
article, aside, canvas, details, embed,
|
||||
figure, figcaption, footer, header,
|
||||
menu, nav, output, ruby, section, summary,
|
||||
time, mark, audio, video {
|
||||
font-family: __font_family_screen__;
|
||||
color: @ini_text;
|
||||
}
|
||||
|
||||
code{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@media print{
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,3 +5,11 @@
|
|||
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
|
||||
*/
|
||||
|
||||
|
||||
html, body{
|
||||
background-color: @ini_background;
|
||||
}
|
||||
|
||||
a{
|
||||
color: @ini_existing;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,3 +3,59 @@
|
|||
*
|
||||
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
|
||||
*/
|
||||
|
||||
|
||||
/* roboto light */
|
||||
@font-face {
|
||||
font-family: 'roboto';
|
||||
font-style: normal;
|
||||
font-weight: 300;
|
||||
src: local('Roboto Light'), local('Roboto-Light'), url('/lib/tpl/sprintdoc-template/fonts/roboto-light.eot');
|
||||
src: url('/lib/tpl/sprintdoc-template/fonts/roboto-light.eot?#iefix') format('embedded-opentype'), url('/lib/tpl/sprintdoc-template/fonts/roboto-light.woff') format('woff');
|
||||
}
|
||||
|
||||
/* roboto regular */
|
||||
@font-face {
|
||||
font-family: 'roboto';
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
src: local('Roboto'), local('Roboto-Regular'), url('/lib/tpl/sprintdoc-template/fonts/roboto-regular.eot');
|
||||
src: url('/lib/tpl/sprintdoc-template/fonts/roboto-regular.eot?#iefix') format('embedded-opentype'), url('/lib/tpl/sprintdoc-template/fonts/roboto-regular.woff') format('woff');
|
||||
}
|
||||
|
||||
/* roboto medium */
|
||||
@font-face {
|
||||
font-family: 'roboto';
|
||||
font-style: normal;
|
||||
font-weight: 500;
|
||||
src: local('Roboto Medium'), local('Roboto-Medium'), url('/lib/tpl/sprintdoc-template/fonts/roboto-medium.eot');
|
||||
src: url('/lib/tpl/sprintdoc-template/fonts/roboto-medium.eot?#iefix') format('embedded-opentype'), url('/lib/tpl/sprintdoc-template/fonts/roboto-medium.woff') format('woff');
|
||||
}
|
||||
|
||||
/* roboto bold */
|
||||
@font-face {
|
||||
font-family: 'roboto';
|
||||
font-style: normal;
|
||||
font-weight: 700;
|
||||
src: local('Roboto Bold'), local('Roboto-Bold'), url('/lib/tpl/sprintdoc-template/fonts/roboto-bold.eot');
|
||||
src: url('/lib/tpl/sprintdoc-template/fonts/roboto-bold.eot?#iefix') format('embedded-opentype'), url('/lib/tpl/sprintdoc-template/fonts/roboto-bold.woff') format('woff');
|
||||
}
|
||||
|
||||
/* roboto condensed */
|
||||
@font-face {
|
||||
font-family: 'roboto condensed';
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
src: local('Roboto Condensed'), local('RobotoCondensed-Regular'), url('/lib/tpl/sprintdoc-template/fonts/roboto-condensed.eot');
|
||||
src: url('/lib/tpl/sprintdoc-template/fonts/roboto-condensed.eot?#iefix') format('embedded-opentype'), url('/lib/tpl/sprintdoc-template/fonts/roboto-condensed.woff') format('woff');
|
||||
}
|
||||
|
||||
/* roboto condensed bold */
|
||||
@font-face {
|
||||
font-family: 'roboto condensed';
|
||||
font-style: normal;
|
||||
font-weight: 700;
|
||||
src: local('Roboto Condensed Bold'), local('RobotoCondensed-Bold'), url('/lib/tpl/sprintdoc-template/fonts/roboto-boldcondensed.eot');
|
||||
src: url('/lib/tpl/sprintdoc-template/fonts/roboto-boldcondensed.eot?#iefix') format('embedded-opentype'), url('/lib/tpl/sprintdoc-template/fonts/roboto-boldcondensed.woff') format('woff');
|
||||
}
|
||||
|
||||
|
|
|
|||
BIN
fonts/roboto-bold.eot
Normal file
BIN
fonts/roboto-bold.eot
Normal file
Binary file not shown.
BIN
fonts/roboto-bold.woff
Normal file
BIN
fonts/roboto-bold.woff
Normal file
Binary file not shown.
BIN
fonts/roboto-boldcondensed.eot
Normal file
BIN
fonts/roboto-boldcondensed.eot
Normal file
Binary file not shown.
BIN
fonts/roboto-boldcondensed.woff
Normal file
BIN
fonts/roboto-boldcondensed.woff
Normal file
Binary file not shown.
BIN
fonts/roboto-condensed.eot
Normal file
BIN
fonts/roboto-condensed.eot
Normal file
Binary file not shown.
BIN
fonts/roboto-condensed.woff
Normal file
BIN
fonts/roboto-condensed.woff
Normal file
Binary file not shown.
BIN
fonts/roboto-light.eot
Normal file
BIN
fonts/roboto-light.eot
Normal file
Binary file not shown.
BIN
fonts/roboto-light.woff
Normal file
BIN
fonts/roboto-light.woff
Normal file
Binary file not shown.
BIN
fonts/roboto-medium.eot
Normal file
BIN
fonts/roboto-medium.eot
Normal file
Binary file not shown.
BIN
fonts/roboto-medium.woff
Normal file
BIN
fonts/roboto-medium.woff
Normal file
Binary file not shown.
BIN
fonts/roboto-regular.eot
Normal file
BIN
fonts/roboto-regular.eot
Normal file
Binary file not shown.
BIN
fonts/roboto-regular.woff
Normal file
BIN
fonts/roboto-regular.woff
Normal file
Binary file not shown.
27
main.php
27
main.php
|
|
@ -97,27 +97,10 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
|
|||
|
||||
|
||||
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
|
||||
/* nav-direct */
|
||||
/* template Include: tpl/nav-direct */
|
||||
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
|
||||
?>
|
||||
|
||||
<div id="dokuwiki_direct" class="nav-direct no-print">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
|
||||
<p>
|
||||
<span class="sr-out"><?php echo tpl_getLang('direct_prefix'); ?>: </span>
|
||||
<span class="skip">
|
||||
<a href="#content"><?php echo tpl_getLang('direct_content_main'); ?></a><span class="sr-out"> /</span>
|
||||
<a href="#nav-main"><?php echo tpl_getLang('direct_menu_main'); ?></a>
|
||||
</span>
|
||||
</p>
|
||||
|
||||
</div><!-- .col -->
|
||||
</div><!-- .row -->
|
||||
</div><!-- .container -->
|
||||
</div><!-- .nav-direct -->
|
||||
<?php include('tpl/nav-direct.php') ?>
|
||||
|
||||
|
||||
<div class="page-wrapper <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>">
|
||||
|
|
@ -144,6 +127,12 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
|
|||
|
||||
<div id="dokuwiki_magic-matcher" class="magic-matcher no-print">
|
||||
<div class="container">
|
||||
<?php
|
||||
$mm = plugin_load('helper', 'magicmatcher_context');
|
||||
if($mm){
|
||||
$mm->tpl();
|
||||
}
|
||||
?>
|
||||
</div><!-- .container -->
|
||||
</div><!-- .magic-matcher -->
|
||||
<?php
|
||||
|
|
|
|||
55
style.ini
55
style.ini
|
|
@ -19,10 +19,10 @@
|
|||
|
||||
[stylesheets]
|
||||
|
||||
; * * * * * * * * * * * * * * * * * * * * *
|
||||
; DokuWiki Default Template Styles
|
||||
; * * * * * * * * * * * * * * * * * * * * *
|
||||
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
; DokuWiki Default Template Styles
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
|
||||
../dokuwiki/css/_imgdetail.css = screen
|
||||
../dokuwiki/css/_media_popup.css = screen
|
||||
|
|
@ -41,10 +41,9 @@
|
|||
../dokuwiki/css/_admin.css = screen
|
||||
|
||||
|
||||
|
||||
; * * * * * * * * * * * * * * * * * * * * *
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
; sprintDoc Template Styles
|
||||
; * * * * * * * * * * * * * * * * * * * * *
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
|
||||
; responsive behaviour for structure and areas is handled in style modules
|
||||
|
||||
|
|
@ -81,30 +80,44 @@ css/print.css = print
|
|||
|
||||
[replacements]
|
||||
|
||||
;--------------------------------------------------------------------------
|
||||
;------ guaranteed dokuwiki color placeholders that every plugin can use
|
||||
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
; guaranteed dokuwiki color placeholders that every plugin can use
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
|
||||
; main text and background colors
|
||||
__text__ = "#333" ; @ini_text
|
||||
__background__ = "#fff" ; @ini_background
|
||||
__text__ = "#252525" ; @ini_text
|
||||
__background__ = "#ECECEC" ; @ini_background
|
||||
|
||||
; alternative text and background colors
|
||||
__text_alt__ = "#999" ; @ini_text_alt
|
||||
__background_alt__ = "#eee" ; @ini_background_alt
|
||||
__text_alt__ = "#454545" ; @ini_text_alt
|
||||
__background_alt__ = "#e8e8e8" ; @ini_background_alt
|
||||
|
||||
; neutral text and background colors
|
||||
__text_neu__ = "#666" ; @ini_text_neu
|
||||
__background_neu__ = "#ddd" ; @ini_background_neu
|
||||
__text_neu__ = "#656565" ; @ini_text_neu
|
||||
__background_neu__ = "#ffffff" ; @ini_background_neu
|
||||
|
||||
; border color
|
||||
__border__ = "#ccc" ; @ini_border
|
||||
__border__ = "#3c3c3c" ; @ini_border
|
||||
|
||||
; highlighted text (e.g. search snippets)
|
||||
__highlight__ = "#ff9" ; @ini_highlight
|
||||
__highlight__ = "#efefef" ; @ini_highlight
|
||||
|
||||
;--------------------------------------------------------------------------
|
||||
|
||||
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
; template specific placeholders
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
|
||||
; these are used for links
|
||||
__existing__ = "#090" ; @ini_existing
|
||||
__missing__ = "#f30" ; @ini_missing
|
||||
__existing__ = "#286da8" ; @ini_existing
|
||||
__missing__ = "#CD5360" ; @ini_missing
|
||||
|
||||
; widths
|
||||
__site_width__ = "64em" ; @ini_site_width
|
||||
__sidebar_width__ = "16em" ; @ini_sidebar_width
|
||||
__site_width__ = "64em" ; @ini_site_width
|
||||
__sidebar_width__ = "16em" ; @ini_sidebar_width
|
||||
|
||||
__font_family_screen__ = "roboto, 'helvetica', arial, sans-serif"
|
||||
__font_family_menu__ = "'roboto condensed', 'helvetica neue', arial, sans-serif"
|
||||
__font_family_print__ = "'times new roman', serif"
|
||||
|
||||
|
|
|
|||
22
tpl/nav-direct.php
Normal file
22
tpl/nav-direct.php
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
<?php
|
||||
if (!defined('DOKU_INC')) die();
|
||||
?>
|
||||
|
||||
<div id="dokuwiki_direct" class="nav-direct no-print">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
|
||||
<p>
|
||||
<span class="sr-out"><?php echo tpl_getLang('direct_prefix'); ?>: </span>
|
||||
<span class="skip">
|
||||
<a href="#content"><?php echo tpl_getLang('direct_content_main'); ?></a><span class="sr-out"> /</span>
|
||||
<a href="#nav-main"><?php echo tpl_getLang('direct_menu_main'); ?></a>
|
||||
</span>
|
||||
</p>
|
||||
|
||||
</div><!-- .col -->
|
||||
</div><!-- .row -->
|
||||
</div><!-- .container -->
|
||||
</div><!-- .nav-direct -->
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue