diff --git a/platform/commonUI/general/res/css/plots.css b/platform/commonUI/general/res/css/plots.css index 62cf0bca2a..0e8c453481 100644 --- a/platform/commonUI/general/res/css/plots.css +++ b/platform/commonUI/general/res/css/plots.css @@ -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; } diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index b2668e99a7..0da6913607 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -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; diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css index 9afd2d8968..38bb95fffb 100644 --- a/platform/commonUI/general/res/css/tree.css +++ b/platform/commonUI/general/res/css/tree.css @@ -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; diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 3c5326579b..b786d0460b 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -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); } diff --git a/platform/commonUI/general/res/sass/plots/_plots-main.scss b/platform/commonUI/general/res/sass/plots/_plots-main.scss index e0304db48b..fc6b847af4 100644 --- a/platform/commonUI/general/res/sass/plots/_plots-main.scss +++ b/platform/commonUI/general/res/sass/plots/_plots-main.scss @@ -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 { diff --git a/platform/features/temp-limits/bundle.json b/platform/features/temp-limits/bundle.json new file mode 100644 index 0000000000..ed4ce4b2f7 --- /dev/null +++ b/platform/features/temp-limits/bundle.json @@ -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" + } + ] + } +} \ No newline at end of file diff --git a/platform/features/temp-limits/res/examples.html b/platform/features/temp-limits/res/examples.html new file mode 100644 index 0000000000..cdcb989f4a --- /dev/null +++ b/platform/features/temp-limits/res/examples.html @@ -0,0 +1,13 @@ +

Limits Examples

+ +

Plot limits

+
+
+
+
+
+
+
+
+
+
\ No newline at end of file