Skip to content
Snippets Groups Projects
Commit 09011764 authored by Ron Lucke's avatar Ron Lucke Committed by Till Glöggler
Browse files

fix #900

Closes #900

Merge request studip/studip!858
parent 72468fbf
No related branches found
No related tags found
No related merge requests found
...@@ -404,8 +404,7 @@ $consum_ribbon_width: calc(100% - 58px); ...@@ -404,8 +404,7 @@ $consum_ribbon_width: calc(100% - 58px);
position: absolute; position: absolute;
right: -570px; right: -570px;
top: 15px; top: 15px;
height: calc(100% - 32px); height: 100%;
max-height: 760px;
max-width: calc(100% - 28px); max-width: calc(100% - 28px);
display: flex; display: flex;
flex-flow: row; flex-flow: row;
...@@ -435,6 +434,7 @@ $consum_ribbon_width: calc(100% - 58px); ...@@ -435,6 +434,7 @@ $consum_ribbon_width: calc(100% - 58px);
.cw-ribbon-tool-content-nav { .cw-ribbon-tool-content-nav {
position: sticky; position: sticky;
height: 100%;
top: 0; top: 0;
background-color: $white; background-color: $white;
margin: 0; margin: 0;
...@@ -464,6 +464,7 @@ $consum_ribbon_width: calc(100% - 58px); ...@@ -464,6 +464,7 @@ $consum_ribbon_width: calc(100% - 58px);
>.cw-ribbon-tool-content-tablist { >.cw-ribbon-tool-content-tablist {
width: 100%; width: 100%;
height: 100%;
>.cw-tabs-nav { >.cw-tabs-nav {
border: none; border: none;
width: calc(100% - 48px); width: calc(100% - 48px);
...@@ -483,9 +484,10 @@ $consum_ribbon_width: calc(100% - 58px); ...@@ -483,9 +484,10 @@ $consum_ribbon_width: calc(100% - 58px);
border: none; border: none;
border-top: solid thin $content-color-40; border-top: solid thin $content-color-40;
padding: 0; padding: 0;
height: calc(100% - 58px);
>.cw-tab { >.cw-tab {
max-height: 700px; height: calc(100% - 22px);
padding: 14px 8px 8px 8px; padding: 14px 8px 8px 8px;
position: relative; position: relative;
overflow-y: auto; overflow-y: auto;
...@@ -494,6 +496,7 @@ $consum_ribbon_width: calc(100% - 58px); ...@@ -494,6 +496,7 @@ $consum_ribbon_width: calc(100% - 58px);
scrollbar-color: $base-color $white; scrollbar-color: $base-color $white;
&.cw-ribbon-tool-blockadder-tab { &.cw-ribbon-tool-blockadder-tab {
height: 100%;
overflow: hidden; overflow: hidden;
padding: 0; padding: 0;
} }
......
...@@ -36,7 +36,9 @@ ...@@ -36,7 +36,9 @@
<courseware-ribbon-toolbar <courseware-ribbon-toolbar
v-if="showTools" v-if="showTools"
:toolsActive="unfold" :toolsActive="unfold"
:stickyRibbon="stickyRibbon"
:class="{ 'cw-ribbon-tools-sticky': stickyRibbon }" :class="{ 'cw-ribbon-tools-sticky': stickyRibbon }"
:style="{ maxHeight: maxHeight + 'px' }"
:canEdit="canEdit" :canEdit="canEdit"
@deactivate="deactivateToolbar" @deactivate="deactivateToolbar"
/> />
...@@ -89,6 +91,13 @@ export default { ...@@ -89,6 +91,13 @@ export default {
breadcrumbFallback() { breadcrumbFallback() {
return window.outerWidth < 1200; return window.outerWidth < 1200;
}, },
maxHeight() {
if (this.stickyRibbon) {
return parseInt(window.innerHeight * 0.75);
} else {
return parseInt(Math.min(window.innerHeight * 0.75, window.innerHeight - 197));
}
}
}, },
methods: { methods: {
toggleConsumeMode() { toggleConsumeMode() {
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
> >
<courseware-tools-blockadder <courseware-tools-blockadder
id="cw-ribbon-tool-blockadder" id="cw-ribbon-tool-blockadder"
:stickyRibbon="stickyRibbon"
/> />
</courseware-tab> </courseware-tab>
<courseware-tab <courseware-tab
...@@ -88,6 +89,10 @@ export default { ...@@ -88,6 +89,10 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
stickyRibbon: {
type: Boolean,
default: false,
},
}, },
data() { data() {
return { return {
......
<template> <template>
<div class="cw-tools-element-adder"> <div class="cw-tools-element-adder">
<courseware-tabs class="cw-tools-element-adder-tabs"> <courseware-tabs class="cw-tools-element-adder-tabs">
<courseware-tab :name="$gettext('Blöcke')" :selected="showBlockadder" :index="0"> <courseware-tab :name="$gettext('Blöcke')" :selected="showBlockadder" :index="0" :style="{ maxHeight: maxHeight + 'px' }">
<courseware-collapsible-box :title="textBlockHelper"> <courseware-collapsible-box :title="textBlockHelper">
<courseware-block-helper :blockTypes="blockTypes" /> <courseware-block-helper :blockTypes="blockTypes" />
</courseware-collapsible-box> </courseware-collapsible-box>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</div> </div>
</courseware-collapsible-box> </courseware-collapsible-box>
</courseware-tab> </courseware-tab>
<courseware-tab :name="$gettext('Abschnitte')" :selected="showContaineradder" :index="1"> <courseware-tab :name="$gettext('Abschnitte')" :selected="showContaineradder" :index="1" :style="{ maxHeight: maxHeight + 'px' }">
<courseware-collapsible-box <courseware-collapsible-box
v-for="(style, index) in containerStyles" v-for="(style, index) in containerStyles"
:key="index" :key="index"
...@@ -120,6 +120,12 @@ export default { ...@@ -120,6 +120,12 @@ export default {
CoursewareBlockHelper, CoursewareBlockHelper,
CoursewareCompanionBox, CoursewareCompanionBox,
}, },
props: {
stickyRibbon: {
type: Boolean,
default: false,
},
},
data() { data() {
return { return {
showBlockadder: true, showBlockadder: true,
...@@ -164,6 +170,13 @@ export default { ...@@ -164,6 +170,13 @@ export default {
{ title: this.$gettext('Dateien'), type: 'files' }, { title: this.$gettext('Dateien'), type: 'files' },
{ title: this.$gettext('Externe Inhalte'), type: 'external' }, { title: this.$gettext('Externe Inhalte'), type: 'external' },
]; ];
},
maxHeight() {
if (this.stickyRibbon) {
return parseInt(window.innerHeight * 0.75) - 120;
} else {
return parseInt(Math.min(window.innerHeight * 0.75, window.innerHeight - 197)) - 120;
}
} }
}, },
methods: { methods: {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment