Commit f85f6156 authored by Benjamin Fischer's avatar Benjamin Fischer
Browse files

MainView: improved collapsed otherWSStyle

refs #2426
parent 05d43aef
......@@ -133,10 +133,11 @@ body{overflow:hidden}
.vispa-ui-dropzone[data-sector=left]>.vispa-ui-highlight{position:absolute;top:0;right:50%;bottom:0;left:0}
.vispa-ui-dropzone[data-sector=right]>.vispa-ui-highlight{position:absolute;top:0;right:0;bottom:0;left:50%}
.vispa-caret-icon>i>i{position:absolute;height:50%;width:50%;font-size:.7em;line-height:.7em;top:75%;left:85%}
.vispa-body[data-ws-other-style=fade] .vispa-ui-tab.vispa-other-ws{background-color:#010101!important;color:#999}
.vispa-body[data-ws-other-style=darkened] .vispa-ui-tab.vispa-other-ws{background-color:#111!important;color:#999}
.vispa-body[data-ws-other-style=collapse] .vispa-ui-tab.vispa-other-ws{width:33px!important}
.vispa-body[data-ws-other-style=collapse] .vispa-ui-tab.vispa-other-ws .vispa-comp-badge,.vispa-body[data-ws-other-style=collapse] .vispa-ui-tab.vispa-other-ws .vispa-comp-close,.vispa-body[data-ws-other-style=collapse] .vispa-ui-tab.vispa-other-ws .vispa-comp-label{display:none}
.vispa-body[data-ws-other-style=hide] .vispa-ui-tab.vispa-other-ws{display:none!important}
.vispa-body[data-ws-other-style=collapse] .vispa-ui-tab.vispa-other-ws .vispa-caret-icon{pointer-events:none}
.vispa-body[data-ws-other-style=collapse] .vispa-ui-tab.vispa-other-ws .vispa-caret-icon i i{display:none}
.vispa-body .vispa-ui-tabber{position:absolute;top:0;right:0;bottom:0;left:0}
.vispa-body .vispa-ui-tabber>.vispa-ui-tabbar{height:30px;background-color:#ddd;border-bottom:1px solid #b8b8b8;padding:0 5px}
.vispa-body .vispa-ui-tabber>.vispa-ui-tabbar.vispa-ui-recieving{background:#5cb85c}
......
......@@ -608,19 +608,22 @@ body {
}
.vispa-body {
&[data-ws-other-style=fade] .vispa-ui-tab.vispa-other-ws {
background-color: #010101 !important;
&[data-ws-other-style=darkened] .vispa-ui-tab.vispa-other-ws {
background-color: #111 !important;
color: #999;
}
&[data-ws-other-style=collapse] .vispa-ui-tab.vispa-other-ws {
.vispa-comp-label, .vispa-comp-badge, .vispa-comp-close {
display: none;
}
.vispa-caret-icon {
pointer-events: none;
i i {
display: none;
}
}
width: @tab-bar-button-width !important;
}
&[data-ws-other-style=hide] .vispa-ui-tab.vispa-other-ws {
display: none !important;
}
}
......
......@@ -2,7 +2,17 @@
'vispa-ui-tab': true,
'vispa-other-ws': !isCurrentWs,
}" :style="style">
<span
v-show="justIcon"
class="vispa-comp-icon"
@click="focus"
>
<button class="btn-nostyle">
<i :class="iconClass | iconPrefix"></i>
</button>
</span>
<menu-button
v-show="!justIcon"
:items="menuItems"
class="vispa-comp-icon"
btn-class="btn-nostyle vispa-caret-icon"
......
......@@ -83,6 +83,9 @@ define([
if (!currentWsId) return true;
return ws.id === currentWsId;
},
justIcon: function() {
return vispa.wsManager.prefs.get("otherStyle")==="collapse" && !this.isCurrentWs;
}
},
methods: {
focus: function(event) {
......
......@@ -469,7 +469,7 @@ define([
" focused tab.",
type: "string",
value: "none",
options: ["none","fade","collapse","hide"],
options: ["none","darkened","collapse"],
global: true,
flat: true,
},
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment