From 69c6d4bd262bc0371df683b70bc6acb4203c375f Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 24 Aug 2015 16:31:38 -0700 Subject: [PATCH] [Mobile] IN PROGRESS: Tweaks to labels; open #74 Cleaned up layout of bottom-bar; Fixed class selector for ue-bottom-bar; --- platform/commonUI/general/res/css/items.css | 24 +++++++++---------- .../general/res/css/theme-espresso.css | 6 ++--- .../general/res/sass/items/_item.scss | 3 ++- .../res/sass/user-environ/_layout.scss | 2 +- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index 9ea92fa707..cf77cbed9a 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -234,12 +234,12 @@ /* line 79, ../sass/items/_item.scss */ .items-holder .item.grid-item .bar.bottom-bar { top: auto; - height: 30px; } - /* line 84, ../sass/items/_item.scss */ + line-height: 110%; } + /* line 85, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main { line-height: 160px; z-index: 1; } - /* line 90, ../sass/items/_item.scss */ + /* line 91, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-type { overflow: false; position: absolute; @@ -255,7 +255,7 @@ bottom: auto; height: 102px; top: 30px; } - /* line 102, ../sass/items/_item.scss */ + /* line 103, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-type .l-icon-link { color: #49dedb; height: auto; @@ -265,7 +265,7 @@ left: 0px; bottom: 10px; z-index: 2; } - /* line 115, ../sass/items/_item.scss */ + /* line 116, ../sass/items/_item.scss */ .items-holder .item.grid-item .item-main .item-open { -moz-transition-property: "opacity"; -o-transition-property: "opacity"; @@ -285,17 +285,17 @@ width: 50px; pointer-events: none; text-align: right; } - /* line 127, ../sass/items/_item.scss */ + /* line 128, ../sass/items/_item.scss */ .items-holder .item.grid-item .title { text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: #cccccc; } - /* line 132, ../sass/items/_item.scss */ + /* line 133, ../sass/items/_item.scss */ .items-holder .item.grid-item .details { font-size: 0.8em; } - /* line 135, ../sass/items/_item.scss */ + /* line 136, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzBhYzJmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwYjRmMCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; @@ -332,16 +332,16 @@ /* line 175, ../sass/_mixins.scss */ .items-holder .item.grid-item.selected.btn-menu .invoke-menu { color: #52d4ff; } - /* line 140, ../sass/items/_item.scss */ + /* line 141, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .item-type, .items-holder .item.grid-item.selected .top-bar .icon:not(.alert) { color: #80dfff; } - /* line 141, ../sass/items/_item.scss */ + /* line 142, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .item-main .item-open { color: #80dfff; } - /* line 142, ../sass/items/_item.scss */ + /* line 143, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected .title { color: white; } - /* line 144, ../sass/items/_item.scss */ + /* line 145, ../sass/items/_item.scss */ .items-holder .item.grid-item.selected:hover .item-main .item-type { color: white !important; } diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 1ead13f014..61044025cd 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -594,7 +594,7 @@ mct-container { .user-environ .edit-area .work-area { top: 40px; } /* line 129, ../sass/user-environ/_layout.scss */ -.user-environ .bottom-bar { +.user-environ .ue-bottom-bar { overflow: hidden; position: absolute; top: 0; @@ -606,10 +606,10 @@ mct-container { top: auto; height: 25px; } /* line 134, ../sass/user-environ/_layout.scss */ - .user-environ .bottom-bar .status-holder { + .user-environ .ue-bottom-bar .status-holder { z-index: 1; } /* line 138, ../sass/user-environ/_layout.scss */ - .user-environ .bottom-bar .app-logo { + .user-environ .ue-bottom-bar .app-logo { left: auto; width: 105px; z-index: 2; } diff --git a/platform/commonUI/general/res/sass/items/_item.scss b/platform/commonUI/general/res/sass/items/_item.scss index d9c9d8613b..c04568d8fa 100644 --- a/platform/commonUI/general/res/sass/items/_item.scss +++ b/platform/commonUI/general/res/sass/items/_item.scss @@ -78,7 +78,8 @@ } &.bottom-bar { top: auto; - height: $ueBrowseGridItemBottomBarH; + //height: $ueBrowseGridItemBottomBarH; + line-height: 110%; } } .item-main { diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 7bca0d480b..9538a2bb74 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -126,7 +126,7 @@ } } - .bottom-bar { + .ue-bottom-bar { //@include absPosDefault($bodyMargin); @include absPosDefault(0);// New status bar design top: auto;