Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

implement changes according to draft design

Browse source
This commit is contained in:
Maxim Kadushkin 2018-02-06 01:01:29 +03:00
parent f328e83a4f
commit d3b23c19f8
3 changed files with 38 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/util/utils.js
View file

@ -772,4 +772,4 @@ Common.Utils.InternalSettings = new(function() {
Common.Utils.InternalSettings.set('toolbar-height-compact', 32); Common.Utils.InternalSettings.set('toolbar-height-compact', 32);
Common.Utils.InternalSettings.set('toolbar-height-normal', 32+67); Common.Utils.InternalSettings.set('toolbar-height-normal', 32+67);
Common.Utils.InternalSettings.set('doc-title-height', 26); Common.Utils.InternalSettings.set('doc-title-height', 28);

76
apps/common/main/resources/less/header.less
View file

@ -43,7 +43,6 @@
line-height: 20px; line-height: 20px;
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center;
} }
&.left { &.left {
@ -80,7 +79,7 @@
#box-doc-name { #box-doc-name {
flex-grow: 1; flex-grow: 1;
text-align: center; display: flex;
} }
#rib-doc-name { #rib-doc-name {
@ -146,7 +145,6 @@
} }
#tlb-box-users { #tlb-box-users {
height: @height-tabs;
} }
#tlb-change-rights { #tlb-change-rights {
@ -154,9 +152,11 @@
} }
.btn-users { .btn-users {
display: inline-flex; display: flex;
align-items: center;
cursor: pointer; cursor: pointer;
padding: 6px 12px; padding: 0 12px;
height: 100%;
.icon { .icon {
display: inline-block; display: inline-block;
@ -230,50 +230,52 @@
.hedset { .hedset {
font-size: 0; font-size: 0;
display: flex;
} }
.btn-header { .btn-header {
border: 0 none; height: 100%;
height: @height-tabs;
background-color: transparent; background-color: transparent;
padding: 6px 12px; width: 40px;
.icon { .icon {
width: 20px; width: 20px;
height: 20px; height: 20px;
} }
svg.icon {
display: inline-block;
vertical-align: middle;
}
.btn&[disabled],
&.disabled {
opacity: 0.65;
}
&:hover {
&:not(.disabled) {
background-color: rgba(255,255,255,0.2);
}
}
&:active {
&:not(.disabled) {
background-color: rgba(0,0,0,0.2);
}
}
} }
#box-document-title { #box-document-title {
background-color: @tabs-bg-color; background-color: @tabs-bg-color;
display: flex; display: flex;
height: 100%;
color:#fff;
.btn-slot { .btn-slot {
display: inline-block; display: inline-block;
} }
.btn-header {
height: 26px;
padding: 3px 6px;
&[disabled],
&.disabled {
opacity: 0.65;
}
&:hover {
&:not(.disabled) {
background-color: rgba(255,255,255,0.2);
}
}
&:active {
&:not(.disabled) {
background-color: rgba(0,0,0,0.2);
}
}
}
svg.icon { svg.icon {
fill: #fff; fill: #fff;
} }
@ -286,8 +288,6 @@
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
height: 100%; height: 100%;
color: #d3d9e3;
background-color: transparent; background-color: transparent;
border: 0 none; border: 0 none;
cursor: default; cursor: default;
@ -297,15 +297,11 @@
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
text-align: right; text-align: right;
font-size: 12px; font-size: 11px;
width: 150px; max-width: 50%;
height: 100%; height: 100%;
padding: 4px 12px 4px 0; padding: 0 12px;
line-height: @height-title;
color: #d3d9e3;
background-color: transparent;
border: 0 none;
cursor: default;
} }
} }

1
apps/common/main/resources/less/toolbar.less
View file

@ -1,3 +1,4 @@
@height-title: 28px;
@height-tabs: 32px; @height-tabs: 32px;
@height-controls: 67px; @height-controls: 67px;