ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-19 05:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Frontend] Rename .s-menu-btn, remove unused

Browse Source 
Fixes #1047
.s-menu-btn > .s-menu-button;
.create-btn > .create-button;
removed unused l-btn, t-btn,
t-btns-zoom from markup
This commit is contained in:
Charles Hacskaylo 2016-07-28 11:36:19 -07:00
parent 5d229198b7
commit 7bca18b186
15 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/mobile/res/sass/mobile-example.scss
View File

@ -25,7 +25,7 @@
@include phoneandtablet {
// Show the Create button
.create-btn-holder {
.create-button-holder {
display: block !important;
}
}

2
platform/commonUI/browse/res/templates/browse.html
View File

@ -31,7 +31,7 @@
<div class="abs holder l-flex-col holder-treeview-elements">
<mct-representation key="'create-button'"
mct-object="navigatedObject"
class="holder flex-elem create-btn-holder">
class="holder flex-elem create-button-holder">
</mct-representation>
<mct-include key="'search'"
ng-model="treeModel"

2
platform/commonUI/edit/res/templates/create/create-button.html
View File

@ -20,7 +20,7 @@
at runtime from the About dialog for additional information.
-->
<span ng-controller="ClickAwayController as createController">
<div class="s-menu-btn major create-btn" ng-click="createController.toggle()">
<div class="s-menu-button major create-button" ng-click="createController.toggle()">
<span class="title-label">Create</span>
</div>
<div class="menu super-menu" ng-show="createController.isActive()">

2
platform/commonUI/general/res/sass/_icons.scss
View File

@ -52,7 +52,7 @@
display: inline-block;
}
.s-menu-btn .invoke-menu,
.s-menu-button .invoke-menu,
.icon.major .invoke-menu {
margin-left: $interiorMarginSm;
}

2
platform/commonUI/general/res/sass/controls/_controls.scss
View File

@ -186,7 +186,7 @@ label.radio.custom {
label.checkbox.custom input:checked ~ em:before { content: $glyph-icon-check; }
label.radio.custom input:checked ~ em:before { content: $glyph-icon-bullet; }
.s-menu-btn label.checkbox.custom {
.s-menu-button label.checkbox.custom {
margin-left: 5px;
}

6
platform/commonUI/general/res/sass/controls/_menus.scss
View File

@ -20,7 +20,7 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/******************************************************** MENU BUTTONS */
.s-menu-btn {
.s-menu-button {
// Formerly .btn-menu
@extend .s-button;
span.l-click-area {
@ -53,7 +53,7 @@
color: rgba($colorInvokeMenu, percentToDecimal($contrastInvokeMenuPercent));
}
&.create-btn {
&.create-button {
@extend .icon-plus;
.title-label {
font-size: 1rem;
@ -122,7 +122,7 @@
.icon-menu,
.context-menu,
.super-menu,
.s-menu-btn .menu {
.s-menu-button .menu {
pointer-events: auto;
ul li {
a.menu-item-a {

2
platform/commonUI/general/res/sass/mobile/_layout.scss
View File

@ -37,7 +37,7 @@ body.mobile {
}
}
.create-btn-holder {
.create-button-holder {
// Hide the create button by default in mobile;
// This can be overridden by the examples/mobile bundle
display: none;

4
platform/commonUI/general/res/sass/user-environ/_frame.scss
View File

@ -50,7 +50,7 @@
}
&.frame-template {
.s-button,
.s-menu-btn {
.s-menu-button {
height: $ohH;
line-height: $ohH;
padding: 0 $interiorMargin;
@ -60,7 +60,7 @@
}
}
.s-menu-btn:after {
.s-menu-button:after {
font-size: 8px;
}

8
platform/commonUI/general/res/sass/user-environ/_layout.scss
View File

@ -192,11 +192,11 @@ body.desktop .pane .mini-tab-icon.toggle-pane {
right: 0;
bottom: $interiorMargin;
left: $bodyMargin;
.create-btn-holder {
.create-button-holder {
&.s-status-editing {
display: none;
& + .search-holder .search-bar {
// .search-holder is adjacent sibling to .create-btn-holder
// .search-holder is adjacent sibling to .create-button-holder
// Add right margin when create button is hidden, to make room for the collapse pane 'x' button
margin-right: $interiorMarginLg * 2;
}
@ -239,9 +239,9 @@ body.desktop .pane .mini-tab-icon.toggle-pane {
.object-browse-bar .s-button,
.top-bar .buttons-main .s-button,
.top-bar .s-menu-btn,
.top-bar .s-menu-button,
.tool-bar .s-button,
.tool-bar .s-menu-btn {
.tool-bar .s-menu-button {
$h: $btnToolbarH;
height: $h;
line-height: $h;

2
platform/commonUI/general/res/templates/controls/switcher.html
View File

@ -20,7 +20,7 @@
at runtime from the About dialog for additional information.
-->
<span ng-controller="ViewSwitcherController">
<div class="view-switcher menu-element s-menu-btn {{ngModel.selected.cssclass}}"
<div class="view-switcher menu-element s-menu-button {{ngModel.selected.cssclass}}"
ng-if="view.length > 1"
ng-controller="ClickAwayController as toggle">

2
platform/features/plot/res/templates/plot.html
View File

@ -97,7 +97,7 @@
ng-show="plot.isZoomed()"
title="Reset pan/zoom">
</a>
<div class="menu-element s-menu-btn menus-to-left {{plot.getMode().cssclass}}"
<div class="menu-element s-menu-button menus-to-left {{plot.getMode().cssclass}}"
ng-if="plot.getModeOptions().length > 1"
ng-controller="ClickAwayController as toggle">
<span class="l-click-area" ng-click="toggle.toggle()"></span>

2
platform/features/table/res/templates/mct-table.html
View File

@ -1,4 +1,4 @@
<a class="t-btn l-btn s-button t-export icon-download labeled"
<a class="s-button t-export icon-download labeled"
ng-click="exportAsCSV()"
title="Export This View's Data">
Export

8
platform/features/timeline/res/templates/timeline.html
View File

@ -102,20 +102,20 @@
<!-- TOP PANE GANTT BARS -->
<div class="split-pane-component l-timeline-pane t-pane-h l-pane-top t-timeline-gantt l-timeline-gantt s-timeline-gantt">
<div class="l-hover-btns-holder s-hover-btns-holder t-btns-zoom">
<a class="t-btn l-btn s-button icon-arrows-out"
<div class="l-hover-btns-holder s-hover-btns-holder">
<a class="s-button icon-arrows-out"
ng-click="zoomController.fit()"
ng-show="true"
title="Zoom to fit">
</a>
<a class="t-btn l-btn s-button icon-magnify-in"
<a class="s-button icon-magnify-in"
ng-click="zoomController.zoom(-1)"
ng-show="true"
title="Zoom in">
</a>
<a class="t-btn l-btn s-button icon-magnify-out"
<a class="s-button icon-magnify-out"
ng-click="zoomController.zoom(1)"
ng-show="true"
title="Zoom out">

2
platform/forms/res/templates/controls/color.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-button s-menu-btn menu-element t-color-palette {{structure.cssclass}}"
<div class="s-button s-menu-button menu-element t-color-palette {{structure.cssclass}}"
ng-controller="ClickAwayController as toggle">
<span class="l-click-area" ng-click="toggle.toggle()"></span>

2
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="s-menu-btn menu-element {{ structure.cssclass }}"
<div class="s-menu-button menu-element {{ structure.cssclass }}"
ng-controller="ClickAwayController as toggle">
<span class="l-click-area" ng-click="toggle.toggle()"></span>