c6405c50df
Merge branch 'master' of https://github.com/nasa/openmctweb into open18
2015-06-25 10:00:21 -07:00
25d3a4d8c2
Merge remote-tracking branch 'nasa/open1323' into open1324
2015-06-25 09:25:42 -07:00
9ac6abe78f
Merge remote-tracking branch 'nasa/open980' into open1342
2015-06-25 09:07:27 -07:00
6a96f1d395
[Frontend] Added icomoon.io project file
2015-06-24 13:54:57 -07:00
14a83e143c
[Frontend] New symbols font and CSS adjustments
...
WTD-980
WTD-396
Minor sanding and shimming;
Updated symbols;
Create super-menu now uses key color;
Removed unused wtdsymbols-v2* font files;
2015-06-24 13:39:31 -07:00
fdfa35d1da
[Frontend] New symbols font and CSS adjustments
...
WTD-980
WTD-396
Changed glyph for stacked plots;
Normalized button line-heights and size of required symbol;
Updated symbol art in symbols font;
Restored mistakenly removed "menu" gesture to grid-item;
2015-06-24 11:42:29 -07:00
db3e132799
[Frontend] New symbols font and CSS adjustments, in-progress
...
WTD-980
WTD-396
2015-06-23 16:07:29 -07:00
c35c9c43b7
[Frontend] Tweak size of spinner
...
WTD-1323
2015-06-22 18:47:58 -07:00
683a733ae1
[Windowing] SASS Edit
...
Adjusted the SASS file to
not hide the new window button. Also
removed the overwrite metadata function
that was used to temprarily allow us to
view the new window button. WTD-16.
2015-06-22 14:00:25 -07:00
0feb3b0462
Merge branch 'open18' of https://github.com/slhale/openmctweb into open18
2015-06-22 12:37:15 -07:00
6b0a77d131
Merge pull request #8 from nasa/open1149
...
[Addressability] Use/populate URL
2015-06-19 16:05:10 -07:00
149ac44e8c
Merge pull request #13 from nasa/open12
...
[Execution] Add worker service
2015-06-19 16:05:02 -07:00
ae7dae011b
[Dev/Frontend] New example event generator and event view
...
WTD-1304
github open18
New example generator;
New temporary view: features/events;
Updated scss and css;
2015-06-19 15:29:06 -07:00
dbd7a65a7a
Merge remote-tracking branch 'nasa/open1295' into open-master
2015-06-18 18:33:09 -07:00
0201a4bcf8
[Frontend] Fix to prevent infobubbles from preventing clicks
...
GitHub-12
Added CSS class "bubble-container" to BUBBLE_TEMPLATE;
bubble-container utilizes CSS "pointer-events: none";
Changed INFO_HOVER_DELAY constant from 500ms to 2000ms;
2015-06-18 15:18:42 -07:00
dc85d3c191
Merge pull request #4 from nasa/open884
...
[Info Bubble] Add info bubble
2015-06-17 11:47:34 -07:00
2677dcd10c
Merge branch 'open-master' into open1295
...
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
platform/commonUI/general/res/sass/_main.scss
2015-06-17 11:00:53 -07:00
bcb4e9c495
[Addressability] Remove excessive check
...
Remove unneeded check from ViewSwitcherController; not necessary
to avoid overwriting query string selection of view. WTD-1149.
2015-06-16 15:40:19 -07:00
d559dae1e2
[Addressability] Expose current view in query param
...
Expose the currently selected view as a query string parameter,
WTD-1149.
2015-06-16 15:09:42 -07:00
fec6f06849
[Addressability] Obey view query string param
...
Obey the query string parameter for a view, if present.
WTD-1149.
2015-06-16 14:58:03 -07:00
c428df524c
Merging in open1248, resolve conflicts
2015-06-16 14:07:53 -07:00
4887ba0e58
Merge in open-master, resolve conflicts
2015-06-16 13:53:00 -07:00
70e1a8ad9e
[Frontend] Mods to layout element drag handles and editing behavior
...
WTD-951
layout.html:
Added classes to and removed inline styles from drag handles,
Removed edge handles, leaving corner handles in NW, SW and SE only;
Added hover classes to display corner handles while editing;
Modified z-indexing to allow view switcher to be accessed while editing;
2015-06-16 12:40:48 -07:00
a984e60ca5
[Frontend] Mods to layout element editing handles
...
WTD-951
In-progress checkin
2015-06-16 10:48:31 -07:00
d614d7ee86
[Frontend] Very minor tweaks to bring open into parity with lastest scss from ue-frontend
...
WTD-1292
Tweaks prior to rebuild of ue-frontend branch;
2015-06-15 17:43:52 -07:00
d8a66b426f
[Merge] Merging open-master in; resolved conflicts
2015-06-15 16:47:23 -07:00
db0cd9cf3a
[Clocks/Timers] Merge in latest CSS
...
Merge in latest CSS from WARP-specific branch, WTD-1220.
2015-06-15 16:15:26 -07:00
6e7203a49f
[Merge] Cherrypick 2 from warp1220
...
WTD-1220
2015-06-15 15:45:40 -07:00
5193c62233
[Merge] Cherrypick 1 from warp1220
...
WTD-1220
2015-06-15 15:44:09 -07:00
c6c4fa7182
[Fronted] Fixes for misaligned bubbles
...
WTD-1247
WTD-884
Changed CSS .l-infobubble-wrapper abs > relative;
Added display: block class for mct-container;
Tweaked bubble evaluation JS for 'goLeft' behavior;
Added constants for bubble max width and left/right margin;
2015-06-12 16:24:25 -07:00
0b46050e04
[Fronted] Tweaks to bubbles and context menus scss
...
WTD-1248
WTD-884
Changed z-index of context menus and bubbles to put the menus above;
Changed text wrapping of 'value' td to no-wrap;
Changed min and max-width of .l-infobubble;
2015-06-12 15:46:31 -07:00
39531a0a9f
[Fronted] Minor final sanding and polishing
...
WTD-839
.t-view-switcher > .view-switcher;
Added CSS transition to hide/show of view-switcher;
Moved .view-switcher hide/show to _frame.scss;
Tweaked .frame:hover to raise z-index to show complete border;
2015-06-12 14:17:19 -07:00
8f153d4e75
[Fronted] Significant refactoring of mixins for containers and buttons
...
WTD-839
Removal of 'icon-btn' class from *.html;
Cleanup of markup in switcher.html;
'name' span is now hidden when switcher is within frame;
Commented out unused css classes in _controls.scss,
Normalization of markup in object header when in main view and framed objects;
Icon sizing fixed in menus and switcher control;
Tightened up spacing in menus;
2015-06-12 11:44:09 -07:00
af0c2e7827
[Fronted] Significant refactoring of mixins for containers and buttons
...
WTD-839
Refactoring in advance of style mods to switcher when in frame;
Cleanup of markup to remove 'icon' class from invoke-menu elements;
2015-06-12 10:00:51 -07:00
0b8d5ceb86
[Fronted] Significant refactoring of btn classes
...
WTD-839
Refactoring in advance of style mods to switcher when in frame;
Moved btn styles from _controls.scss to _buttons.scss;
Markup cleaned up with css classing simplified;
2015-06-10 17:23:08 -07:00
bd66c0138b
[Merge] Bringing in latest ue-frontend
2015-06-10 15:20:38 -07:00
d7e43026cd
[Merge] Merge in open-master, resolve conflicts in _constants.scss
2015-06-10 14:04:48 -07:00
1795dc5549
Merging in /platform specific changes from warp1220
2015-06-09 16:44:18 -07:00
7a93b7d77a
Pulled in final sanding on bubbles.scss from open1222
2015-06-09 09:32:28 -07:00
cec115976c
Merged latest from open-master and open1222 platform/
2015-06-08 16:00:24 -07:00
9f90c6b8d8
[Frontend] Updated CSS; removed position: relative
...
WTD-884
2015-06-08 11:14:58 -07:00
3a36fda8ab
Merge remote-tracking branch 'nasa/open1219' into open1229
...
Merge changes for WTD-1219; WTD-1229
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
2015-06-08 09:53:33 -07:00
e216961727
Pulling in all sass, css, etc. and static-markup work from warp1222 so far
2015-06-05 16:48:58 -07:00
588c35de4e
Merge branch 'open-master' into open884
...
Merge latest from master branch into topic branch for WTD-884
2015-06-04 10:39:25 -07:00
f23f127207
[Frontend] Markup and CSS for Time Controller
...
WTD-1219
Markup, CSS, etc. for time controller;
New template .html file;
Rebuilt from open-master and ue-frontend branches;
2015-06-02 19:29:57 -07:00
c20ad3764d
Merge branch 'open-master' into ue-frontend
...
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
platform/commonUI/general/res/sass/lists/_tabular.scss
2015-06-02 18:26:49 -07:00
48c4282416
Merge branch 'open-master' into ue-frontend
...
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
platform/commonUI/general/res/sass/lists/_tabular.scss
2015-06-02 18:25:26 -07:00
0fbb54add3
Merging ue-frontend
2015-06-02 17:44:59 -07:00
b09ec23617
[Frontend] Renew of ue-frontend
...
Picks up markup and CSS changes from
open1174 (breadcrumbs)
2015-06-02 16:12:19 -07:00
1415e9e72f
[Licenses] Add missing copyright/license info
...
WTD-1051.
2015-05-29 10:05:59 -07:00
