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

@ -20,11 +20,20 @@
float: left;
display: block;
width: auto;
min-height: 2em;
border: 1px solid @color-border;
border-radius: @border-radius;
color: @color-nav;
min-height: @toggle-size;
border: 1px solid @wikiicons-border;
border-radius: @ini_default_border_radius;
text-align: center;
margin: 0;
margin: 0 .25rem;
.prefix {
.btn-prefix ();
.icon-clipboard();
display: block;
font-size: 1.2rem;
line-height: 1;
}
}
}