diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 107349cc8..e4cd16402 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -72,7 +72,7 @@ define([ var templateRightBox = '
' + '' + '<%= textSaveEnd %>' + - '
' + + '
' + // '' + ''+ + '
' + + '
' + '
' + '
' + '
'; @@ -279,7 +281,7 @@ define([ me.btnGoBack = new Common.UI.Button({ id: 'btn-goback', - cls: 'btn-toolbar', + cls: 'btn-header', iconCls: 'svgicon svg-btn-goback', split: true }); diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 77f8c9c85..c9637523e 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -28,13 +28,13 @@ .toolbar { .extra { - .elset:not(:first-child) { - margin-top: 0; - } - svg.icon { fill: #fff; } + + .btn-slot { + width: auto; + } } } @@ -53,7 +53,6 @@ &.right { flex-grow: 1; min-width: 100px; - padding-right: 12px; .desktop { padding: 10px 0; @@ -69,10 +68,17 @@ color: #fff; } - .btn-toolbar { - &:hover, &:active { + .btn-users, + .btn-header { + &:hover { &:not(.disabled) { - background-color: transparent; + background-color: rgba(255,255,255,0.2); + } + } + + &:active { + &:not(.disabled) { + background-color: rgba(0,0,0,0.2); } } } @@ -119,22 +125,17 @@ } #tlb-box-users { - display: inline-block; - margin-right: 10px; + height: @height-tabs; } #tlb-change-rights { margin-top: 15px; } -#slot-btn-back { - float: right; -} - .btn-users { display: inline-flex; cursor: pointer; - padding: 0 7px; + padding: 6px 12px; .icon { display: inline-block; @@ -205,3 +206,19 @@ } } } + +.hedset { + font-size: 0; +} + +.btn-header { + border: 0 none; + height: @height-tabs; + background-color: transparent; + padding: 6px 12px; + + .icon { + width: 20px; + height: 20px; + } +} \ No newline at end of file