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

Merge branch 'spis-master' into 'master'

Browse source 
spis-master: colors in icons, nav subsublist, editbutton hover

See merge request !70
This commit is contained in:
Jana Deutschländer 2017-05-11 16:32:56 +02:00
commit b98452ce4b
10 changed files with 126 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

6
css/area_main-content-secedit.less
View file

@ -1,14 +1,14 @@
/** /**
* This styles the "section editing button" * This styles the "section editing button" (if not added by data-plugin)
*/ */
#dokuwiki__content.main-content { #dokuwiki__content.main-content {
.editbutton_section { .secedit:not([class*="plugin"]):not([class*="table"]) {
position: relative; position: relative;
top: 0; top: 0;
float: right; float: right;
margin-top: 0; // for best position of edit-tab beneeth table margin-top: 0; // for best position of edit-tab beneath table
form div.no { form div.no {
button { button {

25
css/area_main-sidebar-nav.less
View file

@ -35,8 +35,9 @@
nav { nav {
&.nav-main { &.nav-main {
margin-bottom: 1rem; margin-bottom: @nav-margin;
} }
> p { > p {
color: @ini_nav_menu_color; color: @ini_nav_menu_color;
@ -49,6 +50,11 @@
} }
} }
ul,
div.nav {
margin-bottom: 0;
}
li { li {
color: @ini_nav_menu_color; color: @ini_nav_menu_color;
@ -104,7 +110,7 @@
color: @ini_nav_menu_color; color: @ini_nav_menu_color;
font-size: @font-size-head6; font-size: @font-size-head6;
font-weight: normal; font-weight: normal;
margin: -1px 0 (@font-size-head6 / 2); // moves the toggles back to the left (.4 from li margin) margin: -1px 0 @very-small-spacing;
padding-bottom: .4rem; padding-bottom: .4rem;
padding-top: .4rem; padding-top: .4rem;
transition: @transition color, @transition background-color, @transition border-color; transition: @transition color, @transition background-color, @transition border-color;
@ -231,18 +237,18 @@
// simple fake icon // simple fake icon
strong { strong {
display: inline-block; display: inline-block;
font-size: @icon-size * 0.5;
width: @icon-size * 0.98; width: @icon-size * 0.98;
height: @icon-size * 0.98; height: @icon-size * 0.98;
line-height: @icon-size * 0.9;
margin: @icon-size * 0.05;
padding: 0 .05em .05em;
vertical-align: baseline;
text-align: center;
color: inherit;
border: 2px solid fade(@ini_nav_menu_color, 80%); border: 2px solid fade(@ini_nav_menu_color, 80%);
border-top-right-radius: 50%; border-top-right-radius: 50%;
border-bottom-left-radius: 50%; border-bottom-left-radius: 50%;
color: inherit;
font-size: @icon-size * 0.5;
line-height: @icon-size * 0.9;
vertical-align: baseline;
text-align: center;
margin: @icon-size * 0.05;
padding: 0 .05em .05em;
} }
// real icon // real icon
@ -276,6 +282,7 @@
ul { ul {
margin-bottom: 0; margin-bottom: 0;
margin-left: 16px;
} }
} }
} }

1
css/area_nav-page-attributes.less
View file

@ -70,6 +70,7 @@
.num { .num {
top: -.6em; top: -.6em;
font-size: @font-size-very-small;
} }
} }
} }

23
css/area_nav-usertools.less
View file

@ -46,7 +46,6 @@
.btn-usertools-num(); .btn-usertools-num();
float: right; float: right;
min-height: 28px;
@media @screen_max-xs { @media @screen_max-xs {
display: block; display: block;
@ -54,6 +53,10 @@
margin-bottom: @headericons-margin-xxs; margin-bottom: @headericons-margin-xxs;
} }
@media @screen_max-xxs {
margin-bottom: (@headericons-margin-xxs - .2);
}
> span, > span,
> a { > a {
display: block; display: block;
@ -69,19 +72,13 @@
padding-top: .14rem; padding-top: .14rem;
} }
@media @screen_max-xxlg {
min-height: 28px;
}
@media @screen_max-md {
min-height: @toggle-size;
}
@media @screen_only-lg { @media @screen_only-lg {
min-width: 2rem; min-width: 2rem;
} }
} }
/* !!! &.user-task FIND in plugins/do_tasks.less !!! */
&.user { &.user {
@space-min-xxlg: .35rem; @space-min-xxlg: .35rem;
@space-max-xxlg: .4rem; @space-max-xxlg: .4rem;
@ -91,7 +88,7 @@
position: relative; position: relative;
display: table-cell; display: table-cell;
background-color: @ini_background_site; background-color: @ini_background_site;
border: solid 1px @wikiicons-border; // @ini_border_light; border: solid 1px @wikiicons-border;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_text_webframe; color: @ini_text_webframe;
padding-right: .3rem; padding-right: .3rem;
@ -116,7 +113,7 @@
@media @screen_max-xs { @media @screen_max-xs {
position: absolute; position: absolute;
top: @headericons-margin-xxs; top: @headericons-margin-xxs;
right: 2.9rem; right: (@toggle-size + @headericons-margin-xxs + @space-max-xlg + .5); // 1.75rem + .45 + .5 + (button login/out margin-right)
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
margin: -1px 0 0; margin: -1px 0 0;
@ -124,7 +121,7 @@
@media @screen_max-xxs { @media @screen_max-xxs {
left: -10px; left: -10px;
right: (@toggle-size + @headericons-margin-xxs); right: (@toggle-size + @headericons-margin-xxs); // 1.75rem + .45rem
width: auto; width: auto;
} }
@ -290,4 +287,4 @@
} }
} // a } // a
} // ul } // ul
} // nav-usertools } // nav-usertools

1
css/base.less
View file

@ -23,6 +23,7 @@
@margin-small: 1rem; @margin-small: 1rem;
@margin-default: 2rem; @margin-default: 2rem;
@margin-big: 3.07rem; @margin-big: 3.07rem;
@nav-margin: 1.3rem;
@small-spacing: .3rem; @small-spacing: .3rem;
@very-small-spacing: .2rem; @very-small-spacing: .2rem;

58
css/plugins/data.less
View file

@ -1,5 +1,5 @@
/** /**
* This file provides styles for old data plugin * This file provides styles for "data plugin"
* after importing struct data this can be deleted * after importing struct data this can be deleted
*/ */
@ -12,37 +12,37 @@
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
} }
}
+ .secedit.editbutton_plugin_data { .editbutton_plugin_data {
position: relative; position: relative;
top: -1em; // as margin after DL top: -1em; // as margin after DL
float: left; float: left;
font-size: @font-size-small; // for right position font-size: @font-size-small; // for right position
margin-top: 0; margin-top: 0;
form { form {
button { button {
min-height: 1rem; min-height: 1rem;
height: 1.8em; height: 1.8em;
background-color: @ini_background; background-color: @ini_background;
border-top: solid 1px @ini_button_background; border-top: solid 1px @ini_button_background;
border-color: @ini_border; border-color: @ini_border;
border-radius: 0 0 @fix_border-radius @fix_border-radius; border-radius: 0 0 @fix_border-radius @fix_border-radius;
color: @ini_existing; color: @ini_existing;
font-size: @font-size-small; font-size: @font-size-small;
line-height: 1.8em; line-height: 1.8em;
margin-top: -1px; // for right position margin-top: -1px; // for right position
margin-left: .6em; margin-left: .6em;
padding: 0 .3em; padding: 0 .3em;
transition: @transition background-color, @transition border-color, @transition color; transition: @transition background-color, @transition border-color, @transition color;
&:hover, &:hover,
&:focus, &:focus,
&:active { &:active {
background-color: @ini_existing; background-color: @ini_existing;
border-color: @ini_existing; border-color: @ini_existing;
color: @ini_background; color: @ini_background;
}
} }
} }
} }

50
css/plugins/do_tasks.less
View file

@ -25,19 +25,24 @@ ul.page-attributes {
} }
} }
/* + + + + + usertool icon in header + + + + + */
#dokuwiki__usertools.nav-usertools { #dokuwiki__usertools.nav-usertools {
ul { ul {
li { li {
&.user-task { &.user-task {
.btn-usertools-wrapper();
.btn-usertools-num();
position: relative; position: relative;
button { .plugin__do_usertasks {
width: 100%;
min-width: @toggle-size;
min-height: @toggle-size;
border-radius: @ini_default_border_radius; border-radius: @ini_default_border_radius;
border: 1px solid @wikiicons-border; border: 1px solid @wikiicons-border;
padding: .14rem 0 0 0; padding: .14rem 0 0 0;
min-width: 2rem;
min-height: 28px;
background: @ini_background none;
&::before { &::before {
content: ''; // remove when fontello is removed from usertools content: ''; // remove when fontello is removed from usertools
@ -46,26 +51,27 @@ ul.page-attributes {
&:hover, &:hover,
&:focus, &:focus,
&:active { &:active {
background: @ini_nav_menu_hover_color none; background-color: @ini_nav_menu_hover_color;
border: none; border: none;
svg path { svg path {
fill: @ini_background; fill: @ini_nav_menu_hover_bg;
} }
} }
} }
button {
background-color: @ini_nav_menu_hover_bg;
}
svg { svg {
width: 20px; width: 1.2rem;
margin-top: 2px; height: 1.2rem; // for IE 11
margin-bottom: 2px;
path { path {
fill: @ini_nav_menu_hover_color; fill: @ini_nav_menu_hover_color;
} }
@media @screen_max-md {
margin-top: 4px;
}
} }
.noopentasks { .noopentasks {
@ -86,10 +92,28 @@ ul.page-attributes {
} }
} }
@media @screen_max-sm { @media @screen_max-xs {
display: none; display: none;
} }
} // user-task } // user-task
} // li } // li
} // ul } // ul
} }
.plugin__do_usertasks_list {
background-color: transparent;
@media @screen_max-sm {
right: 1.25rem !important;
left: 1.25rem !important;
}
table.inline {
background-color: #FFF;
margin-top: .5rem;
@media @screen_max-sm {
width: 100%;
}
}
}

10
css/plugins/edittable.less
View file

@ -1,5 +1,5 @@
/** /**
* This file provides styles for qc edittable plugin * This file provides styles for "edittable plugin"
*/ */
@ -9,7 +9,7 @@
div.editbutton_table { div.editbutton_table {
position: relative; // for IE position: relative; // for IE
float: left; float: left;
margin-top: -1.46rem !important; // overwrite inline stales margin-top: -1.4em !important; // overwrite inline styles
form div.no { form div.no {
button, button,
@ -21,14 +21,10 @@
border-radius: 0 0 @fix_border-radius @fix_border-radius; border-radius: 0 0 @fix_border-radius @fix_border-radius;
color: @ini_existing; color: @ini_existing;
font-size: @font-size-small; font-size: @font-size-small;
margin-top: 0; // for best position of edit-tab beneeth table margin-top: -1px; // for best position of edit-tab beneath table
padding-right: .3em; padding-right: .3em;
transition: @transition background-color, @transition border-color, @transition color; transition: @transition background-color, @transition border-color, @transition color;
@media @screen_md-xlg {
margin-top: -1px; // for best position of edit-tab beneeth table
}
&:hover, &:hover,
&:focus, &:focus,
&:active { &:active {

11
css/plugins/qc.less
View file

@ -16,6 +16,16 @@
font-size: (@font-size-small - .06); font-size: (@font-size-small - .06);
} }
} }
a {
&:hover,
&:focus,
&:active {
svg path {
fill: @ini_nav_menu_hover_bg;
}
}
}
} }
@ -25,6 +35,7 @@
width: auto; width: auto;
font-size: 90%; font-size: 90%;
box-shadow: @box-shadow-bottom; box-shadow: @box-shadow-bottom;
border-bottom: solid 1px @ini_border_light;
margin-bottom: 0; margin-bottom: 0;
h2 { h2 {

26
css/plugins/starred.less
View file

@ -4,16 +4,16 @@
.page-attributes { .page-attributes {
li.plugin_starred { li.plugin_starred {
.starred svg { .starred {
margin-top: .1em; display: block;
width: 1.6em; padding-top: .05rem;
height: 1.6em;
font-size: 0.82rem;
fill: @ini_nav_menu_color;
}
.starred.on svg { svg {
fill: @ini_link; width: 1.6em;
height: 1.6em;
font-size: 0.82rem;
fill: @ini_nav_menu_hover_color;
}
} }
a:hover, a:hover,
@ -28,16 +28,20 @@
} }
nav.nav-starred { nav.nav-starred {
margin-top: 1rem; margin-top: @nav-margin;
ul { ul {
list-style: none; list-style: none;
&#sidebar-menu-starred { &#sidebar-menu-starred {
margin-left: 0; margin-left: 0;
} }
li { li {
margin-left: 0; margin-left: 0;
svg { svg {
vertical-align: middle; vertical-align: text-top;
} }
} }
} }