[Code style] Cleaned out comments

open #250
open #274
scss, html scoured for commented
dead code, leftover TO-DOs and
other unnecessary comments;
This commit is contained in:
Charles Hacskaylo
2015-11-10 15:12:09 -08:00
parent 72e0304fc0
commit d6d95fed19
12 changed files with 407 additions and 489 deletions

View File

@@ -19,7 +19,6 @@
this source code distribution or the Licensing information page available this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<!--<div class='object-header'> Moved up to browse-object.html and frame.html. TO-DO: make sure this is Ok!-->
<span class='type-icon ui-symbol flex-elem'>{{type.getGlyph()}}</span> <span class='type-icon ui-symbol flex-elem'>{{type.getGlyph()}}</span>
<span class="l-elem-wrapper l-flex-row flex-elem grows"> <span class="l-elem-wrapper l-flex-row flex-elem grows">
<span ng-if="parameters.mode" class='action flex-elem'>{{parameters.mode}}</span> <span ng-if="parameters.mode" class='action flex-elem'>{{parameters.mode}}</span>
@@ -28,5 +27,4 @@
key="'menu-arrow'" key="'menu-arrow'"
mct-object='domainObject' mct-object='domainObject'
class="flex-elem"></mct-representation> class="flex-elem"></mct-representation>
</span> </span>
<!--</div>-->

View File

@@ -36,7 +36,6 @@
.col { .col {
@include box-sizing(border-box); @include box-sizing(border-box);
@include clearfix; @include clearfix;
// background: rgba(#ffcc00, 0.2);
float: left; float: left;
margin-left: $ueColMargin; margin-left: $ueColMargin;
padding-left: $interiorMargin; padding-left: $interiorMargin;
@@ -97,9 +96,7 @@
.l-flex-col { .l-flex-col {
@include display-flex; @include display-flex;
@include flex-wrap(nowrap); @include flex-wrap(nowrap);
//@include flex(1 1 auto !important);
.flex-elem { .flex-elem {
//@include test(green, 0.1);
min-height: 0; // Needed to allow element to shrink within parent min-height: 0; // Needed to allow element to shrink within parent
position: relative; position: relative;
&:not(.grows) { &:not(.grows) {

View File

@@ -127,7 +127,6 @@ label.checkbox.custom {
&:before { &:before {
@include border-radius($basicCr * .75); @include border-radius($basicCr * .75);
background: $bg; background: $bg;
//border-bottom: 1px solid lighten($bg, 10%);
@include box-shadow(inset rgba(black, 0.4) 0 1px 2px); @include box-shadow(inset rgba(black, 0.4) 0 1px 2px);
box-sizing: border-box; box-sizing: border-box;
content: " "; content: " ";
@@ -202,7 +201,6 @@ label.checkbox.custom {
/******************************************************** OBJECT-HEADER */ /******************************************************** OBJECT-HEADER */
.object-header { .object-header {
//@include test();
font-size: 1em; font-size: 1em;
> .type-icon { > .type-icon {
@@ -213,8 +211,6 @@ label.checkbox.custom {
} }
.l-elem-wrapper { .l-elem-wrapper {
//@include test(#66f, 0.2);
//@include justify-content(flex-start); // Commented out 11/6/15 open250
mct-representation { mct-representation {
// Holds the context-available item // Holds the context-available item
// Must have min-width to make flex work properly // Must have min-width to make flex work properly
@@ -228,19 +224,15 @@ label.checkbox.custom {
} }
.title-label { .title-label {
//@include test(green, 0.9);
color: $colorObjHdrTxt; color: $colorObjHdrTxt;
@include ellipsize(); @include ellipsize();
//color: pushBack($colorBodyFg, 40%);
@include webkitProp(flex, '0 1 auto'); @include webkitProp(flex, '0 1 auto');
padding-right: 0.35em; // For context arrow. Done with em's so pad is relative to the scale of the text. padding-right: 0.35em; // For context arrow. Done with em's so pad is relative to the scale of the text.
//position: relative;
} }
.context-available { .context-available {
font-size: 0.7em; font-size: 0.7em;
@include webkitProp(flex, '0 0 1'); @include webkitProp(flex, '0 0 1');
//margin-right: $interiorMargin;
} }
@include desktop { @include desktop {
@@ -303,7 +295,6 @@ label.checkbox.custom {
@include border-radius($basicCr); @include border-radius($basicCr);
@include boxIncised(0.3, 4px); @include boxIncised(0.3, 4px);
background: $colorProgressBarOuter; background: $colorProgressBarOuter;
//border:1px solid $colorProgressBarOuter;
.progress-amt { .progress-amt {
@include border-radius($basicCr); @include border-radius($basicCr);
@include boxShdw(); @include boxShdw();
@@ -343,8 +334,6 @@ label.checkbox.custom {
.slider { .slider {
$knobH: 100%; //14px; $knobH: 100%; //14px;
.slot { .slot {
// @include border-radius($basicCr * .75);
//@include sliderTrack();
width: auto; width: auto;
position: absolute; position: absolute;
top: 0; top: 0;
@@ -400,14 +389,11 @@ label.checkbox.custom {
width: 230px; width: 230px;
.l-month-year-pager { .l-month-year-pager {
$pagerW: 20px; $pagerW: 20px;
//@include test();
//font-size: 0.8rem;
height: $r1H; height: $r1H;
margin-bottom: $interiorMargin; margin-bottom: $interiorMargin;
position: relative; position: relative;
.pager, .pager,
.val { .val {
//@include test(red);
@extend .abs; @extend .abs;
} }
.pager { .pager {
@@ -454,7 +440,6 @@ label.checkbox.custom {
} }
li { li {
@include flex(1 0); @include flex(1 0);
//@include test();
margin-left: 1px; margin-left: 1px;
padding: $interiorMargin; padding: $interiorMargin;
text-align: center; text-align: center;
@@ -512,8 +497,6 @@ label.checkbox.custom {
@include background-image(linear-gradient(lighten($bg, $gr), $bg 20px)); @include background-image(linear-gradient(lighten($bg, $gr), $bg 20px));
@include border-radius(2px); @include border-radius(2px);
@include box-sizing(border-box); @include box-sizing(border-box);
//@include boxShdwSubtle();
//border-top: 1px solid lighten($bg, 20%);
&:hover { &:hover {
@include background-image(linear-gradient(lighten($hc, $gr), $hc 20px)); @include background-image(linear-gradient(lighten($hc, $gr), $hc 20px));
} }

View File

@@ -43,7 +43,6 @@
} }
} }
&:active { &:active {
//@include test();
&:after { &:after {
background-color: $colorSplitterActive !important; background-color: $colorSplitterActive !important;
} }
@@ -122,11 +121,3 @@
} }
} }
} }
/*.browse-area .splitter {
top: 0; //$ueTopBarH + $interiorMarginLg;
}
.edit-area .splitter {
top: 0;
}*/

View File

@@ -46,7 +46,7 @@
.create-btn-holder { .create-btn-holder {
// Hide the create button by default in mobile; // Hide the create button by default in mobile;
// This can be overridden by an example bundle to come // This can be overridden by the examples/mobile bundle
display: none; display: none;
} }
@@ -62,10 +62,6 @@
// is hidden. // is hidden.
.pane.left.treeview { .pane.left.treeview {
@include trans-prop-nice(opacity, 150ms); @include trans-prop-nice(opacity, 150ms);
//right: 100% !important;
//width: auto !important;
//overflow-y: hidden;
//overflow-x: hidden;
opacity: 0 !important; opacity: 0 !important;
} }
.pane.right.items { .pane.right.items {
@@ -79,7 +75,6 @@
// causing cut/copy/paste menu to // causing cut/copy/paste menu to
// not appear. Should me moved in // not appear. Should me moved in
// future to properly work // future to properly work
//@include user-select(none);
// Sets the left tree menu when the tree is shown. // Sets the left tree menu when the tree is shown.
.pane.left.treeview { .pane.left.treeview {
@@ -107,7 +102,6 @@
} }
.object-browse-bar { .object-browse-bar {
//@include test();
left: 45px !important; left: 45px !important;
.context-available { .context-available {
opacity: 1 !important; opacity: 1 !important;
@@ -166,4 +160,4 @@
.desktop-hide { .desktop-hide {
display: none; display: none;
} }
} }

View File

@@ -41,7 +41,6 @@
$textInputHeight: 19px; // This is equal to the default value, 19px $textInputHeight: 19px; // This is equal to the default value, 19px
$iconEdgeM: 4px; $iconEdgeM: 4px;
$iconD: $treeSearchInputBarH - ($iconEdgeM*2); $iconD: $treeSearchInputBarH - ($iconEdgeM*2);
//@include test(red, 0.1);
font-size: 0.8em; font-size: 0.8em;
max-width: 250px; max-width: 250px;
position: relative; position: relative;
@@ -128,7 +127,6 @@
} }
.active-filter-display { .active-filter-display {
//order: 2;
$s: 0.65em; $s: 0.65em;
$p: $interiorMargin; $p: $interiorMargin;
@include box-sizing(border-box); @include box-sizing(border-box);

View File

@@ -30,7 +30,6 @@
} }
} }
.object-top-bar { .object-top-bar {
//@include test(red);
font-size: 0.75em; font-size: 0.75em;
height: $ohH; height: $ohH;
line-height: $ohH; line-height: $ohH;

View File

@@ -31,7 +31,7 @@
} }
.contents { .contents {
$myM: 0; //$interiorMargin; $myM: 0;
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
top: $myM; top: $myM;
@@ -86,12 +86,10 @@
background: $colorFooterBg; background: $colorFooterBg;
color: lighten($colorBodyBg, 30%); color: lighten($colorBodyBg, 30%);
font-size: .7rem; font-size: .7rem;
.status-holder { .status-holder {
@include box-sizing(border-box); @include box-sizing(border-box);
@include absPosDefault($interiorMargin); @include absPosDefault($interiorMargin);
@include ellipsize(); @include ellipsize();
//line-height: $ueFooterH - ($interiorMargin * 2);
right: 120px; right: 120px;
text-transform: uppercase; text-transform: uppercase;
z-index: 1; z-index: 1;
@@ -138,7 +136,6 @@
} }
.mini-tab-icon.toggle-pane { .mini-tab-icon.toggle-pane {
//@include test(blue, 0.3);
z-index: 5; z-index: 5;
@include desktop { @include desktop {
$d: $uePaneMiniTabH; $d: $uePaneMiniTabH;
@@ -250,7 +247,6 @@
/***************************************************** OBJECT BROWSE BAR */ /***************************************************** OBJECT BROWSE BAR */
.object-browse-bar { .object-browse-bar {
//@include test(blue);
@include absPosDefault(0, visible); // Must use visible to avoid hiding view switcher menu @include absPosDefault(0, visible); // Must use visible to avoid hiding view switcher menu
@include box-sizing(border-box); @include box-sizing(border-box);
height: $ueTopBarH; height: $ueTopBarH;
@@ -270,7 +266,6 @@
// right representation. // right representation.
.pane-tree-hidden { .pane-tree-hidden {
// Sets the left tree menu when the tree is hidden. // Sets the left tree menu when the tree is hidden.
//.pane.left.treeview,
.tree-holder, .tree-holder,
.splitter-treeview, .splitter-treeview,
.holder-treeview-elements { .holder-treeview-elements {
@@ -280,7 +275,6 @@
.pane-tree-showing { .pane-tree-showing {
// Sets the left tree menu when the tree is shown. // Sets the left tree menu when the tree is shown.
//.pane.left.treeview,
.tree-holder, .tree-holder,
.splitter-treeview { .splitter-treeview {
@include trans-prop-nice(opacity, $dur: 250ms, $delay: 250ms); @include trans-prop-nice(opacity, $dur: 250ms, $delay: 250ms);
@@ -320,7 +314,6 @@
} }
.split-layout { .split-layout {
.split-pane-component.pane { .split-pane-component.pane {
//@include test(green);
&.treeview.left { &.treeview.left {
min-width: $ueBrowseLeftPaneTreeMinW; min-width: $ueBrowseLeftPaneTreeMinW;
max-width: $ueBrowseLeftPaneTreeMaxW; max-width: $ueBrowseLeftPaneTreeMaxW;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,4 @@
<div class="t-imagery" ng-controller="ImageryController as imagery"> <div class="t-imagery" ng-controller="ImageryController as imagery">
<!-- Main image -->
<div <div
class="l-image-main-wrapper" class="l-image-main-wrapper"
ng-mouseenter="showLocalControls = true;" ng-mouseenter="showLocalControls = true;"

View File

@@ -20,24 +20,16 @@
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<div class="l-flex-col flex-elem grows holder holder-search" ng-controller="SearchController as controller"> <div class="l-flex-col flex-elem grows holder holder-search" ng-controller="SearchController as controller">
<!-- Search bar -->
<div class="search-bar flex-elem" ng-controller="ClickAwayController as toggle"> <div class="search-bar flex-elem" ng-controller="ClickAwayController as toggle">
<!-- Input field -->
<input class="search-input" <input class="search-input"
type="text" type="text"
ng-model="ngModel.input" ng-model="ngModel.input"
ng-keyup="controller.search()" /> ng-keyup="controller.search()" />
<!-- Clear icon/button 'x' -->
<a class="clear-icon" <a class="clear-icon"
ng-class="{show: !(ngModel.input === '' || ngModel.input === undefined)}" ng-class="{show: !(ngModel.input === '' || ngModel.input === undefined)}"
ng-click="ngModel.input = ''; controller.search()"></a> ng-click="ngModel.input = ''; controller.search()"></a>
<!-- Menu icon/button 'v' -->
<a class="menu-icon" <a class="menu-icon"
ng-click="toggle.toggle()"></a> ng-click="toggle.toggle()"></a>
<!-- Menu -->
<mct-include key="'search-menu'" <mct-include key="'search-menu'"
class="menu-element search-menu-holder" class="menu-element search-menu-holder"
ng-class="{off: !toggle.isActive()}" ng-class="{off: !toggle.isActive()}"
@@ -45,31 +37,19 @@
ng-click="toggle.setState(true)"> ng-click="toggle.setState(true)">
</mct-include> </mct-include>
</div> </div>
<!-- Active filter display -->
<div class="active-filter-display flex-elem" <div class="active-filter-display flex-elem"
ng-class="{off: ngModel.filtersString === '' || ngModel.filtersString === undefined || !ngModel.search}" ng-class="{off: ngModel.filtersString === '' || ngModel.filtersString === undefined || !ngModel.search}"
ng-controller="SearchMenuController as menuController"> ng-controller="SearchMenuController as menuController">
<a class="clear-icon clear-filters-icon" <a class="clear-icon clear-filters-icon"
ng-click="ngModel.checkAll = true; menuController.checkAll()"></a>Filtered by: {{ ngModel.filtersString }} ng-click="ngModel.checkAll = true; menuController.checkAll()"></a>Filtered by: {{ ngModel.filtersString }}
</div> </div>
<!-- This div exists to determine scroll bar location -->
<div class="search-results flex-elem grows vscroll" <div class="search-results flex-elem grows vscroll"
ng-class="{ off: !(loading || results.length > 0), loading: loading }"> ng-class="{ off: !(loading || results.length > 0), loading: loading }">
<!--ng-hide="(ngModel.input === '' || ngModel.input === undefined)"-->
<!--<div class="hint" ng-show="results.length === 0">No results found</div>-->
<!--<div class="hint" ng-show="results.length > 0">Displaying {{ results.length }} result<span ng-show="results.length > 1">s</span></div>-->
<mct-representation key="'search-item'" <mct-representation key="'search-item'"
ng-repeat="result in results" ng-repeat="result in results"
mct-object="result.object" mct-object="result.object"
ng-model="ngModel"> ng-model="ngModel">
</mct-representation> </mct-representation>
<!-- Load more button -->
<a class="load-more-button s-btn vsm" ng-if="controller.areMore()" ng-click="controller.loadMore()">More Results</a> <a class="load-more-button s-btn vsm" ng-if="controller.areMore()" ng-click="controller.loadMore()">More Results</a>
</div> </div>