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

Merge in open-master, resolve conflicts

Browse Source
This commit is contained in:
Charles Hacskaylo
2015-06-16 13:53:00 -07:00
parent 732c0abf10 f6eb9904ff
commit 4887ba0e58
63 changed files with 4527 additions and 1544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,8 +51,7 @@
white-space: nowrap;
}
&.value {
//@include test(red);
//white-space: nowrap;
white-space: nowrap;
//width: 90%;
}
&.align-wrap {
@@ -69,55 +68,75 @@
}
&.arw-left {
margin-left: $arwSize*2;
margin-left: $bubbleArwSize*2;
.l-infobubble::before {
right: 100%;
border-top: $arwSize solid transparent;
border-bottom: $arwSize solid transparent;
border-right: ($arwSize * 1.5) solid $colorInfoBubbleBg;
@include triangle('left', $bubbleArwSize, 1.5, $colorInfoBubbleBg);
}
}
&.arw-right {
margin-right: $arwSize*2;
margin-right: $bubbleArwSize*2;
.l-infobubble::before {
left: 100%;
border-top: $arwSize solid transparent;
border-bottom: $arwSize solid transparent;
border-left: ($arwSize * 1.5) solid $colorInfoBubbleBg;
@include triangle('right', $bubbleArwSize, 1.5, $colorInfoBubbleBg);
}
}
&.arw-top {
.l-infobubble::before {
top: $arwSize * 2;
top: $bubbleArwSize * 2;
}
}
&.arw-btm {
.l-infobubble::before {
bottom: $arwSize * 2;
bottom: $bubbleArwSize * 2;
}
}
&.arw-down {
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;
}
}
.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;
}
}
.arw {
//left: 50%;
//margin-left: $bubbleArwSize / -2;
z-index: 2;
}
&.arw-up .arw.arw-down,
&.arw-down .arw.arw-up { display: none; }
}
//************************************************* LOOK AND FEEL
.l-thumbsbubble-wrapper {
.arw-up {
@include triangle('up', $bubbleArwSize, 1.5, $colorThumbsBubbleBg);
}
.arw-down {
@include triangle('down', $bubbleArwSize, 1.5, $colorThumbsBubbleBg);
}
}
.s-infobubble {
$emFg: darken($colorInfoBubbleFg, 20%);
@include border-radius($basicCr);
@include box-shadow(rgba(black, 0.4) 0 1px 5px);
background: $colorInfoBubbleBg;
color: $colorInfoBubbleFg;
font-size: 0.8rem;
@@ -137,5 +156,9 @@
.value {
color: $emFg;
}
}
.s-thumbsbubble {
background: $colorThumbsBubbleBg;
color: $colorThumbsBubbleFg;
}