[Frontend] Safety merge of master; minor fixes

open #90
IN-PROGRESS
Merged in latest from github/master;
Fixed margins when in edit mode;
Fixed edit area not utilizing overflow: auto properly;
TO-DO: verify mobile is Ok;
This commit is contained in:
Charles Hacskaylo
2015-10-30 17:09:04 -07:00
parent b5b6546710
commit c913f173e3
14 changed files with 704 additions and 337 deletions

View File

@@ -42,22 +42,20 @@
@include border-radius($splitterEndCr);
}
}
&:not(:active) {
&:after {
@include trans-prop-nice(background-color, 150ms);
}
}
&:active {
//@include test();
&:after {
background-color: $colorSplitterActive !important;
}
}
@if $colorSplitterHover != 'none' {
&:hover {
&:after {
@include trans-prop-nice(background-color, 150ms);
background-color: $colorSplitterHover;
&:not(:active) {
&:hover {
&:after {
background-color: $colorSplitterHover !important;
@include trans-prop-nice(background-color, 150ms);
}
}
}
}

View File

@@ -95,9 +95,7 @@
}
.user-environ {
.browse-area,
.edit-area,
.editor {
top: 0; left: 0; right: 0; bottom: $ueFooterH;
}
@@ -113,13 +111,17 @@
.edit-area {
$tbH: $btnToolbarH + $interiorMargin;
top: $bodyMargin + $ueTopBarEditH + ($interiorMargin);
left: $bodyMargin;
right: $bodyMargin;
bottom: $bodyMargin + $ueFooterH;
.tool-bar {
bottom: auto;
height: $tbH;
line-height: $btnToolbarH;
}
.work-area {
.object-holder.work-area {
top: $tbH + $interiorMargin * 2;
overflow: auto;
}
}