EH22/dokuwiki-template-sprintdoc-modified
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge mit spis vorbereiten

Browse source
This commit is contained in:
Jana Deutschländer 2017-01-11 15:51:10 +01:00
commit 659ce8325f
10 changed files with 116 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
css/area_content.less
View file

@ -14,7 +14,7 @@
&::before{ &::before{
content: ""; content: "";
background-color: @background_page-header; background-color: @background_page-header;
border-bottom: 1px solid @color-border; border-bottom: 1px solid @color-border-light;
position: absolute; position: absolute;
top: 0; left: 0; top: 0; left: 0;
height: 3rem; width: 100%; height: 3rem; width: 100%;

2
css/area_footer.less
View file

@ -11,7 +11,7 @@
@media screen { @media screen {
.page-footer { .page-footer {
background: @background_page-header; background: @background_page-header;
border-top: 1px solid @color-border; border-top: 1px solid @color-border-light;
font-size: @font-size-default; font-size: @font-size-default;
padding: @margin-small (@margin-big - .5); padding: @margin-small (@margin-big - .5);
text-align: right; text-align: right;

2
css/area_nav-breadcrumb.less
View file

@ -6,7 +6,7 @@
.breadcrumbs { .breadcrumbs {
position: relative; position: relative;
border-bottom: 1px solid @color-border; border-bottom: 1px solid @color-border-light;
padding: .8rem @margin-default @very-small-spacing; padding: .8rem @margin-default @very-small-spacing;
> p { > p {

171
css/area_sidebar-search.less
View file

@ -1,78 +1,93 @@
/** /**
* This file provides the design styles for the quick search. * This file provides the design styles for the quick search.
* *
* @author Jana Deutschlaender <deutschlaender@cosmocode.de> * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/ */
.search.main-sidebar { .search.main-sidebar {
form {
@icon-size: 40px; form {
@icon-size: 40px;
display: block;
margin: @margin-default 0; display: block;
margin: 0 0 @margin-default;
.no {
#qsearch__in { .no {
width: 100%; #qsearch__in {
padding-left: 10px; width: 100%;
padding-right: (@icon-size + 10); padding-left: 10px;
} padding-right: (@icon-size + 10);
} }
}
input {
min-height: @icon-size; input {
box-sizing: border-box; min-height: @icon-size;
} box-sizing: border-box;
}
button[type="submit"] {
.fontello(); button[type="submit"] {
.hide-text-show-before(); .fontello();
.icon-search(); .hide-text-show-before();
.icon-search();
position: relative;
width: @icon-size; position: relative;
min-height: @icon-size; width: @icon-size;
overflow: visible; min-height: @icon-size;
background-image: none; overflow: visible;
background-color: transparent; background-image: none;
border: solid 1px transparent; background-color: transparent;
border-right-color: @color-border; border: solid 1px transparent;
color: @color-nav; border-right-color: @color-border;
margin-left: -(@icon-size); color: @color-nav;
padding: 0; margin-left: -(@icon-size);
transition: @transition color, @transition background-color, @transition border-color; padding: 0;
transition: @transition color, @transition background-color, @transition border-color;
&:hover,
&:focus, &:hover,
&:active { &:focus,
background-color: @button_color; &:active {
border: solid 1px @button_background; background-color: @button_color;
color: @button_background; border: solid 1px @button_background;
color: @button_background;
&::after {
background-color: @button_background; &::after {
} background-color: @button_background;
} }
}
&::before {
width: 100%; &::before {
color: inherit; width: 100%;
font-size: 25px; color: inherit;
text-align: center; font-size: 25px;
margin: 0; text-align: center;
} margin: 0;
}
&::after {
content: ''; &::after {
position: absolute; content: '';
top: 15%; position: absolute;
bottom: 15%; top: 15%;
width: 1px; bottom: 15%;
left: -1px; width: 1px;
background-color: @color-border; left: -1px;
transition: @transition background-color; background-color: @color-border;
} transition: @transition background-color;
} }
} }
} }
}
.wide-content{
.search.main-sidebar{
form{
.no {
#qsearch__in{
width: 0;
padding: 0;
margin: 0;
}
}
}
}
}

3
css/base.less
View file

@ -17,6 +17,7 @@
@color-text: __text__; @color-text: __text__;
@color-border: __border__; @color-border: __border__;
@color-border-light: __border_light__;
@color-nav: __nav_menu_color__; @color-nav: __nav_menu_color__;
@color-nav-hover: __nav_menu_hover_color__; @color-nav-hover: __nav_menu_hover_color__;
@color-nav-hover-bg: __nav_menu_hover_bg__; @color-nav-hover-bg: __nav_menu_hover_bg__;
@ -34,6 +35,8 @@
@box-shadow: __box_shadow__; @box-shadow: __box_shadow__;
@box-shadow-colored: __box_shadow_colored__; @box-shadow-colored: __box_shadow_colored__;
@th_background: __background_alt__;
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* global vars */ /* global vars */

4
css/base_design.less
View file

@ -10,6 +10,8 @@ html, body {
background-color: @color-site-bg; background-color: @color-site-bg;
} }
a { a {
color: @color-link; color: @color-link;
} }
@ -308,7 +310,7 @@ td {
th { th {
font-weight: bold; font-weight: bold;
background-color: @ini_background_alt; background-color: @th_background;
text-align: left; text-align: left;
} }

20
css/base_structure.less
View file

@ -121,9 +121,6 @@
.claim { .claim {
.logo { .logo {
position: absolute;
bottom: 1em;
overflow: visible;
img { img {
height: 60px; height: 60px;
@ -155,24 +152,17 @@
.claim { .claim {
.logo { .logo {
position: absolute;
bottom: 0;
height: 1px;
width: 100%; // fo IE
overflow: visible;
} }
.logo img { .logo img {
max-width: 100%;
height: auto;
} }
} }
} }
.wide-content{ .wide-content{
.logo{
visibility: hidden;
}
.content { .content {
.row > .col-xs-12{ .row > .col-xs-12{
width: auto; width: auto;
@ -225,9 +215,7 @@
#dokuwiki__header { #dokuwiki__header {
.logo { .logo {
width: 200px;
max-width: 33%;
margin: .8rem 0;
} }
} }

7
main.php
View file

@ -168,13 +168,6 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
<div class="search main-sidebar"> <div class="search main-sidebar">
<?php <?php
if (tpl_getConf('logo') && file_exists(mediaFN(tpl_getConf('logo')))){
if (tpl_getConf('logo_spacer') && file_exists(mediaFN(tpl_getConf('logo_spacer')))){
echo '<img width="5" height="5" src="'.ml(tpl_getConf('logo_spacer')).'" alt="" />';
} else{
echo '<img width="5" height="5" src="'.ml(tpl_getConf('logo')).'" alt="" />';
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */

6
style.ini
View file

@ -114,14 +114,14 @@ __background__ = "#ECECEC" ; @ini_background
; alternative text and background colors ; alternative text and background colors
__text_alt__ = "#454545" ; @ini_text_alt __text_alt__ = "#454545" ; @ini_text_alt
__background_alt__ = "#e8e8e8" ; @ini_background_alt __background_alt__ = "#f6f6f6" ; @ini_background_alt
; neutral text and background colors ; neutral text and background colors
__text_neu__ = "#656565" ; @ini_text_neu __text_neu__ = "#656565" ; @ini_text_neu
__background_neu__ = "#ffffff" ; @ini_background_neu __background_neu__ = "#ffffff" ; @ini_background_neu
; border color ; border color
__border__ = "#cccccc" ; @ini_border __border__ = "#bbbbbb" ; @ini_border
; highlighted text (e.g. search snippets) ; highlighted text (e.g. search snippets)
__highlight__ = "#efefef" ; @ini_highlight __highlight__ = "#efefef" ; @ini_highlight
@ -163,3 +163,5 @@ __background_site__ = "#ECECEC"
__default_border_radius__ = "5px" __default_border_radius__ = "5px"
__background_page-header__ = "#F6F6F6" __background_page-header__ = "#F6F6F6"
__border_light__ = "#dadada"

12
tpl/main-sidebar-search.php
View file

@ -1,6 +1,6 @@
<?php <?php
if (!defined('DOKU_INC')) die(); if (!defined('DOKU_INC')) die();
echo '<h6 class="sr-only" role="heading" aria-level="2">'.tpl_getLang('head_quick_search').'</h6>'; echo '<h6 class="sr-only" role="heading" aria-level="2">'.tpl_getLang('head_quick_search').'</h6>'; ?>
<p><a href="#qsearch__out"><span class="prefix">Zur Suche springen</span></a></p>
tpl_searchform(); <?php tpl_searchform(); ?>