ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-21 14:07:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,950 Commits 989 Branches 212 Tags 191 MiB
268a2c2427
Commit Graph

122 Commits

Author SHA1 Message Date
Henry
268a2c2427 Merged from master 2015-11-25 09:04:11 -08:00
Charles Hacskaylo
de9e41818b [Frontend] File cleanup 
open #199
open #278
Comments and empty CSS classes removed;
 2015-11-18 17:27:56 -08:00
Charles Hacskaylo
558ad94b91 [Frontend] Synced theme constants 
open #199
open #279
Theme constants files needed to be synced
to facilitate more efficient comparison;
 2015-11-18 17:06:18 -08:00
Charles Hacskaylo
c5c166c790 [Frontend] Refinements to active edit styles 
open #199
open #278
Picking up missed rendered CSS;
 2015-11-18 16:47:36 -08:00
Charles Hacskaylo
cc7df05a43 [Frontend] Refinements to active edit styles 
open #199
open #278
Styling finalized for tree/search items;
Mods to pulse mixins;
Colors for both themes finessed and finalized;
 2015-11-18 16:46:56 -08:00
Charles Hacskaylo
b9cd26aaf6 [Frontend] Styling for tree item when its being edited 
open #278
Work in progress
 2015-11-17 16:04:41 -08:00
Charles Hacskaylo
ec4c5864dc [Frontend] Style tweaks for edit mode 
open #199
Added bg color in edit area when edit mode
is active;
 2015-11-17 12:35:44 -08:00
Charles Hacskaylo
3ff275c853 [Frontend] Sanding and shimming styles for Elements pool 
open #199
open #279
Also tweaked bg color of text inputs;
 2015-11-17 12:20:14 -08:00
Charles Hacskaylo
a8d563975a [Frontend] Refinements to Inspector elements, search inputs 
open #199
open #279
Treeview indent removed;
Significant refactoring of search classes to generalize
approach to search inputs;
 2015-11-16 17:20:15 -08:00
Charles Hacskaylo
966e993c5d [Frontend] Merge work in open279 into open199 
open #199
open #279
Fixed margin problem in mobile with
object-browse-bar element;
 2015-11-16 15:20:43 -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
Charles Hacskaylo
5dd15e3b20 [Frontend] Merge work in open279 into open199 
open #199
open #279
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:05:44 -08:00
Charles Hacskaylo
1058648e76 [Frontend] Fixed plot display 
open #199
open #293
Added .abs to plot.html to allow plot
to layout properly when viewed in
main view area;
Removed .test class from time-controller;
 2015-11-12 09:06:17 -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
59ea2ea361 Grabbing recompiled CSS files 2015-11-10 16:14:34 -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
d712a79ba4 [Frontend] Allow Inspector to utilize split pane during editing 
open #279
IN-PROGRESS
Split pane markup added to object-inspector.html;
Tweaks to layout CSS;
 2015-11-10 14:40:14 -08:00
Charles Hacskaylo
e1110a2bc4 [Frontend] Fixed Create menu in mobile 
open #250
open #157
Fixed CSS selector that wasn't properly
targeting the Create menu in a mobile
context;
 2015-11-09 17:14:59 -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
55d3a27917 [Frontend] Fix to z-indexing for search "types" menu 
open #250
 2015-11-09 15:22:53 -08:00
Charles Hacskaylo
a5fa11749c [Frontend] Min/max widths on panes adjusted 
open #250
Moved new min/max definitions into desktop-only
portion of layout.scss to not affect mobile layout;
 2015-11-09 15:14:50 -08:00
Charles Hacskaylo
2b92c1619e [Frontend] Min/max widths on panes adjusted 
open #250
Fixed min and max widths for panes to prevent
weird pane expand/collapse behaviors, like
Inspector covering the main view area;
Added min-width to .holder-all element;
 2015-11-09 15:10:52 -08:00
Charles Hacskaylo
fd135a16af [Frontend] Restoring dropped Snow theme constants 
open #250
Snow theme constants missing were causing the Snow
theme CSS to not compile - this commit restores those
values;
TO-DO: values defined are a bit out of sync between Espresso
and Snow and need to be realigned;
 2015-11-09 14:22:34 -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
76e15f2963 Merge remote-tracking branch 'github/master' into open250 2015-11-06 13:32:28 -08:00
Victor Woeltjen
96a7c12d69 Merge pull request #249 from nasa/open127 
[UI] Progress indicator for pending operations (e.g. duplicate)
 2015-11-06 10:57:42 -08:00
Pete Richards
7564384b57 Merge remote-tracking branch 'github-open/open241' into open-master 2015-11-06 09:59:20 -08:00
Charles Hacskaylo
063e97fcb5 [Frontend] Cleanups and enhancements to search 
open #250
Fixed margin/spacing problems with results element;
Added transition to results display;
Begin adding # results found / no results messaging;
Moved class .off to _globals.scss;
 2015-11-05 17:04:19 -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
Andrew Henry
8e85675732 Made changes to error reporting 2015-11-04 22:07:26 -08:00
Andrew Henry
b73f9fc19e Merged from master 2015-11-04 20:30:49 -08:00
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
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
Victor Woeltjen
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
Victor Woeltjen
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
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
Charles Hacskaylo
6a42d0c7a1 [Frontend] Put overflow: auto back onto .object-holder 
open #232
 2015-11-03 15:28:53 -08:00
Charles Hacskaylo
c8848b5788 [Frontend] Tweaked spacing in Inspector header 
open #90
 2015-11-02 13:39:15 -08:00
Charles Hacskaylo
fe12cdefc5 [Frontend] Added icon to Inspector header 
open #90
and updated icon;
 2015-11-02 11:27:56 -08:00
Charles Hacskaylo
141a54cbd6 [Frontend] Tweaks in Inspector 
open #90
Colors, spacing, properties layout mods;
 2015-10-30 23:44:15 -07:00
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
d926110b4e Merge remote-tracking branch 'github/open155' into open155c 
open #186
open #155
Re-rendering css;
 2015-10-30 16:26:49 -07:00
Charles Hacskaylo
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