alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging in open1248, resolve conflicts

Browse Source
This commit is contained in:
Charles Hacskaylo
2015-06-16 14:07:53 -07:00
parent 4887ba0e58 c6c4fa7182
commit c428df524c
7 changed files with 81 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
platform/commonUI/general/res/sass/helpers/_bubbles.scss
View File

@@ -24,11 +24,12 @@
.l-infobubble-wrapper {
$arwSize: 5px;
@include box-shadow(rgba(black, 0.4) 0 1px 5px);
position: absolute;
z-index: 70;
position: relative;
z-index: 50;
.l-infobubble {
display: inline-block;
max-width: 300px;
min-width: $bubbleMinW;
max-width: $bubbleMaxW;
padding: 5px 10px;
&:before {
content:"";
@@ -96,27 +97,17 @@
}
&.arw-down {
}
}
.l-thumbsbubble-wrapper {
$closeBtnD: 15px;
position: absolute;
left: $interiorMarginLg;
right: $interiorMarginLg;
height: $imageThumbsWrapperH + $bubblePad*2 + $interiorMargin;
width: auto;
.l-thumbsbubble {
@include absPosDefault();
.l-image-thumbs-wrapper {
height: auto;
top: $bubblePad !important; right: $closeBtnD + ($interiorMargin*2); bottom: $bubblePad !important; left: $bubblePad;
margin-bottom: $arwSize*2;
.l-infobubble::before {
left: 50%;
top: 100%;
margin-left: -1 * $arwSize;
border-left: $arwSize solid transparent;
border-right: $arwSize solid transparent;
border-top: ($arwSize * 1.5) solid $colorInfoBubbleBg;
}
}
.arw {
//left: 50%;
//margin-left: $bubbleArwSize / -2;
z-index: 2;
}
&.arw-up .arw.arw-down,