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 
SPR-976: focus - pagetools + edit-button pixelbug + firefox aside + QS merges

See merge request !66
This commit is contained in:
Jana Deutschländer 2017-05-03 10:36:57 +02:00
commit 4ab7ff676e
7 changed files with 106 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

12
css/area_header.less
View file

@ -142,33 +142,23 @@
a { a {
.fontello(); .fontello();
.icon-menu(); .icon-menu();
.btn-hover();
display: block; display: block;
min-height: @toggle-size; min-height: @toggle-size;
min-width: @toggle-size; min-width: @toggle-size;
box-sizing: border-box; box-sizing: border-box;
background-color: #fff;
border: 1px solid @ini_border; border: 1px solid @ini_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_nav_menu_color;
font-size: 1rem; font-size: 1rem;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
line-height: 1; line-height: 1;
transition: @transition color, @transition background-color, @transition border-color;
&::before { &::before {
font-size: 1.5rem; font-size: 1.5rem;
margin: .1rem 0 0; margin: .1rem 0 0;
} }
&:hover,
&:active,
&:focus {
background-color: @ini_nav_menu_hover_bg;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_color;
}
} }
} }

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

@ -91,10 +91,9 @@
// the toggle element // the toggle element
a { a {
cursor: pointer;
display: table; display: table;
width: 100%; width: 100%;
cursor: pointer;
min-height: @icon-size + @margin-small; min-height: @icon-size + @margin-small;
opacity: 1; opacity: 1;
border: 1px solid transparent; border: 1px solid transparent;
@ -103,6 +102,8 @@
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 (@font-size-head6 / 2); // moves the toggles back to the left (.4 from li margin)
padding-bottom: .4rem;
padding-top: .4rem;
transition: @transition color, @transition background-color, @transition border-color; transition: @transition color, @transition background-color, @transition border-color;
span { span {
@ -200,6 +201,7 @@
min-width: @menu-margin; min-width: @menu-margin;
height: @icon-size; height: @icon-size;
text-align: center; text-align: center;
vertical-align: middle;
color: inherit; color: inherit;
&::after { &::after {
@ -217,7 +219,7 @@
// wordbreak too late in IE 10 // wordbreak too late in IE 10
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
top: .5rem; top: 0;
bottom: .5rem; bottom: .5rem;
height: 100%; height: 100%;
margin: 0; margin: 0;
@ -254,6 +256,7 @@
span.lbl { span.lbl {
display: table-cell; display: table-cell;
font-size: inherit;
padding-left: .5rem; padding-left: .5rem;
} }
} }
@ -300,26 +303,6 @@
} }
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1439px */
@media @screen_max-xlg {
#dokuwiki__aside {
nav {
li:not([class]),
.li {
font-size: @font-size-default;
* {
font-size: inherit;
font-weight: inherit;
}
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */ /* max-width: 1023px */
@ -343,6 +326,10 @@
&:first-child { &:first-child {
margin-top: 1.2rem; margin-top: 1.2rem;
} }
a {
font-size: @font-size-small;
}
} }
a.nav { a.nav {
@ -353,25 +340,46 @@
div.nav-panel, div.nav-panel,
a.nav { a.nav {
margin-top: 0;
padding-right: .8em; padding-right: .8em;
} }
} }
} }
} }
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1439px */ /* max-width: 768px */
@media @screen_max-xlg { @media @screen_max-xs {
#dokuwiki__aside { body.show-mobile-sidebar {
nav { .page-wrapper > .tools {
li:not([class]), top: 2.5rem;
.li { }
font-size: @font-size-default;
* { #dokuwiki__aside {
font-size: inherit; left: 1.25rem;
font-weight: inherit; right: 1.25rem;
width: auto;
max-width: 100%;
margin-top: -1rem;
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 480px */
@media @screen_max-xxs {
body.show-mobile-sidebar {
#dokuwiki__aside {
left: 4px;
right: 4px;
> nav {
a {
font-size: @font-size-default;
} }
} }
} }

32
css/area_main-sidebar-search.less
View file

@ -4,6 +4,7 @@
* @author Jana Deutschlaender <deutschlaender@cosmocode.de> * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/ */
.search.main-sidebar { .search.main-sidebar {
@main-ico-dummy: @font-size-big + @margin-small*2; //FIXME copied from area_main-sidebar-nav @main-ico-dummy: @font-size-big + @margin-small*2; //FIXME copied from area_main-sidebar-nav
@icon-size: @page-header_height; @icon-size: @page-header_height;
@ -180,18 +181,20 @@
} }
/* + + + + + wide page content + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* min-width: 1024px */
@media @screen_min-md { @media @screen_min-md {
// wide page content
.wide-content { .wide-content {
.search.main-sidebar { .search.main-sidebar {
display: block;
p.toggleSearch { p.toggleSearch {
position: relative; position: relative;
z-index: 1; z-index: 1;
display: block; display: block;
float: left; float: left;
width: auto; width: 100%;
} }
form { form {
@ -216,10 +219,27 @@
} }
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */
@media @screen_max-md { @media @screen_max-md {
.show-mobile-sidebar {
// show when toggled
body.show-mobile-sidebar {
p.toggleSearch {
display: none !important;
}
.search.main-sidebar { .search.main-sidebar {
display: block; display: block !important;
position: relative;
z-index: 1;
margin-left: -1px;
margin-right: -1px;
form {
margin-bottom: 1rem;
}
} }
} }
} }

22
css/area_nav-pagetools.less
View file

@ -21,6 +21,7 @@
.pagetools-item(img_backto, 12); .pagetools-item(img_backto, 12);
*/ */
#dokuwiki__aside { #dokuwiki__aside {
@media @screen_max-md { @media @screen_max-md {
display: none !important; display: none !important;
@ -82,6 +83,27 @@ nav#dokuwiki__pagetools {
background-color: transparent; background-color: transparent;
} }
&:focus {
box-shadow: @box-shadow;
background-image: none;
background-color: @ini_background;
color: @ini_existing;
padding-top: 2px;
padding-bottom: 2px;
padding-right: 0;
span {
position: relative;
display: inline;
width: auto;
height: auto;
}
svg {
fill: @ini_existing;
}
}
span { span {
.sr-only(); .sr-only();

13
css/area_nav-usertools.less
View file

@ -33,6 +33,14 @@
padding: 0; padding: 0;
margin: (@very-small-spacing * 2) -.25rem 0 0; margin: (@very-small-spacing * 2) -.25rem 0 0;
@media @screen_max-md {
margin-right: .5rem;
}
@media @screen_max-xxs {
margin-right: -.3rem;
}
li { li {
.btn-usertools-wrapper(); // uniform li .btn-usertools-wrapper(); // uniform li
.btn-usertools-num(); .btn-usertools-num();
@ -108,7 +116,7 @@
@media @screen_max-xs { @media @screen_max-xs {
position: absolute; position: absolute;
top: @headericons-margin-xxs; top: @headericons-margin-xxs;
right: (@toggle-size + @headericons-margin-xxs); right: 2.9rem;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
margin: -1px 0 0; margin: -1px 0 0;
@ -116,6 +124,7 @@
@media @screen_max-xxs { @media @screen_max-xxs {
left: -10px; left: -10px;
right: (@toggle-size + @headericons-margin-xxs);
width: auto; width: auto;
} }
@ -178,11 +187,11 @@
&:focus, &:focus,
&:active { &:active {
background-color: @ini_nav_menu_hover_color; background-color: @ini_nav_menu_hover_color;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_bg; color: @ini_nav_menu_hover_bg;
&::before { &::before {
opacity: 1; opacity: 1;
border-color: @ini_nav_menu_hover_bg;
} }
bdi, bdi,

2
css/base_mixins.less
View file

@ -151,7 +151,7 @@
&:active, &:active,
&:focus { &:focus {
background-color: @ini_nav_menu_hover_color; background-color: @ini_nav_menu_hover_color;
border-color: @ini_nav_menu_hover_bg; border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_bg; color: @ini_nav_menu_hover_bg;
.prefix { .prefix {

4
css/plugins/edittable.less
View file

@ -26,6 +26,10 @@
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 {