1c4cca3f91
Merge branch 'open1392b' into open-master
2015-06-29 16:30:48 -07:00
ef77ca91e7
Merge branch 'open1363' into open-master
2015-06-29 16:27:10 -07:00
970698c77b
Merge remote-tracking branch 'nasa/open1392' into open1392b
...
Conflicts:
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
2015-06-29 16:09:01 -07:00
a7c90f2476
[Frontend] platform-specific changes to CSS, fonts and markup
...
WTD-1392
WTD-1360
WTD-1394
New minus symbol added to font;
Updated folder symbols art;
CSS tweaked for reset button (WTD-1394) and direction sign;
Font project file updated;
(cherry picked from commit f6c7d8e)
2015-06-29 14:39:46 -07:00
38ad8058e8
Merge remote-tracking branch 'origin/open1223' into open-1338
...
Resolve merge conflicts due to whitespace changes.
2015-06-29 12:08:16 -07:00
c262fe814c
[Frontend] Added pointer-events: none
...
WTD-1363?
2015-06-29 11:08:28 -07:00
8841f25186
[Frontend] Create menu style normalized
...
WTD-1392
WTD-1367
WTD-1391
Some significant reorging in _menus.scss and _constants;
Create menu normalized with context menu styles;
Bottom bar of overlay overflow set to visible to prevent button clipping;
2015-06-26 18:38:33 -07:00
e3cb9dae5a
[Frontend] Bottom bar restyled
...
WTD-1392
WTD-1362
Fixed font size in botttom bar;
Added font-smoothing to global.scss;
Bottom bar design restyled;
2015-06-26 17:12:24 -07:00
83be455b0b
[Frontend] Added user-select: none to .btn, .l-btn class
...
WTD-1392
WTD-1074
2015-06-26 15:52:07 -07:00
50bf7b7b32
[Frontend] Removed crosshair cursor from image class
...
WTD-1392
WTD-1371
2015-06-26 15:38:38 -07:00
f8f2019dad
Merge remote-tracking branch 'nasa/open1322' into open1388
2015-06-26 13:25:12 -07:00
fce327a398
[Dev/Frontend] New symbol added to symbols font
...
WTD-1322
Platform-only commit;
(cherry picked from warp1322 commit 7254013)
2015-06-25 15:17:08 -07:00
bf8b0bae03
Merge branch 'master' of https://github.com/nasa/openmctweb into open18
2015-06-25 14:51:18 -07:00
3df12788f9
Merge remote-tracking branch 'nasa/open1341' into open1345
2015-06-25 11:53:13 -07:00
685e384858
[Dev/Frontend] PLATFORM CHANGES: use data-value instead of css class selection
...
WTD-1341
(cherry picked from commit 5151637 in warp1341)
telemetry.html now uses data-value instead of class;
Mods to effects.scss to add customKeyframes mixin;
Added default transition time to mixin trans-prop-nice in mixins.scss;
2015-06-25 11:46:15 -07:00
70f5a001ee
Merge remote-tracking branch 'nasa/open1341' into open1345
2015-06-25 10:06:18 -07:00
c6405c50df
Merge branch 'master' of https://github.com/nasa/openmctweb into open18
2015-06-25 10:00:21 -07:00
d3ff49b90b
Merge remote-tracking branch 'nasa/open1319' into open1320
2015-06-25 09:59:23 -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
9f137513d9
Merge branch 'open-master' of https://trunk.arc.nasa.gov/git/wtd into open1341
2015-06-24 19:25:27 -07:00
19748ba17c
[Dev/Frontend] Cherry-picking platform changes from warp1341
...
WTD-1341
Re-rendered css file;
2015-06-24 18:56:38 -07:00
52a7bd1033
[Dev/Frontend] Cherry-picking platform changes from warp1341
...
WTD-1341
2015-06-24 18:55:15 -07:00
e357df2fe5
[Dev/Frontend] Cherry-picking platform changes from warp1341
...
WTD-1341
2015-06-24 18:52:52 -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
cb715a9d48
[Frontend] Merge in platform CSS changes
...
WTD-1319
WTD-768
WTD-841
Change CSS for autoflow-tabular header;
2015-06-22 18:41:04 -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
7f7759f72c
Merge branch 'open-master' into open1223
2015-06-20 15:36:21 -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
3b62add011
Merge branch 'open-master' into open1223
...
Conflicts:
platform/features/plot/res/templates/plot.html
2015-06-19 13:34:21 -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
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
