ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-17 06:38:17 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Themes] Resolve conflicts

Browse Source 
Resolve conflicts in preparation for merge, nasa/openmctweb#118
This commit is contained in:
Victor Woeltjen
2015-09-22 16:09:42 -07:00
parent aba0969312 54334a8906
commit dbe1875e70
95 changed files with 11085 additions and 6512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/forms/res/templates/controls/button.html
View File

@ -19,7 +19,7 @@
this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information.
-->
<a class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
<a class="s-btn"
ng-class="{ labeled: structure.text }"
ng-click="structure.click()">
<span class="ui-symbol icon">

6
platform/forms/res/templates/controls/color.html
View File

@ -20,7 +20,7 @@
at runtime from the About dialog for additional information.
-->
<div
class="t-btn l-btn s-btn s-icon-btn s-very-subtle btn-menu menu-element dropdown click-invoke t-color-palette"
class="t-btn l-btn s-btn s-icon-btn s-menu menu-element t-color-palette"
ng-controller="ClickAwayController as toggle"
>
@ -30,11 +30,9 @@
<span class="title-label" ng-if="structure.text">
{{structure.text}}
</span>
<span class='ui-symbol invoke-menu' ng-if="!structure.text">v</span>
<div
class="menu dropdown l-color-palette"
class="menu l-color-palette"
ng-controller="ColorController as colors"
ng-show="toggle.isActive()"
>

8
platform/forms/res/templates/controls/menu-button.html
View File

@ -19,7 +19,7 @@
this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information.
-->
<div class="t-btn l-btn s-btn s-icon-btn s-very-subtle btn-menu menu-element dropdown click-invoke"
<div class="s-menu menu-element"
ng-controller="ClickAwayController as toggle">
<span class="l-click-area" ng-click="toggle.toggle()"></span>
@ -28,12 +28,8 @@
<span class="title-label" ng-if="structure.text">
{{structure.text}}
</span>
<span class='ui-symbol invoke-menu'
ng-if="!structure.text">
v
</span>
<div class="menu dropdown" ng-show="toggle.isActive()">
<div class="menu" ng-show="toggle.isActive()">
<ul>
<li ng-click="structure.click(option.key); toggle.setState(false)" ng-repeat="option in structure.options">
<a href="">