From 5362965a50591598b6833f82c1118b1ea23be36e Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 21 Feb 2017 16:03:46 +0100 Subject: [PATCH 1/3] remove jumping on edit hover with h1 If additional space is wanted at the top, it should be added to the surrounding container. --- css/base_design.less | 3 --- 1 file changed, 3 deletions(-) diff --git a/css/base_design.less b/css/base_design.less index eec8d7d..2b7f88e 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -131,9 +131,6 @@ h1 { font-size: @font-size-head1; margin: 0 0 @font-size-head1; padding-top: 1em; - #dokuwiki__content > & { - padding-top: 1.5em; - } } h2 { From 3a6c6601fa9152cb02445b167d64fd4b9889e61c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 21 Feb 2017 16:34:26 +0100 Subject: [PATCH 2/3] SVG dispatch: allow passing ini colors without underscores The surrounding underscores can be left out. --- svg.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/svg.php b/svg.php index 1fab9c2..f0bad62 100644 --- a/svg.php +++ b/svg.php @@ -272,6 +272,9 @@ class SVG { if(isset($this->replacements[$color])) { return $this->replacements[$color]; } + if(isset($this->replacements['__' . $color . '__'])) { + return $this->replacements['__' . $color . '__']; + } return ''; } From c8f31200deb01f4045d3739de7838d0302a7d859 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 21 Feb 2017 16:41:09 +0100 Subject: [PATCH 3/3] SPR-835 only show an icon until hover --- css/area_main-content.less | 50 ++++++++++++++++++++++++++------------ img/pencil.svg | 1 + 2 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 img/pencil.svg diff --git a/css/area_main-content.less b/css/area_main-content.less index 65e0012..f690575 100755 --- a/css/area_main-content.less +++ b/css/area_main-content.less @@ -4,31 +4,29 @@ * @author Jana Deutschlaender */ - #dokuwiki__content.main-content { .level2 { p a.media { - img{ - border:1px dotted @color-site-bg; + img { + border: 1px dotted @color-site-bg; } - &:hover,&:focus,&:active{ - img{ - border:1px solid @color-link; - } - } + &:hover, &:focus, &:active { + img { + border: 1px solid @color-link; + } + } } } - div.section_highlight{ + div.section_highlight { margin: 0; padding: 0 0 1rem 0; border: 1px solid #abced4; background-color: #fff; - background-image: - linear-gradient(90deg, transparent 79px, #abced4 79px, #abced4 81px, transparent 81px), - linear-gradient(#eee .1em, transparent .1em); + background-image: linear-gradient(90deg, transparent 79px, #abced4 79px, #abced4 81px, transparent 81px), + linear-gradient(#eee .1em, transparent .1em); background-size: 100% 1.2em; opacity: .7; } @@ -36,19 +34,41 @@ float: right; margin-top: 0; position: relative; - z-index:2; + z-index: 2; top: 0; + + button { + background-color: transparent; + color: transparent; + border-color: transparent; + + &::after { + content: ''; + display: inline-block; + background: transparent url("svg.php?svg=pencil.svg&f=link") center center no-repeat; + height: 1em; + width: 1em; + background-size: contain; + margin-left: 0.5rem; // FIXME hard coded in plugins/edit.less + } + + &:hover, + &:active, + &:focus { + background-color: @button_color; + color: @button_background; + border-color: @button_background; + } + } } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* min-width: 1440px */ @media @screen_min-xlg { } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1199px */ diff --git a/img/pencil.svg b/img/pencil.svg new file mode 100644 index 0000000..e3a4faa --- /dev/null +++ b/img/pencil.svg @@ -0,0 +1 @@ + \ No newline at end of file