Merge branch 'open1172' of https://trunk.arc.nasa.gov/git/wtd into open1172

This commit is contained in:
Charles Hacskaylo 2015-05-06 10:10:55 -07:00
commit d75c873831
11 changed files with 198 additions and 46 deletions

View File

@ -122,21 +122,53 @@
height: 24px;
overflow-x: hidden;
overflow-y: auto; }
/* line 148, ../sass/plots/_plots-main.scss */
.gl-plot .l-limit {
position: absolute;
top: auto;
left: 0;
right: 0;
height: 30px;
width: auto; }
/* line 159, ../sass/plots/_plots-main.scss */
.gl-plot .l-limit.s-limit-upr.s-limit-0 {
background-image: -webkit-linear-gradient(0deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%);
background-image: -moz-linear-gradient(0deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%);
background-image: -o-linear-gradient(0deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%);
background-image: linear-gradient(0deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%); }
/* line 163, ../sass/plots/_plots-main.scss */
.gl-plot .l-limit.s-limit-upr.s-limit-1 {
background-image: -webkit-linear-gradient(0deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%);
background-image: -moz-linear-gradient(0deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%);
background-image: -o-linear-gradient(0deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%);
background-image: linear-gradient(0deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%); }
/* line 170, ../sass/plots/_plots-main.scss */
.gl-plot .l-limit.s-limit-lwr.s-limit-0 {
background-image: -webkit-linear-gradient(180deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%);
background-image: -moz-linear-gradient(180deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%);
background-image: -o-linear-gradient(180deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%);
background-image: linear-gradient(180deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%); }
/* line 174, ../sass/plots/_plots-main.scss */
.gl-plot .l-limit.s-limit-lwr.s-limit-1 {
background-image: -webkit-linear-gradient(180deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%);
background-image: -moz-linear-gradient(180deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%);
background-image: -o-linear-gradient(180deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%);
background-image: linear-gradient(180deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%); }
/* line 151, ../sass/plots/_plots-main.scss */
/* line 184, ../sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item,
.gl-plot-legend .legend-item,
.legend .plot-legend-item,
.legend .legend-item {
display: inline-block;
margin-right: 10px; }
/* line 154, ../sass/plots/_plots-main.scss */
/* line 187, ../sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item span,
.gl-plot-legend .legend-item span,
.legend .plot-legend-item span,
.legend .legend-item span {
vertical-align: middle; }
/* line 158, ../sass/plots/_plots-main.scss */
/* line 191, ../sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item .plot-color-swatch,
.gl-plot-legend .plot-legend-item .color-swatch,
.gl-plot-legend .legend-item .plot-color-swatch,
@ -155,16 +187,16 @@
width: 8px;
margin-right: 3px; }
/* line 172, ../sass/plots/_plots-main.scss */
/* line 205, ../sass/plots/_plots-main.scss */
.tick {
position: absolute;
border: 0 rgba(255, 255, 255, 0.3) solid; }
/* line 175, ../sass/plots/_plots-main.scss */
/* line 208, ../sass/plots/_plots-main.scss */
.tick.tick-x {
border-right-width: 1px;
height: 100%; }
/* line 183, ../sass/plots/_plots-main.scss */
/* line 216, ../sass/plots/_plots-main.scss */
.gl-plot-tick,
.tick-label {
font-size: 0.7rem;
@ -172,7 +204,7 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis; }
/* line 191, ../sass/plots/_plots-main.scss */
/* line 224, ../sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-x-tick-label, .gl-plot-tick.tick-label-x,
.tick-label.gl-plot-x-tick-label,
.tick-label.tick-label-x {
@ -183,7 +215,7 @@
width: 20%;
margin-left: -10%;
text-align: center; }
/* line 201, ../sass/plots/_plots-main.scss */
/* line 234, ../sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-y-tick-label, .gl-plot-tick.tick-label-y,
.tick-label.gl-plot-y-tick-label,
.tick-label.tick-label-y {
@ -193,18 +225,18 @@
margin-bottom: -0.5em;
text-align: right; }
/* line 212, ../sass/plots/_plots-main.scss */
/* line 245, ../sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-x-tick-label {
top: 5px; }
/* line 215, ../sass/plots/_plots-main.scss */
/* line 248, ../sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-y-tick-label {
right: 5px;
left: 5px; }
/* line 222, ../sass/plots/_plots-main.scss */
/* line 255, ../sass/plots/_plots-main.scss */
.tick-label.tick-label-x {
top: 0; }
/* line 225, ../sass/plots/_plots-main.scss */
/* line 258, ../sass/plots/_plots-main.scss */
.tick-label.tick-label-y {
right: 0;
left: 0; }

View File

@ -1,5 +1,5 @@
/* CONSTANTS */
/* line 17, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 17, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
@ -20,38 +20,38 @@ time, mark, audio, video {
font-size: 100%;
vertical-align: baseline; }
/* line 22, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
html {
line-height: 1; }
/* line 24, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
ol, ul {
list-style: none; }
/* line 26, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
table {
border-collapse: collapse;
border-spacing: 0; }
/* line 28, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
caption, th, td {
text-align: left;
font-weight: normal;
vertical-align: middle; }
/* line 30, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
q, blockquote {
quotes: none; }
/* line 103, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
q:before, q:after, blockquote:before, blockquote:after {
content: "";
content: none; }
/* line 32, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
a img {
border: none; }
/* line 116, ../../../../../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
display: block; }
@ -673,7 +673,7 @@ span {
display: inline-block;
font-size: 1rem;
vertical-align: middle; }
/* line 171, ../sass/_mixins.scss */
/* line 175, ../sass/_mixins.scss */
.invoke-menu:hover {
color: #33ccff; }
@ -685,7 +685,7 @@ span {
/* line 49, ../sass/_icons.scss */
.icon-buttons-main .invoke-menu {
color: #666666; }
/* line 171, ../sass/_mixins.scss */
/* line 175, ../sass/_mixins.scss */
.icon-buttons-main .invoke-menu:hover {
color: #999999; }
@ -1674,7 +1674,7 @@ label.checkbox.custom {
.menu-element .menu ul {
margin: 0;
padding: 0; }
/* line 179, ../sass/_mixins.scss */
/* line 183, ../sass/_mixins.scss */
.menu-element .menu ul li {
list-style-type: none;
margin: 0;
@ -2399,21 +2399,53 @@ input[type="text"] {
height: 24px;
overflow-x: hidden;
overflow-y: auto; }
/* line 148, ../sass/plots/_plots-main.scss */
.gl-plot .l-limit {
position: absolute;
top: auto;
left: 0;
right: 0;
height: 30px;
width: auto; }
/* line 159, ../sass/plots/_plots-main.scss */
.gl-plot .l-limit.s-limit-upr.s-limit-0 {
background-image: -webkit-linear-gradient(0deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%);
background-image: -moz-linear-gradient(0deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%);
background-image: -o-linear-gradient(0deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%);
background-image: linear-gradient(0deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%); }
/* line 163, ../sass/plots/_plots-main.scss */
.gl-plot .l-limit.s-limit-upr.s-limit-1 {
background-image: -webkit-linear-gradient(0deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%);
background-image: -moz-linear-gradient(0deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%);
background-image: -o-linear-gradient(0deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%);
background-image: linear-gradient(0deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%); }
/* line 170, ../sass/plots/_plots-main.scss */
.gl-plot .l-limit.s-limit-lwr.s-limit-0 {
background-image: -webkit-linear-gradient(180deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%);
background-image: -moz-linear-gradient(180deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%);
background-image: -o-linear-gradient(180deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%);
background-image: linear-gradient(180deg, rgba(204, 153, 0, 0), rgba(204, 153, 0, 0.4) 100%); }
/* line 174, ../sass/plots/_plots-main.scss */
.gl-plot .l-limit.s-limit-lwr.s-limit-1 {
background-image: -webkit-linear-gradient(180deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%);
background-image: -moz-linear-gradient(180deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%);
background-image: -o-linear-gradient(180deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%);
background-image: linear-gradient(180deg, rgba(204, 0, 0, 0), rgba(204, 0, 0, 0.4) 100%); }
/* line 151, ../sass/plots/_plots-main.scss */
/* line 184, ../sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item,
.gl-plot-legend .legend-item,
.legend .plot-legend-item,
.legend .legend-item {
display: inline-block;
margin-right: 10px; }
/* line 154, ../sass/plots/_plots-main.scss */
/* line 187, ../sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item span,
.gl-plot-legend .legend-item span,
.legend .plot-legend-item span,
.legend .legend-item span {
vertical-align: middle; }
/* line 158, ../sass/plots/_plots-main.scss */
/* line 191, ../sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item .plot-color-swatch,
.gl-plot-legend .plot-legend-item .color-swatch,
.gl-plot-legend .legend-item .plot-color-swatch,
@ -2432,16 +2464,16 @@ input[type="text"] {
width: 8px;
margin-right: 3px; }
/* line 172, ../sass/plots/_plots-main.scss */
/* line 205, ../sass/plots/_plots-main.scss */
.tick {
position: absolute;
border: 0 rgba(255, 255, 255, 0.3) solid; }
/* line 175, ../sass/plots/_plots-main.scss */
/* line 208, ../sass/plots/_plots-main.scss */
.tick.tick-x {
border-right-width: 1px;
height: 100%; }
/* line 183, ../sass/plots/_plots-main.scss */
/* line 216, ../sass/plots/_plots-main.scss */
.gl-plot-tick,
.tick-label {
font-size: 0.7rem;
@ -2449,7 +2481,7 @@ input[type="text"] {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis; }
/* line 191, ../sass/plots/_plots-main.scss */
/* line 224, ../sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-x-tick-label, .gl-plot-tick.tick-label-x,
.tick-label.gl-plot-x-tick-label,
.tick-label.tick-label-x {
@ -2460,7 +2492,7 @@ input[type="text"] {
width: 20%;
margin-left: -10%;
text-align: center; }
/* line 201, ../sass/plots/_plots-main.scss */
/* line 234, ../sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-y-tick-label, .gl-plot-tick.tick-label-y,
.tick-label.gl-plot-y-tick-label,
.tick-label.tick-label-y {
@ -2470,18 +2502,18 @@ input[type="text"] {
margin-bottom: -0.5em;
text-align: right; }
/* line 212, ../sass/plots/_plots-main.scss */
/* line 245, ../sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-x-tick-label {
top: 5px; }
/* line 215, ../sass/plots/_plots-main.scss */
/* line 248, ../sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-y-tick-label {
right: 5px;
left: 5px; }
/* line 222, ../sass/plots/_plots-main.scss */
/* line 255, ../sass/plots/_plots-main.scss */
.tick-label.tick-label-x {
top: 0; }
/* line 225, ../sass/plots/_plots-main.scss */
/* line 258, ../sass/plots/_plots-main.scss */
.tick-label.tick-label-y {
right: 0;
left: 0; }
@ -2940,10 +2972,10 @@ input[type="text"] {
.wait-spinner {
display: block;
position: absolute;
-webkit-animation: rotation 0.6s infinite linear;
-moz-animation: rotation 0.6s infinite linear;
-o-animation: rotation 0.6s infinite linear;
animation: rotation 0.6s infinite linear;
-webkit-animation: rotation .6s infinite linear;
-moz-animation: rotation .6s infinite linear;
-o-animation: rotation .6s infinite linear;
animation: rotation .6s infinite linear;
border-color: rgba(0, 153, 204, 0.25);
border-top-color: #0099cc;
border-style: solid;
@ -2982,10 +3014,10 @@ input[type="text"] {
.treeview .wait-spinner {
display: block;
position: absolute;
-webkit-animation: rotation 0.6s infinite linear;
-moz-animation: rotation 0.6s infinite linear;
-o-animation: rotation 0.6s infinite linear;
animation: rotation 0.6s infinite linear;
-webkit-animation: rotation .6s infinite linear;
-moz-animation: rotation .6s infinite linear;
-o-animation: rotation .6s infinite linear;
animation: rotation .6s infinite linear;
border-color: rgba(0, 153, 204, 0.25);
border-top-color: #0099cc;
border-style: solid;

View File

@ -2,7 +2,7 @@
ul.tree {
margin: 0;
padding: 0; }
/* line 179, ../sass/_mixins.scss */
/* line 183, ../sass/_mixins.scss */
ul.tree li {
list-style-type: none;
margin: 0;

View File

@ -2,7 +2,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg>
<metadata>
Created by FontForge 20090622 at Tue Apr 28 20:52:23 2015
Created by FontForge 20090622 at Mon May 4 20:21:42 2015
By deploy user
Copyright 2015 Adobe Systems Incorporated. All rights reserved.
</metadata>
@ -224,6 +224,14 @@ d="M188 235h-160q-28 67 -28 140q0 156 110 265.5t265 109.5q88 0 164 -37t129 -103h
q39 0 66 27.5t27 66.5v93h2h186q39 0 66.5 27.5t27.5 66.5v94h1z" />
<glyph glyph-name="ecircumflex" unicode="&#xea;" horiz-adv-x="751"
d="M376 750v-375h375v-235q0 -58 -41.5 -99t-99.5 -41h-469q-58 0 -99 41t-41 99v469q0 58 41 99.5t99 41.5h235zM470 750l281 -281h-281v281z" />
<glyph glyph-name="edieresis" unicode="&#xeb;" horiz-adv-x="748"
d="M374 376l374 -375h-749zM374 750l374 -374h-749z" />
<glyph glyph-name="igrave" unicode="&#xec;" horiz-adv-x="748"
d="M748 750l-375 -750l-374 750h749z" />
<glyph glyph-name="iacute" unicode="&#xed;" horiz-adv-x="748"
d="M-1 0l375 750l374 -750h-749z" />
<glyph glyph-name="icircumflex" unicode="&#xee;" horiz-adv-x="748"
d="M748 750l-375 -375l-374 375h749zM748 375l-375 -374l-374 374h749z" />
<glyph glyph-name="fraction" unicode="&#x2044;" horiz-adv-x="761"
d="M380 751q158 0 269.5 -111.5t111.5 -268.5q0 -133 -82.5 -236.5t-209.5 -134.5l-4 491l-176 -490q-126 31 -207.5 134.5t-81.5 235.5q0 157 111.5 268.5t268.5 111.5zM168 488l55 20l-34 94l-56 -20zM410 530v100h-59v-100h59zM593 488l34 94l-55 20l-34 -94z" />
<glyph glyph-name="H.002" horiz-adv-x="803"

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -157,6 +157,10 @@
@include box-shadow(rgba($color, $sVal) 0 0 30px);
}
@mixin linearGlow($deg: 0, $c: red, $a: 0.4) {
@include background-image(linear-gradient($deg, rgba($c,0), rgba($c, $a) 100%));
}
@mixin txtShdwSubtle($sVal: 0.1) {
@include text-shadow(rgba(black, $sVal) 0 1px 2px);
}

View File

@ -144,6 +144,39 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa
// }
// }
}
.l-limit {
// @include linearGlow(0,#66cc66);
// @include test();
$cLimit0: #cc9900;
$cLimit1: #cc0000;
$h: 30px;
position: absolute;
top: auto; left: 0; right: 0;
height: $h; width: auto;
&.s-limit-upr {
// border-top: 1px solid;
&.s-limit-0 {
// border-color: $cLimit0;
@include linearGlow(0deg,$cLimit0);
}
&.s-limit-1 {
// border-color: $cLimit1;
@include linearGlow(0deg,$cLimit1);
}
}
&.s-limit-lwr {
// border-bottom: 1px solid;
&.s-limit-0 {
// border-color: $cLimit0;
@include linearGlow(180deg,$cLimit0);
}
&.s-limit-1 {
// border-color: $cLimit1;
@include linearGlow(180deg,$cLimit1);
}
}
}
}
.gl-plot-legend,
.legend {

View File

@ -0,0 +1,30 @@
{
"extensions": {
"types": [
{
"key": "example.limits",
"name": "Limits Examples",
"glyph": "\u00EB",
"description": "Markup and styles exercised for limits displays",
"features": [ "creation" ],
"properties": [
{
"key": "url",
"name": "URL",
"control": "textfield",
"pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$",
"required": false
}
]
}
],
"views": [
{
"templateUrl": "examples.html",
"name": "Limits Examples",
"type": "example.limits",
"key": "example.limits"
}
]
}
}

View File

@ -0,0 +1,13 @@
<h1>Limits Examples</h1>
<h2>Plot limits</h2>
<div style="width: 1000px; height: 500px">
<div class="gl-plot" style="height: 100%;">
<div class="gl-plot-display-area">
<div class="t-limit l-limit s-limit-upr s-limit-1" style="bottom: 80%"></div>
<div class="t-limit l-limit s-limit-upr s-limit-0" style="bottom: 50%"></div>
<div class="t-limit l-limit s-limit-lwr s-limit-0" style="bottom: 30%"></div>
<div class="t-limit l-limit s-limit-lwr s-limit-1" style="bottom: 10%"></div>
</div>
</div>
</div>