Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master

# Conflicts:
#	css/area_nav-metabox.less
#	css/plugins/edit.less
This commit is contained in:
Silke Pisulla 2017-02-24 09:25:52 +01:00
commit ce0c70f35a
116 changed files with 1292 additions and 5454 deletions

View file

@ -4,7 +4,10 @@
float: right;
display: inline-block;
max-width: 40%;
margin-top: 2px;
min-height: @page-header_height;
border: 1px solid transparent;
margin-top: @page_padding-top * -1; // reverse padding-top of .page container
padding-top: 1rem;
@media @screen_max-md {
position: relative;
@ -15,7 +18,6 @@
max-width: 100%;
}
.tab-container {
@media @screen_max-md{
width: 100%;
@ -63,7 +65,8 @@
position: relative;
display: block;
background-color: @color-site-bg;
border: 1px solid @color-border;
border: 1px solid @color-border-light;
border-bottom-color: @color-site-bg;
border-radius: @fix_border-radius @fix_border-radius 0 0;
color: @color-nav;
font-size: @font-size-small;
@ -111,7 +114,6 @@
> a {
cursor: default;
tab-index: -1;
background-color: @color-content-bg;
border-color: @color-link;
border-bottom-color: @color-content-bg;
@ -126,10 +128,16 @@
}
.meta-content {
margin-right: 1px;
margin-top: -1px;
.tab-pane {
position: absolute;
top: 0;
right: 0;
display: none;
width: 100%;
min-width: 20em;
background-color: @color-content-bg;
border: 1px solid @color-link;
border-radius: 0 0 @fix_border-radius @fix_border-radius;
@ -254,4 +262,3 @@
}
}
}