diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index d476921eaf..c86b44e496 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -50,7 +50,7 @@ <mct-representation mct-object="navigatedObject" key="'browse-object'"> </mct-representation> </div> - <div class="s-very-subtle key-properties ui-symbol mobile-menu-icon button-pos" + <div class="left s-very-subtle key-properties ui-symbol mobile-menu-icon button-pos" ng-click="treeSlide()">m</div> </div> </mct-split-pane> diff --git a/platform/commonUI/browse/res/templates/browse/object-header.html b/platform/commonUI/browse/res/templates/browse/object-header.html index 583940aaab..f4b17bf79e 100644 --- a/platform/commonUI/browse/res/templates/browse/object-header.html +++ b/platform/commonUI/browse/res/templates/browse/object-header.html @@ -23,7 +23,7 @@ <span class="label s-label"> <span class='type-icon icon ui-symbol'>{{type.getGlyph()}}</span> <span ng-if="parameters.mode" class='action'>{{parameters.mode}}</span> - <span class='type-name'>{{type.getName()}}</span> + <span class='type-name mobile-text-hide'>{{type.getName()}}</span> <span class='title-label'>{{model.name}}</span> <!--a id='actions-menu' class='ui-symbol context-available' onclick="alert('Not yet functional. This will display a dropdown menu of options for this object.');">v</a--> </span> diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index ebf5cef519..70c65c582f 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -858,7 +858,7 @@ mct-container { /* line 138, ../sass/mobile/_layout.scss */ .mobile-menu-icon { - top: 5px; } + display: inline-block; } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) { /* line 138, ../sass/mobile/_layout.scss */ .mobile-menu-icon { @@ -877,8 +877,14 @@ mct-container { .mobile-hide { display: none; } } -@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) { +@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { /* line 158, ../sass/mobile/_layout.scss */ + .mobile-text-hide { + width: 0px; + overflow: hidden; } } + +@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) { + /* line 165, ../sass/mobile/_layout.scss */ .phone-hide { display: none; } } diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss index 93f35661ba..2d72aba1ff 100644 --- a/platform/commonUI/general/res/sass/mobile/_layout.scss +++ b/platform/commonUI/general/res/sass/mobile/_layout.scss @@ -136,7 +136,7 @@ } .mobile-menu-icon { - top: $interiorMargin; + display: inline-block; @include phone { font-size: 125%; } @@ -155,6 +155,13 @@ } } +.mobile-text-hide { + @include phoneandtablet { + width: 0px; + overflow:hidden; + } +} + .phone-hide { @include phone { display: none;