ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-03-23 04:25:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'open-master' into open660

Browse Source 
Merge latest from master branch into open-source-friendly
topic branch for staleness indicator, WTD-660
This commit is contained in:
Victor Woeltjen 2015-01-27 17:34:01 -08:00
commit 376a0cbfc2
20 changed files with 549 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@ -7,6 +7,10 @@
src="platform/framework/lib/require.js"
data-main="platform/framework/src/Main.js">
</script>
<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
<link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
</head>
<body class="user-environ" ng-view>

29
platform/commonUI/about/res/templates/about-dialog.html
View File

@ -1,12 +1,21 @@
<div ng-controller = "AboutController as about">
This is a placeholder for the about dialog.
<div class="abs t-about l-about t-about-openmctweb" ng-controller = "AboutController as about">
<div class="l-logo-holder s-logo-holder">
<div class="l-logo s-logo s-logo-nasa"></div>
<div class="l-logo l-logo-app s-logo s-logo-openmctweb"></div>
</div>
<a ng-click="about.openLicenses()">Show licenses.</a>
<p ng-repeat = "version in about.versions()">
<span title="{{version.description}}">
<b>{{version.name}}</b>
<i>{{version.value}}</i>
</span>
</p>
<div class="l-content">
<h1 class="l-title s-title">OpenMCT Web</h1>
<div class="l-description s-description">
<p>OpenMCT Web is a project of NASA's Ames Research Center. Copyright &copy;2015 NASA Ames Research Center, all rights reserved. <a ng-click="about.openLicenses()">Licensing information</a></p>
</div>
<h2>Version Information</h2>
<ul class="t-info l-info s-info" ng-repeat = "version in about.versions()">
<li title="{{version.description}}">
<span class="info version-name">{{version.name}}</span>
<span class="info version-value">{{version.value}}</span>
</li>
</ul>
</div>
</div>

4
platform/commonUI/about/res/templates/app-logo.html
View File

@ -1 +1,3 @@
<span><div class='app-logo abs'>Open MCT Web</div></span>
<span ng-controller = "AboutController as about">
<div class='app-logo logo-openmctweb abs' title="Version {{about.versions()[0].value}}"></div>
</span>

148
platform/commonUI/general/res/css/theme-espresso.css
View File

@ -123,16 +123,22 @@ h1, h2, h3 {
/* line 48, ../sass/_global.scss */
h1 {
font-size: 1.7em;
font-weight: normal;
margin-bottom: 20px; }
font-weight: normal !important;
line-height: 120%;
margin-bottom: 20px;
margin-top: 0; }
/* line 54, ../sass/_global.scss */
/* line 56, ../sass/_global.scss */
p {
margin-bottom: 10px; }
/* line 60, ../sass/_global.scss */
span {
/* 618 DEBUG
box-sizing: border-box;
*/ }
/* line 60, ../sass/_global.scss */
/* line 66, ../sass/_global.scss */
.abs {
position: absolute;
top: 0;
@ -142,32 +148,36 @@ span {
height: auto;
width: auto; }
/* line 70, ../sass/_global.scss */
/* line 76, ../sass/_global.scss */
.code {
font-family: "Lucida Console", monospace;
font-size: 0.7em;
line-height: 150%;
white-space: pre; }
/* line 77, ../sass/_global.scss */
/* line 83, ../sass/_global.scss */
.centered {
text-align: center; }
/* line 81, ../sass/_global.scss */
/* line 87, ../sass/_global.scss */
.colorKey {
color: #0099cc; }
/* line 85, ../sass/_global.scss */
/* line 91, ../sass/_global.scss */
.ds {
-webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px;
-moz-box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px;
box-shadow: rgba(0, 0, 0, 0.7) 0 4px 10px 2px; }
/* line 90, ../sass/_global.scss */
/* line 96, ../sass/_global.scss */
.hide,
.hidden {
display: none !important; }
/* line 100, ../sass/_global.scss */
.sep {
color: rgba(255, 255, 255, 0.2); }
/* line 1, ../sass/_fonts.scss */
.ui-symbol {
font-family: 'symbolsfont'; }
@ -208,11 +218,11 @@ span {
height: 20px; }
/* line 49, ../sass/user-environ/_layout.scss */
.user-environ .bottom-bar .status-holder {
right: 100px; }
right: 110px; }
/* line 52, ../sass/user-environ/_layout.scss */
.user-environ .bottom-bar .app-logo {
left: auto;
width: 95px; }
width: 105px; }
/* line 60, ../sass/user-environ/_layout.scss */
.contents {
@ -341,6 +351,61 @@ span {
.vscroll {
overflow-y: auto; }
/* line 3, ../sass/_about.scss */
.t-about {
line-height: 120%; }
/* line 7, ../sass/_about.scss */
.t-about .s-description,
.t-about .s-info {
font-size: 0.8em; }
/* line 10, ../sass/_about.scss */
.t-about .s-logo-holder {
background: url("../images/bg-about-openmctweb.jpg") no-repeat center;
background-size: cover; }
/* line 14, ../sass/_about.scss */
.t-about .s-logo {
background-position: center;
background-repeat: no-repeat;
background-size: contain; }
/* line 20, ../sass/_about.scss */
.t-about .s-logo-openmctweb {
background-image: url("../images/logo-openmctweb-shdw.svg"); }
/* line 23, ../sass/_about.scss */
.t-about h1, .t-about h2 {
color: #fff;
font-weight: normal !important; }
/* line 29, ../sass/_about.scss */
.t-about.l-about.abs {
overflow: auto; }
/* line 34, ../sass/_about.scss */
.t-about .l-logo-holder {
position: relative;
height: 45%; }
/* line 37, ../sass/_about.scss */
.t-about .l-logo-holder .l-logo {
position: absolute; }
/* line 40, ../sass/_about.scss */
.t-about .l-logo-holder .l-logo.l-logo-app {
top: 0;
right: 15%;
bottom: 0;
left: 15%; }
/* line 44, ../sass/_about.scss */
.t-about .l-logo-holder .l-logo.s-logo-nasa {
background-image: url("../images/logo-nasa.svg");
top: 10px;
right: auto;
bottom: auto;
left: 10px;
width: 10%;
height: auto;
padding-bottom: 5%;
padding-top: 5%; }
/* line 53, ../sass/_about.scss */
.t-about .l-content {
position: relative;
margin-top: 10px; }
/* line 1, ../sass/_badges.scss */
.badge {
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffd233), color-stop(100%, #ffc700));
@ -422,7 +487,7 @@ span {
display: inline-block;
font-size: 1rem;
vertical-align: middle; }
/* line 123, ../sass/_mixins.scss */
/* line 126, ../sass/_mixins.scss */
.invoke-menu:hover {
color: #33ccff; }
@ -434,7 +499,7 @@ span {
/* line 49, ../sass/_icons.scss */
.icon-buttons-main .invoke-menu {
color: #666666; }
/* line 123, ../sass/_mixins.scss */
/* line 126, ../sass/_mixins.scss */
.icon-buttons-main .invoke-menu:hover {
color: #999999; }
@ -1342,7 +1407,7 @@ label.checkbox.custom {
.menu-element .menu ul {
margin: 0;
padding: 0; }
/* line 131, ../sass/_mixins.scss */
/* line 134, ../sass/_mixins.scss */
.menu-element .menu ul li {
list-style-type: none;
margin: 0;
@ -2108,12 +2173,20 @@ input[type="text"] {
z-index: 100; }
/* line 6, ../sass/overlay/_overlay.scss */
.overlay .btn.close {
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
-ms-border-radius: 6px;
-o-border-radius: 6px;
border-radius: 6px;
padding: 3px 6px;
position: absolute;
top: 5px;
right: 5px;
border: none;
top: 3px;
right: 3px;
bottom: auto;
left: auto; }
/* line 13, ../sass/overlay/_overlay.scss */
left: auto;
z-index: 100; }
/* line 17, ../sass/overlay/_overlay.scss */
.overlay > .holder {
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040));
background-image: -webkit-linear-gradient(#4d4d4d, #404040);
@ -2145,25 +2218,25 @@ input[type="text"] {
bottom: 15%;
left: 15%;
z-index: 101; }
/* line 20, ../sass/overlay/_overlay.scss */
/* line 24, ../sass/overlay/_overlay.scss */
.overlay > .holder > .contents {
top: 20px;
right: 20px;
bottom: 20px;
left: 20px; }
/* line 25, ../sass/overlay/_overlay.scss */
top: 25px;
right: 25px;
bottom: 25px;
left: 25px; }
/* line 29, ../sass/overlay/_overlay.scss */
.overlay .title {
font-size: 1.3em; }
/* line 29, ../sass/overlay/_overlay.scss */
/* line 33, ../sass/overlay/_overlay.scss */
.overlay .top-bar {
height: 60px; }
/* line 33, ../sass/overlay/_overlay.scss */
/* line 37, ../sass/overlay/_overlay.scss */
.overlay .editor {
top: 70px;
bottom: 50px;
left: 0;
right: 0; }
/* line 39, ../sass/overlay/_overlay.scss */
/* line 43, ../sass/overlay/_overlay.scss */
.overlay .bottom-bar {
top: auto;
right: 0;
@ -2172,7 +2245,7 @@ input[type="text"] {
font-size: 1em;
height: 40px;
text-align: right; }
/* line 44, ../sass/overlay/_overlay.scss */
/* line 48, ../sass/overlay/_overlay.scss */
.overlay .bottom-bar .btn {
margin-left: 10px; }
@ -2252,23 +2325,20 @@ input[type="text"] {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
cursor: pointer;
font-size: 0.8em;
line-height: 10px;
padding-top: 1px;
text-transform: uppercase; }
/* line 19, ../sass/user-environ/_bottom-bar.scss */
.ue-bottom-bar .app-logo.logo-warp {
background: url("../images/logo-warp.png") no-repeat left top;
color: #999999;
font-size: 0.7rem;
padding-top: 3px;
text-align: right; }
/* line 20, ../sass/user-environ/_bottom-bar.scss */
.ue-bottom-bar .app-logo.logo-openmctweb {
background: url("../images/logo-openmctweb.svg") no-repeat center center; }
/* line 29, ../sass/user-environ/_bottom-bar.scss */
/* line 26, ../sass/user-environ/_bottom-bar.scss */
.status.block {
display: inline-block;
margin-right: 20px; }
/* line 32, ../sass/user-environ/_bottom-bar.scss */
/* line 29, ../sass/user-environ/_bottom-bar.scss */
.status.block .status-indicator {
-webkit-border-radius: 2.7px;
-moz-border-radius: 2.7px;
@ -2283,10 +2353,10 @@ input[type="text"] {
font-size: 1.25em;
vertical-align: middle;
margin-right: 5px; }
/* line 40, ../sass/user-environ/_bottom-bar.scss */
/* line 37, ../sass/user-environ/_bottom-bar.scss */
.status.block .status-indicator.ok {
color: #009900; }
/* line 43, ../sass/user-environ/_bottom-bar.scss */
/* line 40, ../sass/user-environ/_bottom-bar.scss */
.status.block .status-indicator.caution {
color: #ffaa00; }

2
platform/commonUI/general/res/css/tree.css
View File

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

BIN
platform/commonUI/general/res/images/bg-about-openmctweb.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 218 KiB

BIN
platform/commonUI/general/res/images/favicons/favicon-16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
platform/commonUI/general/res/images/favicons/favicon-32x32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
platform/commonUI/general/res/images/favicons/favicon-96x96.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
platform/commonUI/general/res/images/favicons/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

159
platform/commonUI/general/res/images/logo-nasa.svg Normal file
View File

@ -0,0 +1,159 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="NASA_insignia_color" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
x="0px" y="0px" width="318px" height="260px" viewBox="0 0 318 260" enable-background="new 0 0 318 260" xml:space="preserve">
<path fill="#0B3D91" d="M275.948,130.19c0,69.085-56.915,125.944-126.068,125.944S23.811,199.275,23.811,130.19
c0-69.086,56.915-125.944,126.068-125.944S275.948,61.104,275.948,130.19z"/>
<path fill="#FFFFFF" d="M178.316,196.477c53.713,22.095,44.551-33.774,15.798-76.703c-16.269-24.291-37.487-44.525-50.87-54.292
c-44.55-32.512-71.723-12.626-40.443,51.136c10.133,20.655,23.146,34.595,33.313,47.733c7.762,10.03,22.884,15.054,17.557,19.815
c-6.004,5.366-20.538-18.308-20.538-18.308c-10.742-12.941-20.972-26.762-31.516-45.711C77.525,76.845,81,32.654,124.603,51.909
c37.008,16.343,72.355,62.183,86.571,94.737c6.587,15.086,24.332,74.451-32.542,50.463"/>
<path fill="#FC3D21" d="M10.826,167.524c23.697-15.783,46.161-25.971,84.393-38.597c53.718-17.741,94.156-29.671,143.763-54.607
c24.158-12.144,59.858-35.653,74.25-58.396c-4.121,8.423-16.642,25.26-22.434,32.512C223.499,132.715,80.125,127.94,11.77,168.405"
/>
<path fill="#FFFFFF" d="M45.201,105.929c21.582,0.167,19.56-0.044,19.812,0.209c0.379,0,17.315,29.166,17.315,29.418
c0,0.127-0.126-10.365-0.126-23.484c0-1.515-4.171-5.935-4.045-5.935c6.191,0,14.282,0.126,14.282,0.126
c-3.033,3.535-3.639,3.245-3.665,5.429c-0.084,7.028-0.166,20.012,0,34.595c0.025,2.186,1.643,3.03,4.297,6.818H73.228
c-6.446-10.732-18.256-30.865-18.2-30.808c0.092,0.092-0.252,12.626,0.127,22.726c0.125,3.337,1.643,4.419,4.424,7.45
c0,0,3.202-0.085-15.545,0.125c5.687-3.029,4.931-6.817,4.929-6.943c-0.205-13.952-0.042-25.884-0.042-33.586
c0-1.263-0.084-1.137-4.002-5.935"/>
<g>
<path fill="#FFFFFF" d="M112.971,127.475c1.818-6.321,3.375-11.973,4.112-15.656c0.126-0.631-1.39-2.904-3.792-5.176l-0.169-0.353
c11.58,0.038,23.677,0.1,23.677,0.1c3.16,7.702,10.363,29.292,15.798,42.549c1.437,3.505,3.918,4.167,3.918,4.167
c-9.858-0.127-28.152-0.042-28.058-0.127c4.929-4.418,4.297-4.418,2.148-10.857h-15.419c-3.16,7.322,0.985,10.759,1.517,10.731
c-3.51,0.181-15.419,0-15.419,0c6.445-4.546,6.066-5.935,6.066-5.935C109.122,140.62,111.175,133.721,112.971,127.475l6.324,0.001
c-1.358,4.357-2.717,8.712-2.717,8.712h12.259l-6.825-17.424c0,0-1.358,4.356-2.717,8.711L112.971,127.475z"/>
</g>
<g>
<path fill="#FFFFFF" d="M218.881,128.106c1.818-6.321,3.375-11.973,4.112-15.655c0.126-0.632-1.391-2.904-3.791-5.177l-0.169-0.353
c11.58,0.038,23.676,0.1,23.676,0.1c3.16,7.702,10.364,29.292,15.798,42.55c1.437,3.505,3.919,4.166,3.919,4.166
c-9.858-0.126-28.152-0.041-28.058-0.126c4.929-4.419,4.297-4.419,2.148-10.858h-15.419c-3.16,7.322,0.985,10.76,1.517,10.732
c-3.511,0.18-15.419,0-15.419,0c6.445-4.546,6.066-5.935,6.066-5.935C215.032,141.252,217.085,134.353,218.881,128.106l6.324,0
c-1.359,4.356-2.717,8.712-2.717,8.712h12.259l-6.824-17.424c0,0-1.359,4.356-2.718,8.712L218.881,128.106z"/>
</g>
<path fill="#FFFFFF" d="M198.98,117.753c-0.253-8.964,0-11.869,0-11.869c-3.918,3.157-1.939,2.756-11.754,1.136
c-28.311-4.671-30.459,21.717-15.04,27.652c12.918,4.971,17.49,5.943,15.545,10.605c-0.632,1.515-12.386,7.07-24.518-4.167
l0.254,15.657c1.516-1.562,5.688-4.42,5.688-4.42c0.125,0,13.147,5.739,24.897-0.252c18.072-9.217,9.051-24.133-10.237-30.05
c-16.051-4.924-0.885-16.414,15.039-4.167"/>
<path fill="#FC3D21" d="M313.486,16.375c-19.213,56.998-96.179,101.005-160.969,143.028
c-39.086,25.352-77.893,54.537-104.606,79.367c-7.044,6.547,1.436-2.449-1.264,0.316c37.283-42.93,80.167-68.494,103.864-84.592
c40.082-27.229,62.877-34.09,132.019-97.784"/>
<path fill="#FFFFFF" d="M178.316,196.477c53.713,22.095,44.551-33.774,15.798-76.703c-16.269-24.291-36.335-43.56-50.87-54.292
c-16.976-12.535-18.642-13.573-18.642-13.573c37.916,17.992,72.355,62.183,86.571,94.737c6.587,15.086,24.332,74.451-32.542,50.463"
/>
<path fill="#FFFFFF" d="M151.617,15.688c0,0.562-0.463,1.025-1.026,1.025c-0.563,0-1.026-0.463-1.026-1.025
c0-0.563,0.463-1.026,1.026-1.026C151.154,14.662,151.617,15.125,151.617,15.688z"/>
<path fill="#FFFFFF" d="M158.727,31.233c0,0.693-0.57,1.263-1.264,1.263s-1.264-0.57-1.264-1.263c0-0.692,0.57-1.262,1.264-1.262
S158.727,30.541,158.727,31.233z"/>
<path fill="#FFFFFF" d="M177.21,56.644c0,0.692-0.57,1.263-1.263,1.263c-0.694,0-1.264-0.57-1.264-1.263
c0-0.693,0.569-1.263,1.264-1.263C176.64,55.381,177.21,55.951,177.21,56.644z"/>
<path fill="#FFFFFF" d="M147.51,39.993c0,0.563-0.463,1.026-1.026,1.026c-0.564,0-1.027-0.463-1.027-1.026
c0-0.562,0.463-1.025,1.027-1.025C147.047,38.967,147.51,39.43,147.51,39.993z"/>
<path fill="#FFFFFF" d="M158.568,45.833c0,0.562-0.463,1.026-1.026,1.026c-0.564,0-1.026-0.463-1.026-1.026
c0-0.563,0.463-1.026,1.026-1.026C158.105,44.807,158.568,45.27,158.568,45.833z"/>
<path fill="#FFFFFF" d="M144.193,29.498c0,0.692-0.571,1.263-1.264,1.263c-0.693,0-1.264-0.57-1.264-1.263
c0-0.693,0.57-1.263,1.264-1.263C143.622,28.235,144.193,28.805,144.193,29.498z"/>
<path fill="#FFFFFF" d="M127.447,39.677c0,0.562-0.463,1.026-1.027,1.026s-1.027-0.463-1.027-1.026s0.463-1.026,1.027-1.026
S127.447,39.115,127.447,39.677z"/>
<path fill="#FFFFFF" d="M130.448,41.729c0,0.562-0.463,1.026-1.027,1.026c-0.563,0-1.027-0.463-1.027-1.026
c0-0.563,0.464-1.026,1.027-1.026C129.985,40.703,130.448,41.166,130.448,41.729z"/>
<path fill="#FFFFFF" d="M133.45,43.781c0,0.562-0.464,1.026-1.027,1.026c-0.563,0-1.027-0.463-1.027-1.026
c0-0.563,0.463-1.026,1.027-1.026C132.986,42.755,133.45,43.218,133.45,43.781z"/>
<path fill="#FFFFFF" d="M128.869,47.726c0,0.563-0.464,1.026-1.027,1.026c-0.563,0-1.027-0.463-1.027-1.026
c0-0.562,0.463-1.025,1.027-1.025C128.405,46.701,128.869,47.164,128.869,47.726z"/>
<path fill="#FFFFFF" d="M105.014,64.456c0,0.563-0.464,1.026-1.027,1.026c-0.563,0-1.027-0.463-1.027-1.026
c0-0.562,0.464-1.025,1.027-1.025C104.55,63.43,105.014,63.893,105.014,64.456z"/>
<path fill="#FFFFFF" d="M109.437,69.822c0,0.563-0.463,1.026-1.027,1.026c-0.563,0-1.027-0.463-1.027-1.026
c0-0.562,0.463-1.026,1.027-1.026C108.974,68.796,109.437,69.259,109.437,69.822z"/>
<path fill="#FFFFFF" d="M105.961,156.468c0,0.562-0.463,1.025-1.027,1.025c-0.563,0-1.027-0.463-1.027-1.025
s0.463-1.025,1.027-1.025C105.498,155.442,105.961,155.905,105.961,156.468z"/>
<path fill="#FFFFFF" d="M106.593,180.378c0,0.693-0.57,1.264-1.264,1.264c-0.693,0-1.264-0.57-1.264-1.264
c0-0.691,0.571-1.262,1.264-1.262C106.023,179.116,106.593,179.687,106.593,180.378z"/>
<path fill="#FFFFFF" d="M93.007,192.61c0,0.562-0.463,1.025-1.027,1.025c-0.563,0-1.027-0.463-1.027-1.025s0.464-1.026,1.027-1.026
C92.543,191.584,93.007,192.048,93.007,192.61z"/>
<path fill="#FFFFFF" d="M76.735,197.581c0,0.693-0.571,1.263-1.264,1.263c-0.693,0-1.264-0.569-1.264-1.263
c0-0.692,0.57-1.262,1.264-1.262C76.165,196.319,76.735,196.889,76.735,197.581z"/>
<path fill="#FFFFFF" d="M73.417,186.534c0,0.691-0.571,1.262-1.264,1.262c-0.693,0-1.264-0.57-1.264-1.262
c0-0.693,0.571-1.264,1.264-1.264C72.847,185.27,73.417,185.841,73.417,186.534z"/>
<path fill="#FFFFFF" d="M71.521,193.557c0,0.563-0.463,1.026-1.027,1.026c-0.563,0-1.027-0.463-1.027-1.026
c0-0.562,0.464-1.026,1.027-1.026C71.058,192.53,71.521,192.994,71.521,193.557z"/>
<path fill="#FFFFFF" d="M59.357,187.718c0,0.562-0.464,1.025-1.027,1.025c-0.563,0-1.027-0.463-1.027-1.025s0.464-1.026,1.027-1.026
C58.894,186.691,59.357,187.155,59.357,187.718z"/>
<path fill="#FFFFFF" d="M101.854,207.445c0,0.563-0.463,1.026-1.027,1.026c-0.563,0-1.027-0.463-1.027-1.026
c0-0.562,0.463-1.026,1.027-1.026C101.391,206.419,101.854,206.883,101.854,207.445z"/>
<path fill="#FFFFFF" d="M114.65,198.055c0,0.692-0.571,1.263-1.264,1.263c-0.693,0-1.264-0.57-1.264-1.263
c0-0.692,0.571-1.263,1.264-1.263C114.08,196.792,114.65,197.362,114.65,198.055z"/>
<path fill="#FFFFFF" d="M116.072,210.128c0,0.562-0.464,1.027-1.027,1.027c-0.563,0-1.027-0.465-1.027-1.027
s0.463-1.025,1.027-1.025C115.608,209.103,116.072,209.565,116.072,210.128z"/>
<path fill="#FFFFFF" d="M168.68,198.606c0,0.563-0.463,1.027-1.027,1.027c-0.562,0-1.026-0.464-1.026-1.027
c0-0.562,0.464-1.025,1.026-1.025C168.217,197.581,168.68,198.044,168.68,198.606z"/>
<path fill="#FFFFFF" d="M144.193,207.288c0,0.562-0.464,1.025-1.027,1.025c-0.564,0-1.027-0.463-1.027-1.025
s0.464-1.026,1.027-1.026C143.729,206.262,144.193,206.726,144.193,207.288z"/>
<path fill="#FFFFFF" d="M210.07,219.755c0,0.562-0.464,1.027-1.026,1.027c-0.563,0-1.027-0.465-1.027-1.027s0.464-1.025,1.027-1.025
C209.606,218.729,210.07,219.192,210.07,219.755z"/>
<path fill="#FFFFFF" d="M215.441,171.225c0,0.692-0.57,1.263-1.264,1.263c-0.692,0-1.264-0.57-1.264-1.263
c0-0.692,0.571-1.263,1.264-1.263C214.871,169.962,215.441,170.532,215.441,171.225z"/>
<path fill="#FFFFFF" d="M205.331,178.09c0,0.563-0.463,1.026-1.026,1.026c-0.564,0-1.027-0.463-1.027-1.026
c0-0.562,0.463-1.026,1.027-1.026C204.868,177.063,205.331,177.527,205.331,178.09z"/>
<path fill="#FFFFFF" d="M215.283,180.062c0,0.692-0.569,1.263-1.264,1.263c-0.692,0-1.264-0.57-1.264-1.263s0.571-1.263,1.264-1.263
C214.714,178.8,215.283,179.37,215.283,180.062z"/>
<path fill="#FFFFFF" d="M205.331,192.294c0,0.562-0.463,1.025-1.026,1.025c-0.564,0-1.027-0.463-1.027-1.025
s0.463-1.025,1.027-1.025C204.868,191.269,205.331,191.731,205.331,192.294z"/>
<path fill="#FFFFFF" d="M231.082,164.358c0,0.563-0.464,1.027-1.026,1.027c-0.564,0-1.027-0.464-1.027-1.027
c0-0.562,0.464-1.025,1.027-1.025C230.618,163.333,231.082,163.796,231.082,164.358z"/>
<path fill="#FFFFFF" d="M233.609,170.593c0,0.693-0.57,1.264-1.264,1.264s-1.264-0.57-1.264-1.264c0-0.692,0.57-1.262,1.264-1.262
S233.609,169.9,233.609,170.593z"/>
<path fill="#FFFFFF" d="M251.303,178.011c0,0.693-0.57,1.263-1.263,1.263c-0.694,0-1.264-0.569-1.264-1.263
c0-0.692,0.569-1.262,1.264-1.262C250.732,176.749,251.303,177.318,251.303,178.011z"/>
<path fill="#FFFFFF" d="M233.294,191.189c0,0.562-0.464,1.026-1.027,1.026c-0.563,0-1.027-0.464-1.027-1.026
s0.464-1.026,1.027-1.026C232.83,190.163,233.294,190.627,233.294,191.189z"/>
<path fill="#FFFFFF" d="M244.668,180.458c0,0.562-0.463,1.025-1.026,1.025c-0.563,0-1.027-0.463-1.027-1.025
c0-0.563,0.464-1.026,1.027-1.026C244.205,179.432,244.668,179.895,244.668,180.458z"/>
<path fill="#FFFFFF" d="M242.614,197.028c0,0.564-0.463,1.026-1.026,1.026c-0.564,0-1.027-0.463-1.027-1.026
c0-0.562,0.464-1.025,1.027-1.025C242.151,196.003,242.614,196.466,242.614,197.028z"/>
<g>
<path fill="#FFFFFF" d="M247.394,169.488c0,0.866-0.713,1.579-1.58,1.579c-0.866,0-1.579-0.713-1.579-1.579
s0.713-1.578,1.579-1.578C246.681,167.91,247.394,168.622,247.394,169.488z"/>
</g>
<g>
<polygon fill="#FFFFFF" points="245.813,164.675 245.34,169.015 241.035,169.488 245.379,169.962 245.852,174.46 246.327,169.962
250.592,169.409 246.287,169.015 "/>
</g>
<g>
<path fill="#FFFFFF" d="M236.335,196.95c0,0.865-0.713,1.578-1.58,1.578c-0.866,0-1.579-0.713-1.579-1.578
c0-0.865,0.713-1.578,1.579-1.578C235.622,195.372,236.335,196.085,236.335,196.95z"/>
</g>
<g>
<polygon fill="#FFFFFF" points="234.755,192.136 234.281,196.477 229.977,196.95 234.32,197.423 234.794,201.921 235.269,197.423
239.533,196.871 235.228,196.477 "/>
</g>
<g>
<path fill="#FFFFFF" d="M118.481,66.587c0,0.866-0.713,1.578-1.58,1.578c-0.866,0-1.58-0.712-1.58-1.578
c0-0.866,0.713-1.578,1.58-1.578C117.768,65.008,118.481,65.721,118.481,66.587z"/>
</g>
<g>
<polygon fill="#FFFFFF" points="116.901,61.773 116.428,66.113 112.123,66.587 116.467,67.06 116.941,71.558 117.415,67.06
121.681,66.507 117.375,66.113 "/>
</g>
<g>
<path fill="#FFFFFF" d="M177.25,28.393c0,0.866-0.714,1.579-1.58,1.579s-1.58-0.713-1.58-1.579s0.714-1.578,1.58-1.578
S177.25,27.527,177.25,28.393z"/>
</g>
<g>
<polygon fill="#FFFFFF" points="175.67,23.579 175.196,27.919 170.891,28.393 175.235,28.866 175.71,33.364 176.184,28.866
180.449,28.314 176.144,27.919 "/>
</g>
<g>
<path fill="#FFFFFF" d="M105.843,222.202c0,0.865-0.713,1.578-1.58,1.578s-1.58-0.713-1.58-1.578c0-0.865,0.713-1.578,1.58-1.578
S105.843,221.337,105.843,222.202z"/>
</g>
<g>
<polygon fill="#FFFFFF" points="104.263,217.388 103.789,221.729 99.484,222.202 103.829,222.675 104.303,227.173 104.776,222.675
109.042,222.124 104.737,221.729 "/>
</g>
<path fill="#EF3E42" d="M26.852,157.585c-6.899,3.377-13.081,6.711-18.324,9.967l3.191,1.16c4.584-2.822,10.091-5.771,15.891-8.365"
/>
<path fill="#EF3E42" d="M63.279,221.362c-6.307,5.506-12.825,11.383-19.365,17.543l-0.29,4.35
c5.988-6.168,13.34-12.828,21.829-19.895"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

99
platform/commonUI/general/res/images/logo-openmctweb-shdw.svg Normal file
View File

@ -0,0 +1,99 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="1040px" height="150px" viewBox="0 0 1040 150" enable-background="new 0 0 1040 150" xml:space="preserve">
<filter width="150%" height="130%" x="-15%" y="-15%" filterUnits="objectBoundingBox" id="AI_Shadow_Custom">
<feGaussianBlur in="SourceAlpha" stdDeviation="6" result="blur"></feGaussianBlur>
<feOffset dy="3" dx="0" in="blur" result="offsetBlurredAlpha"></feOffset>
<feMerge>
<feMergeNode in="offsetBlurredAlpha"></feMergeNode>
<feMergeNode in="SourceGraphic"></feMergeNode>
</feMerge>
</filter>
<g filter="url(#AI_Shadow_Custom)">
<path fill="#FFFFFF" d="M121.932,76.064c0,5.952-0.992,11.507-3.174,16.665c-1.984,4.96-4.96,9.324-8.531,13.094
c-3.769,3.769-7.936,6.547-13.094,8.531c-4.96,1.984-10.515,2.976-16.466,2.976H56.463c-5.952,0-11.507-0.992-16.466-2.976
s-9.523-4.96-13.094-8.531c-3.769-3.769-6.547-8.134-8.729-13.094C15.992,87.57,15,82.015,15,76.064V57.217
c0-5.952,0.992-11.507,3.174-16.665s4.96-9.523,8.729-13.094c3.571-3.571,7.936-6.547,12.895-8.531s10.515-3.174,16.466-3.174
h24.203c5.952,0,11.507,0.992,16.466,3.174c4.96,1.984,9.324,4.96,13.094,8.531s6.547,7.936,8.531,13.094
c1.984,5.158,3.174,10.515,3.174,16.665v18.847H121.932z M103.878,57.217c0-3.571-0.595-6.745-1.786-9.523
c-1.19-2.777-2.777-5.357-4.761-7.34c-1.984-1.984-4.563-3.571-7.34-4.761c-2.777-1.19-5.952-1.786-9.523-1.786H56.463
c-3.571,0-6.745,0.595-9.523,1.786c-2.777,1.19-5.357,2.777-7.34,4.761c-1.984,1.984-3.571,4.563-4.761,7.34
c-1.389,2.777-1.984,5.952-1.984,9.523v18.847c0,3.571,0.595,6.745,1.786,9.523c1.19,2.976,2.777,5.357,4.761,7.34
s4.563,3.571,7.34,4.761c2.777,1.19,6.15,1.786,9.523,1.786h24.203c3.571,0,6.745-0.595,9.523-1.786
c2.777-1.19,5.357-2.777,7.34-4.761s3.571-4.563,4.761-7.34c1.19-2.777,1.786-6.15,1.786-9.523L103.878,57.217z"/>
<path fill="#FFFFFF" d="M209.62,90.943c0,3.174-0.397,5.753-1.19,8.332c-0.794,2.381-1.786,4.563-3.174,6.547
c-1.19,1.786-2.777,3.373-4.563,4.761c-1.786,1.389-3.571,2.381-5.357,3.174c-1.786,0.794-3.769,1.389-5.555,1.786
c-1.984,0.397-3.769,0.595-5.357,0.595h-32.337V98.283h32.337c2.381,0,4.166-0.595,5.357-1.786c1.19-1.19,1.786-2.976,1.786-5.357
V66.739c0-2.579-0.595-4.365-1.786-5.555c-1.19-1.19-2.976-1.786-5.357-1.786h-32.139c-2.381,0-4.365,0.595-5.555,1.786
c-1.19,1.19-1.786,2.976-1.786,5.357v72.809H127.09V66.541c0-3.174,0.397-5.753,1.19-8.332c0.794-2.381,1.786-4.563,3.174-6.547
c1.389-1.786,2.777-3.373,4.563-4.761s3.571-2.381,5.357-3.174s3.769-1.389,5.555-1.786c1.984-0.397,3.769-0.595,5.357-0.595
h32.337c3.174,0,5.753,0.397,8.332,1.19c2.381,0.794,4.563,1.786,6.348,3.174c1.786,1.19,3.373,2.777,4.761,4.563
s2.381,3.571,3.174,5.357c0.794,1.786,1.389,3.769,1.785,5.555c0.397,1.984,0.595,3.769,0.595,5.357L209.62,90.943L209.62,90.943z"
/>
<path fill="#FFFFFF" d="M295.126,66.144c0,2.579-0.397,5.158-1.389,7.936c-0.794,2.777-2.381,5.555-4.166,7.936
c-1.984,2.381-4.563,4.563-7.737,6.15c-3.174,1.587-6.944,2.579-11.507,2.579H237.99V73.683h32.337
c2.381,0,4.365-0.794,5.555-2.182c1.389-1.587,1.984-3.373,1.984-5.555c0-2.381-0.794-4.166-2.182-5.555
c-1.587-1.389-3.373-1.984-5.357-1.984H237.99c-2.381,0-4.365,0.794-5.753,2.182c-1.389,1.587-1.984,3.373-1.984,5.555V91.34
c0,2.381,0.794,4.166,2.182,5.555c1.587,1.389,3.373,1.984,5.555,1.984h46.82v17.061h-47.018c-2.579,0-5.158-0.397-7.936-1.389
c-2.777-0.794-5.555-2.381-7.936-4.166c-2.381-1.984-4.563-4.563-6.15-7.737c-1.587-3.174-2.381-6.944-2.381-11.507V66.144
c0-2.579,0.397-5.158,1.389-7.936c0.794-2.777,2.381-5.555,4.166-7.936c1.984-2.381,4.563-4.563,7.737-6.15
s6.944-2.579,11.507-2.579h32.337c2.579,0,5.158,0.397,7.936,1.389c2.777,0.794,5.555,2.381,7.936,4.166
c2.381,1.984,4.563,4.563,6.15,7.737C294.332,57.812,295.126,61.78,295.126,66.144z"/>
<path fill="#FFFFFF" d="M379.838,116.138h-17.855V74.675c0-2.381-0.397-4.365-1.19-6.348c-0.794-1.785-1.984-3.373-3.373-4.761
c-1.389-1.389-2.976-2.381-4.96-2.976c-1.785-0.794-3.968-0.992-5.952-0.992h-31.346v56.541h-17.855V50.471
c0-1.19,0.198-2.381,0.595-3.571c0.397-0.992,1.19-1.984,1.984-2.777c0.794-0.794,1.785-1.389,2.976-1.984
c1.19-0.397,2.182-0.595,3.571-0.595h40.471c2.182,0,4.563,0.198,7.142,0.794c2.579,0.595,4.96,1.389,7.539,2.381
c2.381,1.19,4.761,2.579,6.944,4.365c2.182,1.786,4.166,3.769,5.952,6.348c1.785,2.381,3.174,5.357,4.166,8.531
c0.992,3.174,1.587,6.944,1.587,10.911v41.265H379.838z"/>
<path fill="#FFFFFF" d="M502.839,116.138h-18.053V57.217l-31.742,55.946c-0.794,1.389-1.785,2.579-3.373,3.174
c-1.389,0.794-2.976,1.19-4.563,1.19s-2.976-0.397-4.365-1.19c-1.389-0.794-2.381-1.786-3.174-3.174l-31.941-55.946v58.922h-17.855
V24.879c0-1.984,0.595-3.968,1.785-5.555c1.19-1.587,2.777-2.777,4.761-3.174c0.992-0.198,1.984-0.397,2.976-0.198
c0.992,0,1.984,0.198,2.777,0.595c0.992,0.397,1.785,0.794,2.381,1.389c0.794,0.595,1.389,1.389,1.785,2.182l40.868,71.023
l40.868-71.023c0.992-1.786,2.579-2.976,4.365-3.769c1.785-0.794,3.769-0.794,5.753-0.397c1.984,0.595,3.571,1.587,4.761,3.174
c1.19,1.587,1.785,3.373,1.785,5.555v91.457H502.839z"/>
<path fill="#FFFFFF" d="M595.685,116.138h-62.493c-1.587,0-3.373-0.198-5.357-0.595c-1.984-0.397-3.769-0.992-5.753-1.786
c-1.786-0.794-3.571-1.984-5.357-3.174c-1.786-1.389-3.174-2.976-4.563-4.761c-1.389-1.786-2.381-3.968-3.174-6.547
c-0.794-2.381-1.19-5.158-1.19-8.332V42.337c0-1.587,0.198-3.373,0.595-5.357c0.397-1.984,0.992-3.769,1.785-5.753
c0.794-1.786,1.984-3.571,3.174-5.357c1.389-1.786,2.976-3.174,4.761-4.563c1.786-1.389,3.968-2.381,6.348-3.174
c2.381-0.794,5.158-1.19,8.332-1.19h62.493v17.855h-62.493c-2.381,0-4.166,0.595-5.357,1.786c-1.19,1.19-1.785,3.174-1.785,5.555
v48.407c0,2.381,0.595,4.166,1.984,5.357c1.19,1.19,2.976,1.984,5.357,1.984h62.493v18.252H595.685z"/>
<path fill="#FFFFFF" d="M697.658,35.195h-39.479v80.943h-17.855V35.195h-39.479V17.34h97.012v17.855H697.658z"/>
<path fill="#4F79F7" d="M98.125,49.083c-0.992-2.381-2.182-4.166-3.769-5.952c-1.587-1.587-3.571-2.777-5.952-3.769
c-2.381-0.992-4.96-1.389-7.936-1.389H65.192c-1.389,7.34-1.389,12.697-0.794,15.474c0.198-0.198,0.397-0.198,0.397-0.397
c1.587-1.389,3.571-3.174,6.15-4.166c1.785-0.794,3.769-1.19,5.555-1.19c3.174,0,5.952,1.19,7.936,3.373
c2.777,3.174,3.968,8.332,3.174,14.879c-1.984,16.07-11.308,17.26-14.086,17.26c-1.786,0-3.769-0.397-5.555-1.19
c-2.579-1.19-4.365-2.976-5.555-4.365l-0.198-0.198c-1.389,2.579-2.976,8.531-3.571,17.26h21.823c2.976,0,5.555-0.397,7.936-1.389
c2.381-0.992,4.365-2.182,5.952-3.769c1.587-1.587,2.777-3.571,3.769-5.753c0.992-2.381,1.389-4.96,1.389-7.936V57.018
C99.514,54.241,99.117,51.463,98.125,49.083z M61.82,72.096c2.777,0,4.365,4.365,7.936,5.952c4.761,2.182,11.308,0.397,12.895-12.3
s-4.761-14.482-9.919-12.3c-3.968,1.587-6.547,5.952-9.324,5.952c-3.571,0-5.158-8.134-2.976-21.426h-4.166
c-2.976,0-5.555,0.397-7.936,1.389c-2.381,0.992-4.365,2.182-5.952,3.769c-1.587,1.587-2.976,3.571-3.769,5.952
c-0.992,2.381-1.389,4.96-1.389,7.936v18.847c0,2.976,0.397,5.753,1.389,7.936c0.992,2.381,2.182,4.166,3.769,5.753
c1.587,1.587,3.571,2.777,5.952,3.769c1.587,0.595,3.373,0.992,5.357,1.19C54.479,80.825,58.249,72.096,61.82,72.096z"/>
<path fill="#4F79F7" d="M858.155,17.142l-16.665,93.045c-0.397,1.786-1.19,3.373-2.579,4.761c-1.389,1.389-2.777,2.182-4.761,2.579
s-3.769,0.198-5.357-0.595c-1.587-0.794-2.976-1.984-3.968-3.373l-32.933-54.16l-32.933,54.16
c-0.794,1.389-1.786,2.381-3.174,3.174c-1.389,0.794-2.777,1.19-4.365,1.19c-2.182,0-4.166-0.595-5.753-1.984
s-2.579-3.174-2.976-5.357l-16.665-93.045h18.252l11.903,65.468l28.37-45.233c0.794-1.389,1.786-2.381,3.174-3.174
s2.777-1.19,4.365-1.19c1.587,0,2.976,0.397,4.365,1.19c1.389,0.794,2.381,1.786,3.373,3.174l28.171,45.233l11.903-65.468h18.252
V17.142z"/>
<path fill="#4F79F7" d="M1024.802,91.141c0,1.786-0.198,3.571-0.595,5.357c-0.397,1.984-0.992,3.769-1.786,5.555
c-0.794,1.786-1.984,3.571-3.174,5.357c-1.389,1.786-2.976,3.174-4.761,4.563c-1.786,1.389-3.968,2.381-6.547,3.174
c-2.381,0.794-5.158,1.19-8.332,1.19H967.07c-1.786,0-3.571-0.198-5.357-0.595c-1.984-0.397-3.769-0.992-5.555-1.786
c-1.785-0.794-3.571-1.984-5.357-3.174c-1.786-1.389-3.174-2.976-4.563-4.761c-1.389-1.786-2.381-3.968-3.174-6.547
c-0.794-2.381-1.19-5.158-1.19-8.332V10h18.053v81.141c0,2.182,0.595,3.968,1.984,5.357s3.174,1.984,5.158,1.984h32.536
c2.182,0,3.968-0.595,5.357-1.984c1.19-1.389,1.984-3.174,1.984-5.357V66.938c0-2.182-0.595-3.968-1.984-5.357
c-1.389-1.19-2.976-1.984-5.158-1.984h-32.536V41.544h32.536c1.786,0,3.571,0.198,5.357,0.595c1.984,0.397,3.769,0.992,5.555,1.786
c1.786,0.794,3.571,1.984,5.357,3.174c1.785,1.389,3.174,2.976,4.563,4.761s2.381,3.968,3.174,6.547
c0.794,2.381,1.19,5.158,1.19,8.332v24.402H1024.802z"/>
<path fill="#4F79F7" d="M937.709,66.144c0,2.579-0.397,5.158-1.389,7.936c-0.794,2.777-2.381,5.555-4.166,7.936
c-1.984,2.381-4.563,4.563-7.737,6.15c-3.174,1.587-6.944,2.579-11.507,2.579h-32.337V73.683h32.337
c2.381,0,4.365-0.794,5.555-2.182c1.389-1.587,1.984-3.373,1.984-5.555c0-2.381-0.794-4.166-2.182-5.555
c-1.587-1.389-3.373-1.984-5.357-1.984h-32.337c-2.381,0-4.365,0.794-5.753,2.182c-1.389,1.587-1.984,3.373-1.984,5.555V91.34
c0,2.381,0.794,4.166,2.182,5.555c1.587,1.389,3.373,1.984,5.555,1.984h47.018v17.061h-47.018c-2.579,0-5.158-0.397-7.936-1.389
c-2.777-0.794-5.555-2.381-7.936-4.166c-2.381-1.984-4.563-4.563-6.15-7.737c-1.587-3.174-2.381-6.944-2.381-11.507V66.144
c0-2.579,0.397-5.158,1.389-7.936c0.794-2.777,2.381-5.555,4.166-7.936c1.984-2.381,4.563-4.563,7.737-6.15
c3.174-1.587,6.944-2.579,11.507-2.579h32.337c2.579,0,5.158,0.397,7.936,1.389c2.777,0.794,5.555,2.381,7.936,4.166
c2.381,1.984,4.563,4.563,6.15,7.737C936.717,57.812,937.709,61.78,937.709,66.144z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

70
platform/commonUI/general/res/images/logo-openmctweb.svg Normal file
View File

@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 509 65.2" enable-background="new 0 0 509 65.2" xml:space="preserve">
<g id="logo_s3_4_">
<g>
<g>
<path fill="#FFFFFF" d="M53.9,33.3c0,3-0.5,5.8-1.6,8.4c-1,2.5-2.5,4.7-4.3,6.6c-1.9,1.9-4,3.3-6.6,4.3c-2.5,1-5.3,1.5-8.3,1.5
H20.9c-3,0-5.8-0.5-8.3-1.5c-2.5-1-4.8-2.5-6.6-4.3c-1.9-1.9-3.3-4.1-4.4-6.6C0.5,39.1,0,36.3,0,33.3v-9.5c0-3,0.5-5.8,1.6-8.4
c1.1-2.6,2.5-4.8,4.4-6.6C7.8,7,10,5.5,12.5,4.5c2.5-1,5.3-1.6,8.3-1.6h12.2c3,0,5.8,0.5,8.3,1.6c2.5,1,4.7,2.5,6.6,4.3
c1.9,1.8,3.3,4,4.3,6.6c1,2.6,1.6,5.3,1.6,8.4V33.3z M44.8,23.8c0-1.8-0.3-3.4-0.9-4.8c-0.6-1.4-1.4-2.7-2.4-3.7
c-1-1-2.3-1.8-3.7-2.4c-1.4-0.6-3-0.9-4.8-0.9H20.9c-1.8,0-3.4,0.3-4.8,0.9c-1.4,0.6-2.7,1.4-3.7,2.4c-1,1-1.8,2.3-2.4,3.7
C9.3,20.4,9,22,9,23.8v9.5c0,1.8,0.3,3.4,0.9,4.8c0.6,1.5,1.4,2.7,2.4,3.7c1,1,2.3,1.8,3.7,2.4c1.4,0.6,3.1,0.9,4.8,0.9H33
c1.8,0,3.4-0.3,4.8-0.9c1.4-0.6,2.7-1.4,3.7-2.4c1-1,1.8-2.3,2.4-3.7c0.6-1.4,0.9-3.1,0.9-4.8V23.8z"/>
<path fill="#FFFFFF" d="M98.1,40.8c0,1.6-0.2,2.9-0.6,4.2c-0.4,1.2-0.9,2.3-1.6,3.3c-0.6,0.9-1.4,1.7-2.3,2.4
c-0.9,0.7-1.8,1.2-2.7,1.6c-0.9,0.4-1.9,0.7-2.8,0.9c-1,0.2-1.9,0.3-2.7,0.3H69.1v-9h16.3c1.2,0,2.1-0.3,2.7-0.9
c0.6-0.6,0.9-1.5,0.9-2.7V28.6c0-1.3-0.3-2.2-0.9-2.8c-0.6-0.6-1.5-0.9-2.7-0.9H69.2c-1.2,0-2.2,0.3-2.8,0.9
c-0.6,0.6-0.9,1.5-0.9,2.7v36.7h-9V28.5c0-1.6,0.2-2.9,0.6-4.2c0.4-1.2,0.9-2.3,1.6-3.3c0.7-0.9,1.4-1.7,2.3-2.4
c0.9-0.7,1.8-1.2,2.7-1.6c0.9-0.4,1.9-0.7,2.8-0.9c1-0.2,1.9-0.3,2.7-0.3h16.3c1.6,0,2.9,0.2,4.2,0.6c1.2,0.4,2.3,0.9,3.2,1.6
c0.9,0.6,1.7,1.4,2.4,2.3c0.7,0.9,1.2,1.8,1.6,2.7c0.4,0.9,0.7,1.9,0.9,2.8c0.2,1,0.3,1.9,0.3,2.7V40.8z"/>
<path fill="#FFFFFF" d="M141.2,28.3c0,1.3-0.2,2.6-0.7,4c-0.4,1.4-1.2,2.8-2.1,4c-1,1.2-2.3,2.3-3.9,3.1
c-1.6,0.8-3.5,1.3-5.8,1.3h-16.3v-8.6h16.3c1.2,0,2.2-0.4,2.8-1.1c0.7-0.8,1-1.7,1-2.8c0-1.2-0.4-2.1-1.1-2.8
c-0.8-0.7-1.7-1-2.7-1h-16.3c-1.2,0-2.2,0.4-2.9,1.1c-0.7,0.8-1,1.7-1,2.8V41c0,1.2,0.4,2.1,1.1,2.8c0.8,0.7,1.7,1,2.8,1h23.6
v8.6h-23.7c-1.3,0-2.6-0.2-4-0.7c-1.4-0.4-2.8-1.2-4-2.1c-1.2-1-2.3-2.3-3.1-3.9c-0.8-1.6-1.2-3.5-1.2-5.8V28.3
c0-1.3,0.2-2.6,0.7-4c0.4-1.4,1.2-2.8,2.1-4c1-1.2,2.3-2.3,3.9-3.1c1.6-0.8,3.5-1.3,5.8-1.3h16.3c1.3,0,2.6,0.2,4,0.7
c1.4,0.4,2.8,1.2,4,2.1c1.2,1,2.3,2.3,3.1,3.9C140.8,24.1,141.2,26.1,141.2,28.3z"/>
<path fill="#FFFFFF" d="M183.9,53.5h-9V32.6c0-1.2-0.2-2.2-0.6-3.2c-0.4-0.9-1-1.7-1.7-2.4c-0.7-0.7-1.5-1.2-2.5-1.5
c-0.9-0.4-2-0.5-3-0.5h-15.8v28.5h-9V20.4c0-0.6,0.1-1.2,0.3-1.8c0.2-0.5,0.6-1,1-1.4c0.4-0.4,0.9-0.7,1.5-1
c0.6-0.2,1.1-0.3,1.8-0.3h20.4c1.1,0,2.3,0.1,3.6,0.4c1.3,0.3,2.5,0.7,3.8,1.2c1.2,0.6,2.4,1.3,3.5,2.2c1.1,0.9,2.1,1.9,3,3.2
c0.9,1.2,1.6,2.7,2.1,4.3c0.5,1.6,0.8,3.5,0.8,5.5V53.5z"/>
<path fill="#FFFFFF" d="M245.9,53.5h-9.1V23.8l-16,28.2c-0.4,0.7-0.9,1.3-1.7,1.6c-0.7,0.4-1.5,0.6-2.3,0.6
c-0.8,0-1.5-0.2-2.2-0.6c-0.7-0.4-1.2-0.9-1.6-1.6l-16.1-28.2v29.7h-9v-46c0-1,0.3-2,0.9-2.8c0.6-0.8,1.4-1.4,2.4-1.6
c0.5-0.1,1-0.2,1.5-0.1c0.5,0,1,0.1,1.4,0.3c0.5,0.2,0.9,0.4,1.2,0.7c0.4,0.3,0.7,0.7,0.9,1.1l20.6,35.8l20.6-35.8
c0.5-0.9,1.3-1.5,2.2-1.9c0.9-0.4,1.9-0.4,2.9-0.2c1,0.3,1.8,0.8,2.4,1.6c0.6,0.8,0.9,1.7,0.9,2.8V53.5z"/>
<path fill="#FFFFFF" d="M292.7,53.5h-31.5c-0.8,0-1.7-0.1-2.7-0.3c-1-0.2-1.9-0.5-2.9-0.9c-0.9-0.4-1.8-1-2.7-1.6
c-0.9-0.7-1.6-1.5-2.3-2.4c-0.7-0.9-1.2-2-1.6-3.3c-0.4-1.2-0.6-2.6-0.6-4.2V16.3c0-0.8,0.1-1.7,0.3-2.7c0.2-1,0.5-1.9,0.9-2.9
c0.4-0.9,1-1.8,1.6-2.7c0.7-0.9,1.5-1.6,2.4-2.3c0.9-0.7,2-1.2,3.2-1.6c1.2-0.4,2.6-0.6,4.2-0.6h31.5v9h-31.5
c-1.2,0-2.1,0.3-2.7,0.9c-0.6,0.6-0.9,1.6-0.9,2.8v24.4c0,1.2,0.3,2.1,1,2.7c0.6,0.6,1.5,1,2.7,1h31.5V53.5z"/>
<path fill="#FFFFFF" d="M344.1,12.7h-19.9v40.8h-9V12.7h-19.9v-9h48.9V12.7z"/>
<path fill="#4F79F7" d="M41.9,19.7c-0.5-1.2-1.1-2.1-1.9-3c-0.8-0.8-1.8-1.4-3-1.9c-1.2-0.5-2.5-0.7-4-0.7h-7.7
c-0.7,3.7-0.7,6.4-0.4,7.8c0.1-0.1,0.2-0.1,0.2-0.2c0.8-0.7,1.8-1.6,3.1-2.1c0.9-0.4,1.9-0.6,2.8-0.6c1.6,0,3,0.6,4,1.7
c1.4,1.6,2,4.2,1.6,7.5c-1,8.1-5.7,8.7-7.1,8.7c-0.9,0-1.9-0.2-2.8-0.6c-1.3-0.6-2.2-1.5-2.8-2.2c0,0-0.1-0.1-0.1-0.1
c-0.7,1.3-1.5,4.3-1.8,8.7h11c1.5,0,2.8-0.2,4-0.7c1.2-0.5,2.2-1.1,3-1.9c0.8-0.8,1.4-1.8,1.9-2.9c0.5-1.2,0.7-2.5,0.7-4v-9.5
C42.6,22.3,42.4,20.9,41.9,19.7z M23.6,31.3c1.4,0,2.2,2.2,4,3c2.4,1.1,5.7,0.2,6.5-6.2c0.8-6.4-2.4-7.3-5-6.2
c-2,0.8-3.3,3-4.7,3c-1.8,0-2.6-4.1-1.5-10.8h-2.1c-1.5,0-2.8,0.2-4,0.7c-1.2,0.5-2.2,1.1-3,1.9c-0.8,0.8-1.5,1.8-1.9,3
c-0.5,1.2-0.7,2.5-0.7,4v9.5c0,1.5,0.2,2.9,0.7,4c0.5,1.2,1.1,2.1,1.9,2.9c0.8,0.8,1.8,1.4,3,1.9c0.8,0.3,1.7,0.5,2.7,0.6
C19.9,35.7,21.8,31.3,23.6,31.3z"/>
</g>
<g>
<path fill="#4F79F7" d="M425,3.6l-8.4,46.9c-0.2,0.9-0.6,1.7-1.3,2.4c-0.7,0.7-1.4,1.1-2.4,1.3c-1,0.2-1.9,0.1-2.7-0.3
c-0.8-0.4-1.5-1-2-1.7l-16.6-27.3L375,52.2c-0.4,0.7-0.9,1.2-1.6,1.6s-1.4,0.6-2.2,0.6c-1.1,0-2.1-0.3-2.9-1
c-0.8-0.7-1.3-1.6-1.5-2.7l-8.4-46.9h9.2l6,33l14.3-22.8c0.4-0.7,0.9-1.2,1.6-1.6c0.7-0.4,1.4-0.6,2.2-0.6c0.8,0,1.5,0.2,2.2,0.6
c0.7,0.4,1.2,0.9,1.7,1.6l14.2,22.8l6-33H425z"/>
<path fill="#4F79F7" d="M509,40.9c0,0.9-0.1,1.8-0.3,2.7c-0.2,1-0.5,1.9-0.9,2.8c-0.4,0.9-1,1.8-1.6,2.7
c-0.7,0.9-1.5,1.6-2.4,2.3c-0.9,0.7-2,1.2-3.3,1.6c-1.2,0.4-2.6,0.6-4.2,0.6h-16.4c-0.9,0-1.8-0.1-2.7-0.3
c-1-0.2-1.9-0.5-2.8-0.9c-0.9-0.4-1.8-1-2.7-1.6c-0.9-0.7-1.6-1.5-2.3-2.4c-0.7-0.9-1.2-2-1.6-3.3c-0.4-1.2-0.6-2.6-0.6-4.2V0
h9.1v40.9c0,1.1,0.3,2,1,2.7c0.7,0.7,1.6,1,2.6,1h16.4c1.1,0,2-0.3,2.7-1c0.6-0.7,1-1.6,1-2.7V28.7c0-1.1-0.3-2-1-2.7
c-0.7-0.6-1.5-1-2.6-1h-16.4v-9.1h16.4c0.9,0,1.8,0.1,2.7,0.3c1,0.2,1.9,0.5,2.8,0.9c0.9,0.4,1.8,1,2.7,1.6
c0.9,0.7,1.6,1.5,2.3,2.4c0.7,0.9,1.2,2,1.6,3.3c0.4,1.2,0.6,2.6,0.6,4.2V40.9z"/>
<path fill="#4F79F7" d="M465.1,28.3c0,1.3-0.2,2.6-0.7,4c-0.4,1.4-1.2,2.8-2.1,4c-1,1.2-2.3,2.3-3.9,3.1
c-1.6,0.8-3.5,1.3-5.8,1.3h-16.3v-8.6h16.3c1.2,0,2.2-0.4,2.8-1.1c0.7-0.8,1-1.7,1-2.8c0-1.2-0.4-2.1-1.1-2.8
c-0.8-0.7-1.7-1-2.7-1h-16.3c-1.2,0-2.2,0.4-2.9,1.1c-0.7,0.8-1,1.7-1,2.8V41c0,1.2,0.4,2.1,1.1,2.8c0.8,0.7,1.7,1,2.8,1H460v8.6
h-23.7c-1.3,0-2.6-0.2-4-0.7c-1.4-0.4-2.8-1.2-4-2.1c-1.2-1-2.3-2.3-3.1-3.9c-0.8-1.6-1.2-3.5-1.2-5.8V28.3c0-1.3,0.2-2.6,0.7-4
c0.4-1.4,1.2-2.8,2.1-4c1-1.2,2.3-2.3,3.9-3.1c1.6-0.8,3.5-1.3,5.8-1.3h16.3c1.3,0,2.6,0.2,4,0.7c1.4,0.4,2.8,1.2,4,2.1
c1.2,1,2.3,2.3,3.1,3.9C464.6,24.1,465.1,26.1,465.1,28.3z"/>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

59
platform/commonUI/general/res/sass/_about.scss Normal file
View File

@ -0,0 +1,59 @@
// General About dialog styling
.t-about {
// Styling
line-height: 120%;
.s-description,
.s-info {
font-size: 0.8em;
}
.s-logo-holder {
background: url($dirImgs + "bg-about-openmctweb.jpg") no-repeat center; // For OpenMCT Web.
background-size: cover;
}
.s-logo {
// @include txtShdwLarge(); // text-shadow doesn't work for svg
background-position: center;
background-repeat: no-repeat;
background-size: contain;
}
.s-logo-openmctweb {
background-image: url($dirImgs + 'logo-openmctweb-shdw.svg');
}
h1, h2 {
color: #fff;
font-weight: normal !important;
}
// Layout
&.l-about.abs {
// top: 20px;
overflow: auto;
}
$contentH: 200px;
.l-logo-holder {
position: relative;
height: 45%;
.l-logo {
$w: 5%;
position: absolute;
&.l-logo-app {
// @include test(blue);
top: 0; right: 15%; bottom: 0; left: 15%;
}
&.s-logo-nasa {
// @include test(red);
$m: 10px;
background-image: url($dirImgs + 'logo-nasa.svg');
top: $m; right: auto; bottom: auto; left: $m;
width: $w * 2; height: auto; padding-bottom: $w; padding-top: $w;
}
}
}
.l-content {
// @include test();
position: relative;
margin-top: $interiorMarginLg;
}
}

4
platform/commonUI/general/res/sass/_constants.scss
View File

@ -33,7 +33,7 @@ $btnFontSizeToH: 0.45;
$ueTopBarH: 35px;
$ueFooterH: 20px;
$ueColMargin: 1.5%;
$ueAppLogoW: 95px;
$ueAppLogoW: 105px;
$ueBrowseViewBarH: $ueTopBarH; // was 30px
$ueEditToolBarH: $ueBrowseViewBarH;
$ueEditToolBarButtonH: $ueEditToolBarH * 0.8;
@ -84,7 +84,7 @@ $scrollbarTrackSize: 10px;
$scrollbarTrackColorBg: rgba(#000, 0.4);
// Paths
$dirImgs: '../images/';
$dirImgs: '../images/'; // Relative to platform/css/ directory
// Ticks
$ticksH: 25px;

12
platform/commonUI/general/res/sass/_global.scss
View File

@ -47,8 +47,14 @@ h1, h2, h3 {
h1 {
font-size: 1.7em;
font-weight: normal;
font-weight: normal !important;
line-height: 120%;
margin-bottom: 20px;
margin-top: 0;
}
p {
margin-bottom: $interiorMarginLg;
}
span {
@ -89,4 +95,8 @@ span {
.hide,
.hidden {
display: none !important;
}
.sep {
color: rgba(#fff, 0.2);
}

1
platform/commonUI/general/res/sass/_main.scss
View File

@ -9,6 +9,7 @@
@import "global";
@import "fonts";
@import "user-environ/layout";
@import "about";
@import "badges";
@import "icons";
@import "lists/tabular";

3
platform/commonUI/general/res/sass/_mixins.scss
View File

@ -115,6 +115,9 @@
@mixin txtShdwSubtle($sVal: 0.1) {
@include text-shadow(rgba(black, $sVal) 0 1px 2px);
}
@mixin txtShdwLarge($sVal: 0.7) {
@include text-shadow(rgba(black, $sVal) 0 3px 7px);
}
@mixin invokeMenu($baseColor) {

8
platform/commonUI/general/res/sass/overlay/_overlay.scss
View File

@ -4,8 +4,12 @@
z-index: 100;
}
.btn.close {
@include border-radius($basicCr * 2);
padding: 3px 6px;
position: absolute;
top: $interiorMargin; right: $interiorMargin; bottom: auto; left: auto;
border: none;
top: $interiorMarginSm; right: $interiorMarginSm; bottom: auto; left: auto;
z-index: 100;
}
.editor {
// background: $colorBodyBg;
@ -18,7 +22,7 @@
top: $i; right: $i; bottom: $i; left: $i;
z-index: 101;
>.contents {
$m: 20px;
$m: 25px;
top: $m; right: $m; bottom: $m; left: $m;
}
}

9
platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss
View File

@ -12,16 +12,13 @@
}
.app-logo {
@include box-sizing(border-box);
cursor: pointer;
font-size: 0.8em;
line-height: $ueFooterH - 10px;
padding-top: 1px;
text-transform: uppercase;
&.logo-warp {
background: url($dirImgs + 'logo-warp.png') no-repeat left top;
color: lighten($colorBodyBg, 40%);
font-size: 0.7rem;
padding-top: 3px;
text-align: right;
&.logo-openmctweb {
background: url($dirImgs + 'logo-openmctweb.svg') no-repeat center center;
}
}
}