Commit Graph

118 Commits

Author SHA1 Message Date
Charles Hacskaylo
c428df524c Merging in open1248, resolve conflicts 2015-06-16 14:07:53 -07:00
Charles Hacskaylo
4887ba0e58 Merge in open-master, resolve conflicts 2015-06-16 13:53:00 -07:00
Charles Hacskaylo
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
Charles Hacskaylo
a984e60ca5 [Frontend] Mods to layout element editing handles
WTD-951
In-progress checkin
2015-06-16 10:48:31 -07:00
Charles Hacskaylo
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
Charles Hacskaylo
d8a66b426f [Merge] Merging open-master in; resolved conflicts 2015-06-15 16:47:23 -07:00
Victor Woeltjen
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
Charles Hacskaylo
6e7203a49f [Merge] Cherrypick 2 from warp1220
WTD-1220
2015-06-15 15:45:40 -07:00
Charles Hacskaylo
5193c62233 [Merge] Cherrypick 1 from warp1220
WTD-1220
2015-06-15 15:44:09 -07:00
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
bd66c0138b [Merge] Bringing in latest ue-frontend 2015-06-10 15:20:38 -07:00
Charles Hacskaylo
d7e43026cd [Merge] Merge in open-master, resolve conflicts in _constants.scss 2015-06-10 14:04:48 -07:00
Charles Hacskaylo
1795dc5549 Merging in /platform specific changes from warp1220 2015-06-09 16:44:18 -07:00
Charles Hacskaylo
7a93b7d77a Pulled in final sanding on bubbles.scss from open1222 2015-06-09 09:32:28 -07:00
Charles Hacskaylo
cec115976c Merged latest from open-master and open1222 platform/ 2015-06-08 16:00:24 -07:00
Charles Hacskaylo
9f90c6b8d8 [Frontend] Updated CSS; removed position: relative
WTD-884
2015-06-08 11:14:58 -07:00
Victor Woeltjen
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
Charles Hacskaylo
e216961727 Pulling in all sass, css, etc. and static-markup work from warp1222 so far 2015-06-05 16:48:58 -07:00
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
0fbb54add3 Merging ue-frontend 2015-06-02 17:44:59 -07:00
Charles Hacskaylo
b09ec23617 [Frontend] Renew of ue-frontend
Picks up markup and CSS changes from
open1174 (breadcrumbs)
2015-06-02 16:12:19 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers
WTD-1051.
2015-05-13 16:43:30 -07:00
Victor Woeltjen
4c6cad3e77 Merge remote-tracking branch 'nasa/open1163' into open1176
WTD-1176
2015-05-06 10:11:01 -07:00
Charles Hacskaylo
ac81968f93 [Frontend] CSS in Fixed Position view Edit mode
WTD-1163
WTD-1114
Added CSS to give a border to all elements in Fixed Position view when in Edit mode.
Only applied to outer element, does not affect object border styling;
2015-05-01 10:43:15 -07:00
Charles Hacskaylo
6aadf921e1 [Frontend] Tweaks to spacing
WTD-1163
WTD-1146
2015-05-01 10:18:33 -07:00
Charles Hacskaylo
aec1176dc4 [Frontend] Hiding non-functional items; padding adjustments
WTD-1163
WTD-1146
New CSS to hide non-functional elements, including browse.top-bar with search elements;
Adjusted spacing, mainly in .contents CSS class;
2015-05-01 10:10:35 -07:00
Charles Hacskaylo
0bbe3ec99a [Frontend] CSS enhancements
WTD-1054
Better handling of different content cases;
2015-04-29 18:13:35 -07:00
Charles Hacskaylo
eafc603e03 [Frontend] Infobubble markup and CSS
WTD-1054
Markup and styling for infobubble;
Includes fake data in infobubble.html
2015-04-29 17:52:06 -07:00
Charles Hacskaylo
babe420f26 [Frontend] CSS and markup for iframe
WTD-1150
WTD-1145
CSS and markup to cause iframes to layout properly without double scroll bars
2015-04-28 14:49:08 -07:00
Charles Hacskaylo
b6503489b9 [Frontend] Major reformatting of /licenses page
WTD-1036
Major additions to /licenses page
Apache license added;
Full licenses for each software component added;
Formatting and styles;
2015-04-15 17:40:12 -07:00
Charles Hacskaylo
dbe27d2842 [Frontend/Content] Copy and styling tweaks
WTD-1036
Open source copyright information added to about-dialog.html;
Styling for a and h2 elements tweaked;
2015-04-15 14:40:38 -07:00
Charles Hacskaylo
29b63504eb [Frontend] New and updated styles for values view
WTD-938
2015-04-07 20:52:49 -07:00
Charles Hacskaylo
379e76af4f [Frontend] CSS change to center fixed position images
WTD-1048
WTD-957
2015-03-20 16:48:14 -07:00
Charles Hacskaylo
8018c8f42e [Frontend] Sanding and polishing on common front-end elements
WTD-1048
Originally did a lot of this work in warp1048 by mistake
This commit pulls in all /platform-only changes from that branch
Mods are mostly related to WTD-1046 specifically, but also touch toolbar and buttons
2015-03-20 16:37:42 -07:00
Victor Woeltjen
988f539ee1 [Platform] Bring in changes
Bring in open-source-friendly changes to CSS, fonts, templates,
related to WTD-1045.
2015-03-20 09:11:07 -07:00
Charles Hacskaylo
e7e0c6829e [Frontend] Added "first" CSS class applied to form-row elements
WTD-1002
WTD-1005
Made form.html add CSS class "first" to each form-row element in order to allow proper border-top styling;
2015-03-11 15:09:48 -07:00
Charles Hacskaylo
cc181dbdc9 [Frontend] Form and form control enhancements
WTD-1002
Added Angular hooks to allow form elements to have JSON defined CSS classes
Form element cleanups
2015-03-10 22:36:35 -07:00
Charles Hacskaylo
c640d6238b [Frontend] Markup and CSS mods to fix click area in btn-menu objects
WTD-1002
WTD-942
Mods to markup and CSS to make click-area of menu buttons occupy full area of button
2015-03-06 10:55:40 -08:00
Charles Hacskaylo
feda668e18 [Frontend] Applied split pane functionality to edit mode
WTD-1002
SplitPaneController added to edit-object.html;
CSS modded to remove positioning that is now under splitter control;
2015-03-06 08:11:27 -08:00
Charles Hacskaylo
433cdf8b1c In-progress checkin - NOT WORKING RIGHT YET! 2015-03-05 16:02:33 -08:00
Charles Hacskaylo
1304084f7a [Frontend Bug] Fixed CSS for selects to correct Firefox display problem
WTD-954
2015-03-05 12:43:48 -08:00
Victor Woeltjen
4f89911739 [CSS] Update compiled CSS files
Rewrote some history as part of merge for WTD-940 to
remove non-open-source history; compiled CSS files did
not merge correctly in this process, so bringing over
compiled files from the original branch to replace these.
2015-03-04 14:49:02 -08:00
Charles Hacskaylo
679e56d231 [Frontend] Tweaks and minor mods
WTD-894
Changed image CSS from contain to cover
Modded default colors for text and telemetry elements to visibility;
Moved click handler position in menu-button.html for better clickability;

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
2015-03-04 14:45:24 -08:00
Charles Hacskaylo
7c7f1c3dbc [Bug fix] Removed temp dev styling and fixed width issues with telemtry elements in Fixed Position view 2015-03-04 14:43:55 -08:00
Charles Hacskaylo
448b535de0 [Frontend] Markup and CSS mods to clean up form elements display
WTD-610
CSS and markup mods principally focused on selects, checkboxes and composite controls;
Cleaned up positioning and formatting in .l-result area of query form bottom;
Removed display of view type when only a single view available for an object in switcher.html

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	vista/query/res/templates/channel-query.html
	vista/query/res/templates/channel-selector.html
	vista/query/res/templates/evr-query.html
2015-03-04 14:43:21 -08:00
Charles Hacskaylo
9c001fabd9 [Frontend] Form element style and markup fixes
WTD-610
Fixed markup in select.html;
Rebuilt associated CSS in _selects.scss;
Still to-do: checkbox valign and spacing

Conflicts:
	platform/commonUI/general/res/css/forms.css
	platform/commonUI/general/res/css/items.css
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/css/tree.css
2015-03-04 14:41:50 -08:00
Charles Hacskaylo
068518b535 [Frontend] Minor sanding
WTD-894
Fix to correct spacing problem in object-header
2015-02-25 18:59:36 -08:00
Charles Hacskaylo
424d60440c [Frontend] Delivery checkin: final tweaks to CSS
WTD-894
CSS tweaks to allow box-sizing to be applied to elements within mct-include containers;
CSS cleanups
2015-02-25 18:41:00 -08:00
Charles Hacskaylo
a0f31132e3 [Frontend] In-progress checkin: color palette SASS
WTD-847
Significant markup and CSS for color palette support;
2015-02-25 18:17:11 -08:00
Charles Hacskaylo
7d03bc4de9 [Frontend] In-progress checkin: migrating style tags to classes, other
WTD-894
Significant migration of inline styles to CSS classes;
Changed telemetry component so that when title is hidden, telem element can take up 100% of the element width;
Static text elements now show scrollbars on overflow;
Added padding and box-sizing to text elements - this is throwing off the selected control because of the offset and should be fixed;
2015-02-25 15:53:02 -08:00
Charles Hacskaylo
a11967ce2e Merging in open-master; resolved conflict in /platform/.../edit-object.html 2015-02-25 13:21:56 -08:00
Victor Woeltjen
f523022a2a [Styles] Merge in style updates
Merge in style updates and split pane updates related
to timeline view into open-source-friendly branch,
WTD-901
2015-02-25 11:25:20 -08:00
Charles Hacskaylo
fa4cfc4961 [Frontend] In-progress checkin:
WTD-894
Added scss file for fixed position styles;
Mods in progress to fixed.html to remove inline styling and change grid method to background gradient approach;
2015-02-25 11:08:52 -08:00
Charles Hacskaylo
420a006fab [Bug/Front-end] Fixed display overflow issue in Create dialog
WTD-763
Added new class with overflow: auto to div element in platform/.../dialog.html
2015-01-29 16:27:19 -08:00
Charles Hacskaylo
6f26c9cd47 [Front-end] Added drop-shadow version of app logo
WTD-668
Added a version of the shadow with drop shadow on the About screen
2015-01-27 14:56:10 -08:00
Charles Hacskaylo
53d6b60bda [Front-end] About screen and app logo for OpenMCT Web
WTD-668
WTD-700
Fixed app logo for OpenMCT Web for WTD-700;
About screen for OpenMCT Web;
2015-01-26 12:58:50 -08:00
Charles Hacskaylo
9686384619 [Front-end] About screen and status bar logo
>
> WTD-668
> WTD-700
Pulling over platform-specific CSS and imagery for About screen and status bar logo;
In progress
2015-01-26 10:18:23 -08:00
Victor Woeltjen
86c2cda7a2 [Autoflow] Update CSS files
Update CSS/SCSS for autoflow tabular view with changes
to fix alignment of cells for WTD-685 and WTD-674;
part of integration task WTD-686.
2015-01-15 16:12:09 -08:00
Charles Hacskaylo
d281bd52de Fixing inadvertant breakage of super-menu
Fixing inadvertant breakage of super-menu
from changes to .pane classes related to split-pane CSS changes
WTD-618
2015-01-02 14:12:22 -08:00
Charles Hacskaylo
f820cd47b6 [Bug] CSS and markup mods
CSS markup and mods to fix issues related to bug WTD-618;
fix is complete and verified in Chrome
2015-01-02 14:11:29 -08:00
Victor Woeltjen
7db5c0692b [Autoflow] Add SCSS files
Merge in SCSS files and platform markup which supports
autoflow tabular views for WTD-611 into the open-source-friendly
master branch.
2014-12-31 10:43:01 -08:00
Victor Woeltjen
1b0303e517 [Common UI] Initial commonUI bundles
Bring in work on general-purpose and over-arching
user interface bundles from the sandbox transition
branch. WTD-574.
2014-11-23 15:41:20 -08:00