Merge branch 'master' into pageattributes

Adjusted some more files to account for changes in the over 100 commits
in master since the creation of this branch.

SPR-869
This commit is contained in:
Michael Große 2017-04-11 16:13:02 +02:00
commit 3f9d4d521a
No known key found for this signature in database
GPG key ID: 7E31028FBFEACC79
85 changed files with 4162 additions and 1910 deletions

View file

@ -1,6 +1,9 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* all media */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/**
* This file provides styles for bureaucracy plugin
*/
/* + + + + + global + + + + + */
.dokuwiki form.bureaucracy__plugin {
fieldset {
@ -42,7 +45,6 @@
select {
float: left;
width: 50%;
//min-height: 2em;
text-align: left;
padding: .1em .2em;
}
@ -95,13 +97,6 @@
}
#icke__page .content ul.autocompletion {}
ul.autocompletion li {}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* min-width: 1440px */

View file

@ -0,0 +1,27 @@
/**
* This file provides styles for config manager
*/
/* + + + + + config__manager + + + + + */
#dokuwiki__content {
#config__manager {
.selectiondefault {
background-color: transparent;
}
tr {
.input {
background-color: transparent;
color: inherit;
}
}
tr.default {
.input {
background-color: transparent;
}
}
}
}

View file

@ -1,9 +1,28 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* all media */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/**
* This file provides styles for do-task plugin
*/
/* + + + + + global + + + + + */
ul.page-attributes {
.plugin__do_pagetasks {
&.do_none { }
&.do_none {
position: relative;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
strong {
overflow: hidden;
background-color: @ini_background;
border-color: @noopentasks-border;
color: @ini_text_webframe;
}
.num {
margin-top: 1px;
background-color: @noopentasks-border; // fix
color: @noopentasks-color; // fix
}
}
}
}

View file

@ -2,15 +2,39 @@
* This file provides styles for the edit view (?do=edit), preview
* and section edit buttons.
*/
/* + + + + + edit view + + + + + */
.dokuwiki {
.editBox {
/* + + + + + edit view + + + + + */
#dokuwiki__content {
div.section_highlight {
clear: right;
}
.secedit button {
clear: both;
font-size: 100%;
margin-top: .5rem;
margin-bottom: .5rem;
}
div.editBox {
background-color: #FFF;
border: solid 2px #FFF;
border-radius: @ini_default_border_radius;
.editButtons {
display: inline-block;
padding-bottom: 1rem;
}
* {
&:not(button) {
color: @color-editBox;
}
}
}
}
@ -21,6 +45,7 @@
margin-bottom: 1.5rem;
clear: both;
}
#spr__meta-box {
display: none;
}

View file

@ -1,12 +1,46 @@
/**
* Style Adjustments for the edittable plugin
* This file provides styles for qc edittable plugin
*/
/* + + + + + global + + + + + */
#dokuwiki__content.main-content {
div.editbutton_table form div.no {
button,
input.button {
margin-top: 0;
font-size: @font-size-very-small;
div.editbutton_table {
position: relative; // for IE
z-index: 1; // for IE
float: left;
margin-top: -1.46rem !important; // overwrite inline stales
form div.no {
button,
input.button {
min-height: 1rem;
background-color: @ini_background_content;
border-top: solid 1px @ini_button_background;
border-color: @ini_border;
color: @ini_existing;
font-size: @font-size-small;
margin-top: 0;
padding-right: .3em;
transition: @transition background-color, @transition border-color, @transition color;
&:hover,
&:focus,
&:active {
background-color: @ini_existing;
border-color: @ini_existing;
color: @ini_background_content;
}
}
}
+ * {
clear: left;
}
+ div.editbutton_table {
clear: none;
}
}
}

View file

@ -0,0 +1,20 @@
/**
* This file provides styles for extension manager
*/
/* + + + + + global + + + + + */
.dokuwiki #extension__manager {
.actions {
font-size: 0;
> button {
font-size: .92rem;
margin-left: .3rem;
padding-left: .3rem;
padding-right: .3rem;
}
}
}

35
css/plugins/folded.less Normal file
View file

@ -0,0 +1,35 @@
/**
* This file provides styles for the toggle "folded"
*/
/* + + + + + global + + + + + */
#dokuwiki__content {
a.folder {
background: transparent url("svg.php?svg=down.svg&f=existing") right center no-repeat;
color: @ini_existing;
padding-right: 20px;
&.open {
background-image: url("svg.php?svg=up.svg&f=existing");
}
}
div.folded {
box-shadow: @box-shadow-colored;
border: 1px solid fade(@ini_existing, 50%);
border-radius: 0;
margin-top: -.7rem;
margin-bottom: .7rem;
padding: .5em;
p {
margin: .5rem 0;
}
}
span.folded {
border: 1px dotted @ini_border;
}
}

View file

@ -1,5 +1,12 @@
@media @screen_max-md{
#plugin__highlightparent{
/**
* This file provides styles for highlight plugin
*/
/* + + + + + global + + + + + */
@media @screen_max-md {
#plugin__highlightparent {
clear: both;
margin-top: 1rem;
}

View file

@ -4,23 +4,30 @@
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
#dokuwiki__content .plugin_include_content {
> h1 {
> h1,
> .section_highlight h1 {
padding-top: @font-size-head1;
}
> h2 {
> h2,
> .section_highlight h2 {
padding-top: @font-size-head2;
}
> h3 {
> h3,
> .section_highlight h3 {
padding-top: @font-size-head3;
}
> h4 {
> h4,
> .section_highlight h4 {
padding-top: @font-size-head4;
}
> h5 {
> h5,
> .section_highlight h5 {
padding-top: @font-size-head5;
}
> h6 {
> h6,
> .section_highlight h6 {
padding-top: @font-size-head6;
}
}

View file

@ -1,6 +1,6 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* all media */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/**
* This file provides styles for magic matcher plugin
*/
/* + + + + + + + + + + + + + + + + + + + + + + + */
@ -21,9 +21,9 @@
right: 0;
top: 0;
border: 0;
border-bottom: 1px solid @color-border;
border-left: 1px solid @color-border;
color: @color-nav;
border-bottom: 1px solid @ini_border;
border-left: 1px solid @ini_border;
color: @ini_nav_menu_color;
background: #fff;
border-radius: 0;
border-bottom-left-radius: 5px;
@ -31,8 +31,8 @@
&:hover,
&:focus,
&:active {
border-color: @button_background;
color: @button_background;
border-color: @ini_button_background;
color: @ini_button_background;
}
}
@ -42,9 +42,9 @@
width: 100%;
min-height: @height-context-bar;
box-sizing: border-box;
box-shadow: __box_shadow__;
background-color: __nav_direct_background__;
border-radius: 0 0 __default_border_radius__ __default_border_radius__;
box-shadow: @box-shadow;
background-color: @ini_background_content;
border-radius: 0 0 @ini_default_border_radius @ini_default_border_radius;
font-size: @font-size-default;
padding: .8em 1em .5em;
margin-bottom: 0;
@ -76,6 +76,16 @@
}
}
/* + + + + + in meta box + + + + + */
#spr__tab-issues {
ul.mmissuelist {
padding-left: 0;
margin-top: 1rem;
}
}
/* + + + + + in content + + + + + */
a.jiralink {
font-size: @font-size-default;

View file

@ -1,20 +1,30 @@
/**
* This file provides styles for the edit view (?do=edit), preview
* and section edit buttons.
* This file provides styles for mediamanager
*/
/* + + + + + mediamanager + + + + + */
/* + + + + + global + + + + + */
#mediamanager__page {
.namespaces h2 {
bottom: 0;
line-height: 100%;
margin-bottom: -1px;
}
#media__tree ul li img {
padding-top: .3em;
}
ul.tabs li a {
border-bottom-color: transparent;
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* media queries */
@media @screen_max-md {
#mediamanager__page {
min-width: 100%;

View file

@ -1,6 +1,14 @@
#dokuwiki__site > .plugin_move_dialog{
/**
* This file provides styles for move plugin
*/
/* + + + + + global + + + + + */
#dokuwiki__site > .plugin_move_dialog {
font-size: @font-size-default;
*{
* {
font-size: @font-size-default;
}
}

View file

@ -1,5 +1,10 @@
/**
* This file provides styles for popupviewer plugin
*/
/* + + + + + global + + + + + */
#popupviewer {
> .controls > .content {

View file

@ -6,8 +6,6 @@
.page-attributes .plugin_qc {
.qc_icon {
margin: 0;
width: 2em;
height: 2em;
svg {
margin-top: 0.1em;

10
css/plugins/starred.less Normal file
View file

@ -0,0 +1,10 @@
/**
* This file provides styles for starred plugin
*/
/* + + + + + global + + + + + */
#dokuwiki__site {
}

View file

@ -1,6 +1,9 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* all media */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/**
* This file provides styles for struct plugin
*/
/* + + + + + global + + + + + */
#dokuwiki__content {
.structaggregation {
@ -10,9 +13,26 @@
padding-bottom: @link-height;
margin-bottom: @grid;
table th input:focus {
width: 100%;
box-sizing: border-box;
td,
th {
line-height: @line-height-default;
a {
color: @ini_existing;
line-height: @line-height-default;
}
}
// search button in table (f.i. "All products")
table th input {
&:not(:focus) {
cursor: pointer;
}
&:focus {
width: 100%;
box-sizing: border-box;
}
}
.table {
@ -26,22 +46,106 @@
margin-bottom: 0;
&.export {
bottom: 1px;
background: transparent url("svg.php?svg=file-export.svg&f=existing") left center no-repeat;
background-size: auto 20px;
border: solid 1px @ini_border;
color: @ini_existing;
font-size: @font-size-small;
line-height: 1;
padding-top: .3em;
margin-top: -1px;
padding-top: .4em;
transition: @transition background-color, @transition border-color, @transition color;
&:hover,
&:focus,
&:active {
background-color: @ini_existing;
background-image: url("svg.php?svg=file-export.svg&f=background_content");
border-color: @ini_existing;
color: @ini_background_content;
text-decoration: none;
}
}
}
}
#plugin__struct_output{
margin-right: 0;
}
.struct_entry_form {
margin-bottom: 2rem;
> fieldset {
margin-top: 1.5rem;
}
}
textarea + .struct_entry_form {
margin-top: -.5rem;
}
div.editBox {
.struct_entry_form {
label span.label {
color: @color-editBox;
}
}
}
}
.dokuwiki .struct_inlineditor {
z-index: 3;
}
/* + + + + + form - Struct Schema Editor + + + + + */
form {
&.doku_form.struct_newschema {
fieldset {
> label {
> span:first-child {
display: inline-block;
@media @screen_min-lg {
width: 48.8%;
}
@media @screen_max-lg {
width: 48.5%;
}
}
> input[type="text"] {
width: 50%;
}
}
button {
cursor: pointer;
box-shadow: none;
background-image: none;
background-color: @ini_button_background;
border: 1px solid @ini_button_background;
border-radius: @fix_border-radius;
color: @ini_button_color;
vertical-align: top;
margin-top: .3em;
padding: .3em @grid;
transition: @transition background-color, @transition color;
&:hover,
&:active,
&:focus {
background-color: @ini_button_color;
color: @ini_button_background;
}
+ p {
padding-top: 1rem;
}
}
}
}
}

View file

@ -1,39 +1,57 @@
/**
* This file provides styles for the edit view (?do=edit), preview
* and section edit buttons.
* This file provides styles for the tabinclude
*/
/* + + + + + plugin tabinclude + + + + + */
div#dwpl-ti-container {
/* + + + tabnav + + + */
li.dwpl-ti-tab {
box-shadow: none;
border-color: @color-site-bg;
background-color: @ini_background_page_header;
border-color: @ini_border;
border-radius: @fix_border-radius @fix_border-radius 0 0;
color: @ini_background_page_footer;
padding: 0;
&:hover {
background-color: @ini_background_page_header;
text-decoration: none;
div {
text-decoration: underline;
&.selected {
color: @ini_text;
}
}
}
div {
background-color: @background_page-header;
border-radius: inherit;
color: inherit;
padding: .1em .35em;
&.selected {
background-color: @color-site-bg;
position: relative;
z-index: 1;
background-color: @ini_background_content;
color: @ini_text;
}
}
}
/* + + + box + + + */
/* + + + content box + + + */
div.dwpl-ti-content-box {
position: relative;
z-index: 0;
overflow: auto;
box-shadow: none;
background-color: @color-site-bg;
border: solid 1px @color-site-bg;
box-shadow: @box-shadow;
background-color: @ini_background_content;
border: solid 1px @ini_border;
border-radius: 0;
margin-top: -1px;
}
}
@ -42,7 +60,5 @@ div#dwpl-ti-container {
/* media queries */
@media @screen_max-md {
div#dwpl-ti-container {
}
div#dwpl-ti-container { }
}

117
css/plugins/tagging.less Normal file
View file

@ -0,0 +1,117 @@
/**
* This file provides styles for the form in tagcloud
*/
/* + + + + + plugin tagging + + + + + */
#spr__meta-box {
ul.tagging_cloud {
width: 100%;
padding-right: 0;
li {
&.t0 a {
font-size: .9rem;
}
&.t1 a {
font-size: 1rem;
}
&.t2 a {
font-size: 1.1rem;
}
&.t3 a {
font-size: 1.2rem;
}
&.t4 a {
font-size: 1.3rem;
}
&.t5 a {
font-size: 1.4rem;
}
&.t6 a {
font-size: 1.5rem;
}
&.t7 a {
font-size: 1.6rem;
}
&.t8 a {
font-size: 1.7rem;
}
&.t9 a {
font-size: 1.8rem;
}
&.t10 a {
font-size: 1.9rem;
}
}
}
form#tagging__edit {
width: 100%;
label {
display: block;
}
input.edit {
width: 100%;
margin-bottom: .5rem;
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* media queries */
@media @screen_max-md {
#spr__meta-box {
form {
&#tagging__edit {
label {
display: inline-block;
min-width: 50%;
vertical-align: top;
margin-bottom: .5rem;
}
input.edit {
margin-bottom: 0;
}
}
}
}
}
@media @screen_max-xs {
#spr__meta-box {
form {
div > button[type="submit"] {
width: 49%;
padding: 0;
}
&#tagging__edit {
&::after {
content: '';
clear: both;
display: block;
}
label {
display: block;
width: 100%;
}
button[type="submit"] {
float: right;
&:first-of-type {
float: left;
}
}
}
}
}
}