Merging ue-frontend

2015-06-02 17:44:59 -07:00
parent ca4f37b259 b09ec23617
commit 0fbb54add3
30 changed files with 1357 additions and 920 deletions
--- a/platform/commonUI/general/res/sass/user-environ/_top-bar.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_top-bar.scss
@@ -22,13 +22,13 @@
 .top-bar {
 //	$h: $ueTopBarH - 5px;
 //	background: rgba(#ff0000, 0.2);
-	line-height: $ueTopBarH;
+//	line-height: $ueTopBarBtnH;

    &.browse,
    &.edit {
 	    border-bottom: 1px solid $colorInteriorBorder;
        top: $bodyMargin; right: $bodyMargin; bottom: auto; left: $bodyMargin;
-        height: $ueTopBarH;
+        height: $ueTopBarEditH;
    }
 	
 	.action {