b73f9fc19e
Merged from master
2015-11-04 20:30:49 -08:00
e49b55024f
[Frontend] Inspector-related fixes
...
open #247
Modded styles applied to .object-browse-bar to
use overflow:hidden instead of visible;
2015-11-04 16:00:22 -08:00
5f1f54fa91
[Frontend] Inspector-related fixes
...
open #243
Enlarged size of mini-tab icon when panes are collapsed;
Increased size of edge margin to allow for larger icons;
2015-11-04 15:47:13 -08:00
f4325e2bb3
[Frontend] Inspector-related fixes
...
open #244
Moved older .l-flex class out of layout and
into archetypes, updated definition;
2015-11-04 15:20:42 -08:00
e09cf91def
[Frontend] Inspector-related fixes
...
open #244
Fixing scroll issue in Inspector via flex layout;
Added new _archetypes.scss file for .l-flex* and .col styles;
moved .col and associated mixin out of _layout.scss
and into _archetypes;
2015-11-04 15:03:56 -08:00
ff1e1251f6
[Frontend] Integrating new Inspect icon from prod-uisymbols
...
open #244
open #188
2015-11-04 14:29:21 -08:00
5697a39ec3
[Production] Changed target icon e615 to eye
...
open #188
Jay request;
e615 is no-gleam and replaces the crosshair glpyh;
gleam version is e616
2015-11-04 13:55:52 -08:00
ab01f64cea
Merge remote-tracking branch 'github/master' into open236
...
Resolve CSS conflicts for nasa/openmctweb#236
Conflicts:
platform/commonUI/general/res/sass/controls/_controls.scss
platform/commonUI/themes/espresso/res/css/theme-espresso.css
platform/commonUI/themes/snow/res/css/theme-snow.css
2015-11-04 13:02:17 -08:00
522ce02302
[Themes] Add missing semicolon
...
...to satisfy JSLint.
2015-11-04 11:54:19 -08:00
e32eb11e60
[Themes] Update bundle declarations
...
Update bundle declarations to provide a THEME constant for
use in filtering out theme-specific CSS additions.
2015-11-04 11:53:10 -08:00
bda1bf9f9a
[Themes] Match themes from stylesheet loader
2015-11-04 11:49:27 -08:00
226f0932da
[Themes] Add test cases
...
Add test cases to verify that stylesheets are excluded/included
according to theme, when a theme has been specified.
nasa/openmctweb#241
2015-11-04 11:48:49 -08:00
1c4a4e475b
[Inspector] Simplify splitter communication
2015-11-04 10:53:23 -08:00
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
2c7c7b90e6
Fixed JS var placement causing mvn to fail
...
open #90
open #233
2015-11-03 16:51:15 -08:00
903778799f
Fixed missing window reference causing test to fail
...
open #90
open #233
2015-11-03 16:45:11 -08:00
9523c918fb
Merge remote-tracking branch 'github-open/open182' into open-master
2015-11-03 15:52:14 -08:00
4300338b9c
Merge pull request #186 from nasa/open155
...
[Notifications] Add notification infrastructure
2015-11-03 15:38:41 -08:00
6a42d0c7a1
[Frontend] Put overflow: auto back onto .object-holder
...
open #232
2015-11-03 15:28:53 -08:00
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
c8848b5788
[Frontend] Tweaked spacing in Inspector header
...
open #90
2015-11-02 13:39:15 -08:00
2d1faeba8c
[Time Conductor] Update FormatService JSDoc
2015-11-02 12:30:18 -08:00
cecc52f0a9
[Time Conductor] Update formatService usages
...
...to remove checks for unknown formats.
2015-11-02 12:28:46 -08:00
a1d765f271
[Time Conductor] Throw errors for unknown formats
...
Per code review, nasa/openmctweb#204
2015-11-02 12:23:13 -08:00
fe12cdefc5
[Frontend] Added icon to Inspector header
...
open #90
and updated icon;
2015-11-02 11:27:56 -08:00
648cdcc86e
Updated crosshair symbol for inspect
...
open #90
(cherry picked from commit 946a6d4
2015-11-02 11:08:00 -08:00
f7588d57c2
[Frontend] Added crosshair symbol for inspect
...
prod-uisymbols
open #90
(cherry picked from commit 91a4138
2015-11-02 10:31:44 -08:00
141a54cbd6
[Frontend] Tweaks in Inspector
...
open #90
Colors, spacing, properties layout mods;
2015-10-30 23:44:15 -07:00
64c6ef6cfd
[Frontend] Tweaks in Inspector
...
open #90
Colors, spacing, properties layout mods;
Checked in mobile and snow theme;
2015-10-30 18:31:02 -07:00
fe8d9f6717
[Frontend] Mobile and margin tweaks
...
open #90
Margin off of right scrollbar added for treeview
in desktop only;
Repositioned nav to parent arrow button in
object-browse-bar;
2015-10-30 17:22:41 -07:00
c913f173e3
[Frontend] Safety merge of master; minor fixes
...
open #90
IN-PROGRESS
Merged in latest from github/master;
Fixed margins when in edit mode;
Fixed edit area not utilizing overflow: auto properly;
TO-DO: verify mobile is Ok;
2015-10-30 17:09:04 -07:00
d926110b4e
Merge remote-tracking branch 'github/open155' into open155c
...
open #186
open #155
Re-rendering css;
2015-10-30 16:26:49 -07:00
485e6a9de1
[wtf] Merge open155 > github/master
...
open #155
open #186
WTF yet again getting merge conflicts when remerging open155;
2015-10-30 16:24:20 -07:00
1e6731e6f2
Merge open155 > github/master
...
open155
open186
Trying a third time to resolve conflicts between open155 and master;
2015-10-30 16:20:57 -07:00
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
796d6b800a
[Time Conductor] Add JSDoc for params
2015-10-30 14:08:11 -07:00
b12bb55495
[Time Conductor] Update text on format change
...
...in a date-time field.
2015-10-30 13:57:21 -07:00
f42498ab60
[Time Conductor] Update specs
...
...to reflect changes to how unspecified versus unknown formats
are handled.
2015-10-30 13:53:33 -07:00
7f571415dc
[Time Conductor] Change format handling
...
Use default format when no format is specified, and throw an
error when a specified format is unrecognized, from both
date-time field controller and time range controller.
2015-10-30 13:28:01 -07:00
4f9a65a5fe
[Time Conductor] Use default format
...
...from TelemetryFormatter, and log when a requested format
is unavailable.
2015-10-30 13:17:53 -07:00
6db7f056dc
[Time Conductor] Warn about unknown formats
2015-10-30 13:11:13 -07:00
bc82a5bf7e
Added additional test for notifications specified as string message
2015-10-30 10:56:16 -07:00
5af3d575a2
[Representation] Remove redundant listener
...
The event is already listened-for at the representation
level to trigger cleanup, including gestures, so the info gesture
does not need to listen for it as well.
Per code review feedback, nasa/openmctweb#222
2015-10-30 10:45:44 -07:00
58198636ed
Fixed jslint complaints
2015-10-30 10:32:01 -07:00
86bf6c6dff
Minor refactoring and renaming of variables
2015-10-30 10:30:39 -07:00
0e07fb860e
Added convenience methods for alert and error to the NotificationService
2015-10-30 10:28:08 -07:00
b3d4f48e2e
Allow string or model to simplify message specification
2015-10-30 10:22:24 -07:00
b6d08726fb
[Time Conductor] Remove duplicate format
2015-10-30 09:34:23 -07:00
675c5be3da
[Frontend] Tweaks to splitter edge shdw
...
open #90
IN-PROGRESS
2015-10-30 09:22:46 -07:00
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
