Pete Richards
65043d0ff3
squash merge open933 into integration-1089, resolve merge conflicts.
2016-10-12 13:47:56 -07:00
Victor Woeltjen
d1e1ba1c66
[Frontend] Refactor glyphs to classes
...
Squashes #1103 , fixes #1047 .
Squashed commit of the following:
commit 0e060f174dFixes #1047
commit 9f74395a79Fixes #1047
commit 7278c9534cFixes #1047
Fixed .s-status-editing and s-status-pending;
commit 4606d617d1d5bff5559436f7d5bff555e0Fixes #1047
commit b72d82baefFixes #1047
commit af36b9996dFixes #1047
<mct-form> must now include class
'validates' to display validation glyph icons;
removed 'no-validate' from markup; cleaned
up validation scss;
commit 69dc893b4bFixes #1047
Fixes and enhancements for mobile,
particularly in tree; Removed
`display: inline-block` from containerSubtle
mixin;
commit 7bca18b186Fixes #1047
.s-menu-btn > .s-menu-button;
.create-btn > .create-button;
removed unused l-btn, t-btn,
t-btns-zoom from markup
commit 5d229198b7Fixes #1047
commit 36479e2e8bFixes #1047
commit 89e4f06de9Fixes #1047
commit e65ca1cb8bFixes #1047
- Clock, timer, plots updated
commit 3e7eb98ac2Fixes #1047
- Finessing mini-tab and making able to
control per theme; s-clickable and s-toggle-icon
classes cleaned up
commit 18e08074a8Fixes #1047
- Splitter and mini-tab-icon elements
commit 44fda8d68fFixes #1047
mini-tabs, splitters and bg-splash updated;
moved position of Inspector collapse mini-tab
to allow position transition;
splitter-sm class added for Timelines;
commit 2aee8bc0d8Fixes #1047
commit 624f09777fce7591f4d2f159ce7591f642Fixes #1047
Restored no-collapse and float-right
properties;
commit 5324c8edbaFixes #1047
New font files that were missed in
last commit; updated icomoon proj
file; fixed missing char codes in
glyphs.scss;
commit a3b2628883Fixes #1047
New icons for overlay and stacked plots;
revised art and new description for
Fixed Position object;
commit 8a41c6dbc7Fixes #1047
Updated comment
commit eb293b21ebFixes #1047
Removed commented code
commit d8b1fb7781Fixes #1047
Search and removal of "glyph" definitions in bundle
and other JS files; updating tests accordingly;
commit 650fbcc921Fixes #1047
Search and removal of "glyph" definitions in bundle
and other JS files; updating tests accordingly;
commit 574b8bd5c1Fixes #1047
Fixing test cases
commit dd84177441Fixes #1047
WIP: Fixing test cases: fixed test in Timers that was expecting
glyph return;
commit 2231f8e124Fixes #1047
Fixing test cases: fixed test in Timers that was expecting
glyph return;
commit ae59ecfa97Fixes #1047
WIP: fixed line-height issue for t-item-icon class
commit d43bff1445Fixes #1047
WIP: fixed colors and style defs related to clickable
icons
commit c2db6f8805Fixes #1047
WIP: fixed colors related to changes to
btnSubtle mixin; new constants for clickable
icons
commit a4753c44d1Fixes #1047
WIP
commit 2704640b94Fixes #1047
Normalize color constant values for themes; consolidated
and cleaned up btn-related mixins; fixed hover color issues
commit 421286c7e4Fixes #1047
WIP
commit a4111f3855Fixes #1047
WIP: Timeline-related glyph refactoring; s-btn
styles and hover color fixes
commit 883f9992159d9cabb14f1a1f9d9cabb760Fixes #1047
WIP: search, toolbar buttons; mods
to flex archetypes
commit 28b663ce41Fixes #1047
Glyph refactoring WIP for toolbar buttons;
Timeline glyph refactoring continued
commit a9326f572fFixes #1047
Timeline glyph refactoring; Resource Graph icons
in swimlanes now display grayed-out version when not
added to the Resource Graph; minor color tweaks
commit d6e173780388054e56176ca2Fixes #1047
Resolved conflict in icomoon.json file
commit 88054e5e8efixes #1047
In progress: significant mods to pane collapse/expand
buttons and symbols, minor tweaks to splitter look,
limits glyph definitions
commit 7c47343f5cfixes #1047
In progress: updated font files glyphs, mostly
for pane collapse icons
commit fd00bdce54fixes #1047
In progress: search menu
commit 272b4b649efixes #1047
In progress: moved limits classes out
of _contants and into _glyphs;
timers, entanglement context menu items,
form validation, date picker.
commit 95d26e6fe7Fixes #1047
In-progress; limits
commit 26b30d96dbFixes #1047
In-progress; overlay close, search inputs,
messages and message banners,
ui-symbol removal in-progress.
commit 4e2a01ad85Fixes #1047
In-progress; .labeled added to .s-btn,
removed .s-icon-btn
commit 521db3c3feFixes #1047
In-progress; plot options, imagery buttons,
cleanups in buttons.scss, edit-action buttons,
.s-btn .no-label class added.
commit 8bb8db69e6Fixes #1047
In-progress; indicators, notifications, actions,
tests
commit 53ed0bfb22fixes #1047
In progress, really: view icons, timer/clock
commit 47dc7f2f6bfixes #1047
In progress: grid items
commit 2bd34f71befixes #1047
Context menus and associated actions,
custom checkboxes, tree item being edited
commit b561d4f60efixes #1047
In-progess: glyphs.scss now uses $vars to
allow other scss to use a var instead of string
literals;
commit 0cf4089620fixes #1047
In-progess: tree-labels, unknown objects, object
header
commit 46cae10905fixes #1047
In-progess, menus and Create menu fixes
commit fe3097707f7d69ae4652a50c7d69ae401bfixes #1047
In-progress, converting types, mods to
Create Menu template
commit 18d9f3d6b2fixes #1047
Very much In-progess: convert some controls;
commit e93a90a782fixes #1047
Very much In-progess, classes for all symbols
added to glyphs.scss; .menu cleaned up;
commit dc670b22a6fixes #1047
Very much In-progess, "icon-" selector,
browse bar buttons
commit 8b29ccf3affixes #1047
Very much In-progess, s-btn and
s-btn-menu refactoring
commit f574ffed16fixes #1047
In-progess, e900 > e904
commit bc62ee4565fixes #1047
New font files; no re-mapping yet in the app.
commit 614f0c6e9ffixes #1047
Moved all glyphs into PUA area of font, and
re-organized by category.
commit 47bd4031d5Fixes #1047
- Modified sass to point to renamed font files;
- Added new 12px symbols font files to sass;
commit 22a51d6bbbFixes #1047
- Renamed main project file;
- Added new 12px symbols project file;
commit 13ded2fd84Fixes #1047
commit aef5660dfdFixes #1047
2016-08-01 14:33:25 -07:00
Pete Richards
14f1a1f740
Merge remote-tracking branch 'origin/open1031'
2016-07-18 11:43:55 -07:00
Henry
c8898ac6aa
[Documentation] Updated copyright statement. Fixes #1081
2016-07-12 16:55:57 -07:00
Henry
c0311be192
[Browse] Inspector shown when object switched to edit mode. Fixes #1031
2016-06-20 20:27:56 -07:00
Henry
32d7187db6
Relocated creation package to edit bundle
2016-05-24 17:08:12 -07:00
Charles Hacskaylo
a729edd399
[Frontend] Label context arrows now always visible
...
open #929
- Also enable frame dragging in title area when
editing in Layout;
- CSS and markup changes;
2016-05-16 12:00:29 -07:00
Henry
650ef9bfa4
[Timelines] #677 Removed temporary markup
2016-03-23 11:27:40 -07:00
Andrew Henry
4e89ffbe07
Merge pull request #735 from nasa/open729
...
Review and integrate open729
2016-03-14 16:12:18 -07:00
Charles Hacskaylo
377d533ec7
[Frontend] Fixed markup
...
open #718
Removed class from markup;
2016-03-10 18:11:10 -08:00
Charles Hacskaylo
7171fd01e3
[Frontend] Cleanups to Inspector config elements
...
open #729
In-progress
Moved CSS def to be more globally applicable;
Simplified layout obj props location display;
2016-03-10 11:07:26 -08:00
Henry
2cc2c6a9d3
[Edit Mode] #627 removed edit concerns from browse controllers and markup
...
Fixed elements not appearing in edit mode
Fixed failing tests
2016-03-02 11:05:23 -08:00
Henry
2f036a89e4
Refactoring out regions
2016-03-02 11:00:08 -08:00
Henry
549dfab5aa
[Edit Mode] #627 remove edit concerns from browse controller
2016-03-02 10:55:18 -08:00
Pete Richards
183bd9793c
Merge branch 'open677'
2016-03-01 11:33:31 -08:00
Melanie Lean
53c60ee64f
[Timelines] #677 Applied fix to prevent editing of timelines in browse mode
...
Fixed failing test
2016-02-11 21:52:05 -08:00
Henry
645bd5743f
[Plots] #638 Addressing feedback from code review
...
[Plots] #638 Fixing failing tests
[Plot] Changed PlotOptionsController to prototype form
Fixed spacing
Fixed jslint issue
2016-02-08 23:36:45 -08:00
Charles Hacskaylo
371669fbce
[Frontend] Mods in progress to form layout
...
open #638
Major progress on form-row markup and CSS when
in Inspector 'part' context; General fixes cleanups
to custom checkbox/radio CSS;
2016-02-04 14:23:29 -08:00
Charles Hacskaylo
115ffe7963
[Frontend] Fixes to scrolling and layout in Inspector
...
open #638
In progress;
2016-02-04 14:23:29 -08:00
Henry
6fb6761abf
[Plots] #638 New plot display options
2016-02-04 14:23:28 -08:00
Charles Hacskaylo
2d44cf78f9
[Frontend] Fixed HTML and CSS for grid-item
...
open #486
Normalized grid-item to use similar HTML structure
as label template;
Fixed CSS accordingly.
2016-01-15 15:33:10 -08:00
Charles Hacskaylo
898dd557e5
[Frontend] Refactor to use s-status-editing instead of ng-class
...
open #468
Remove ng-class statements in favor of upstream .s-status-editing;
Restructure CSS accordingly;
NOTE: because edit.html has NOT been changed,
changes here will cause old edit mode to no longer display properly.
Don't integrate this CSS with old edit mode!
2016-01-08 16:11:00 -08:00
Henry
5fd762fea9
Fixed problem with unload warning being shown when it shouldn't
2015-12-09 21:04:22 -08:00
Henry
c211f413aa
[New Edit Mode] Add Elements pool to New Edit Mode #279
2015-11-25 10:40:37 -08:00
Henry
50d83eaffb
Merge remote-tracking branch 'origin/open278' into open278-proto
2015-11-19 14:50:01 -08:00
Henry
a04b3f8a4b
enabled toolbar in edit mode
2015-11-19 14:01:38 -08:00
Charles Hacskaylo
5882278f98
Bringing in latest NEM work from open199-meet-open279
2015-11-17 15:26:11 -08:00
Henry
cd3bdf4f81
Change to navigate by location change
2015-11-16 17:45:31 -08:00
Charles Hacskaylo
9b5d894949
[Frontend] Merge work in open279 into open199
...
open #199
open #279
Last commit didn't fully take...
Integrated inspector changes from open279 into
new edit mode work from open199; _layout.scss
had a bit of difficult conflict resolution but seems
good at this point...
2015-11-16 15:08:22 -08:00
Henry
d961b41253
removed static buttons
2015-11-12 17:18:41 -08:00
Henry
93171230e3
restoring toolbar
2015-11-12 11:13:54 -08:00
Charles Hacskaylo
6d2fe9d7eb
[Frontend] Misc CSS and markup updates, converting to flex
...
open #199
IN-PROGRESS
IMPORTANT: plots are not laying out correctly,
need to figure out why
2015-11-10 18:33:58 -08:00
Charles Hacskaylo
08ecf00916
[Frontend] Misc CSS updates to clean up layout
...
open #199
IN-PROGRESS
Testing with Time Controller visible;
2015-11-10 17:14:12 -08:00
Charles Hacskaylo
9f3c353ab4
[Frontend] Updated markup to use latest flexbox classes
...
open #199
2015-11-10 16:30:49 -08:00
Charles Hacskaylo
608df8f7b8
Merging in latest github master; resolved conflicts
2015-11-10 16:13:46 -08:00
Charles Hacskaylo
d6d95fed19
[Code style] Cleaned out comments
...
open #250
open #274
scss, html scoured for commented
dead code, leftover TO-DOs and
other unnecessary comments;
2015-11-10 15:12:09 -08:00
Charles Hacskaylo
cfc9b61e25
[Frontend] Adjusted margin strategy in left pane elements
...
open #250
Changed flex-elem to use margin-bottom instead of top;
Added margin-top to .search-results element;
2015-11-09 16:21:50 -08:00
Charles Hacskaylo
2a201df435
[Frontend] Consolidated treeview elements markup
...
open #250
Removed un-needed markup around treeview
includes and mct-reps; moved CSS class defs into
mct-include and mct-rep for search and tree
respectively;
2015-11-09 15:42:24 -08:00
Charles Hacskaylo
4e79de6156
[Frontend] Apply flex layout to object header elements
...
open #250
open #260
vista#132
Major refactoring to markup and CSS to apply
flex layout strategy to object headers;
Flex necessary to fix 'overflow: hidden' setting
applied in open90 to object-browse-bar that
was preventing the view switcher menu from
appearing;
Browse, edit, mobile, frames in layouts, etc. all
visually checked in a first go round;
Mobile classes tweaked to fix left and right
margin problems resulting from open90 changes;
z-indexing of Inspector pane and splitters changed
to allow primary pane elements to overflow beneath
when primary pane width is severely constrained;
2015-11-06 17:42:54 -08:00
Charles Hacskaylo
c0ac3a0f96
[Frontend] Convert main left pane elements to flex layout
...
open #250
Significant changes to flex classes, markup in
browse.html and search.html to support better
flex layout;
Search results now scrolls properly;
Significant refactoring and cleanups in search and _search.scss;
2015-11-05 15:44:55 -08:00
Charles Hacskaylo
8ca22cc510
[Frontend] Convert main left pane elements to flex layout
...
open #250
Markup mods in browse.html;
Renamed .holder-create-and-search to
.holder-treeview-elements;
TO-DO: fix search results to scroll properly;
2015-11-05 10:11:59 -08:00
Victor Woeltjen
f7839b758d
Merge remote-tracking branch 'github/master' into open233b
...
Resolve conflicts on nasa/openmctweb#233
Conflicts:
platform/commonUI/general/bundle.json
platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json
platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
platform/commonUI/general/res/sass/_main.scss
platform/commonUI/general/res/sass/user-environ/_layout.scss
platform/commonUI/themes/espresso/res/css/theme-espresso.css
platform/commonUI/themes/espresso/res/sass/_constants.scss
platform/commonUI/themes/snow/res/css/theme-snow.css
2015-11-04 09:28:19 -08:00
Victor Woeltjen
0dccaab9cb
[Search] Declare UI components as templates
...
Declare Search UI components as templates instead of
representations so that they are not removed from the
DOM when no domain object is supplied. Fixes
nasa/openmctweb#234
2015-11-02 14:07:22 -08:00
Charles Hacskaylo
b5b6546710
[Frontend] Significant change to look and behavior of mini-tabs
...
open #90
IN-PROGRESS
mini-tab location in markup in browse.html changed;
Single menu icon for collapsed treeview;
Close 'x' boxes instead of arrow icons;
TO-DO: verify mobile is Ok;
2015-10-30 15:25:12 -07:00
Charles Hacskaylo
1dbd721b14
[Frontend] Significant mods to main layout strategy
...
open #90
IN-PROGRESS
To support desired edge-to-edge styling of Inspector pane;
Removed superflous .scss file;
Enhancements to splitter .scss to allow flush edging and
edge shadows;
2015-10-29 17:31:35 -07:00
Charles Hacskaylo
f51230b3f7
[Frontend] Fixed erroneous classes wrapping Create button;
...
open #90
2015-10-29 11:21:22 -07:00
Charles Hacskaylo
134d853f19
[Frontend] type-icon evolving to universal t-item-icon
...
open #90
Major work in-progress on switching to .t-item-icon from
.type-icon to get item icons working better, especially
in .inspector-location in Inspector;
Significant mods to label.html;
2015-10-28 00:24:57 -07:00
Henry
19bdf743fc
Added save/cancel
2015-10-26 14:14:56 -07:00
Charles Hacskaylo
fd582d45d2
Frontend] More refining of collapsing treeview
...
open #90
Create and Search controls now properly change
to mini-tabs when treeview is collapsed;
Mods to .create-btn to use :before for symbol instead of span;
TO-DO: why does mct-device alter the order of items in the rendered
markup?
2015-10-26 10:01:52 -07:00
Charles Hacskaylo
99c977ce9d
[Frontend] Fixed mini-tab positioning algorithm
...
open #90
2015-10-24 17:48:59 -07:00
