Commit Graph

17 Commits

Author SHA1 Message Date
larkin
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
larkin
84345caf7d [Style] Convert tabs to spaces 2015-06-29 11:51:28 -07:00
Charles Hacskaylo
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
Charles Hacskaylo
52a7bd1033 [Dev/Frontend] Cherry-picking platform changes from warp1341
WTD-1341
2015-06-24 18:55:15 -07:00
Victor Woeltjen
de3c6e4543 [Fixed Position] Show limits in fixed position
Show limits in fixed position view, WTD-1223.
2015-06-09 10:18:28 -07:00
Victor Woeltjen
9a3ccc3295 [Limits] Merge in latest from platform
Merge in latest changes to platform to begin implementing
limits, WTD-1223.
2015-06-05 16:28:29 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers
WTD-1051.
2015-05-13 16:43:30 -07:00
Charles Hacskaylo
58bd4240f1 [Frontend] Merging warp1172 platform changes in
WTD-1172
(cherry picked from commit 219ffb4d59d4cc4a0172ba351af0e2b5d672d4b2)

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/_fixed-position.scss
	warp/telemetry/src/autoflow/AutoflowTableLinker.js

Manually deleted AutoflowTableLinker.js
2015-05-07 13:10:04 -07:00
Charles Hacskaylo
db74e2f84a [Frontend] CSS hooks for staleness
WTD-1172
New .scss file for staleness
Added CSS hooks in templates for staleness
2015-05-06 17:36:55 -07:00
Charles Hacskaylo
f114f742c4 [Frontend] Tweaks to markup and CSS
WTD-1172
scrolling.html markup and CSS hooks;
added comments to change points;
CSS tweaking;
2015-05-06 16:55:25 -07:00
Charles Hacskaylo
c8d06cb32a [Frontend] Limits added to fixed position view
WTD-1172
2015-05-06 11:20:09 -07: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
Victor Woeltjen
41a013d198 [Fixed Position] Add button to show/hide telemetry name
Add button to show/hide name of telemetry elements in
fixed position view, WTD-881.
2015-02-23 19:25:33 -08:00
Victor Woeltjen
894a5b8f89 [Fixed Position] Add text color property
Add a property to the Fixed Position toolbar to set text
color, WTD-881.
2015-02-23 18:17:24 -08:00
Victor Woeltjen
13793e221e [Fixed Position] Add stroke property
Add stroke property to Fixed Position toolbar for
borders, line color. WTD-881.
2015-02-23 18:05:37 -08:00
Victor Woeltjen
182d02599d [Fixed Position] Add fill properties
Add 'fill' properties, to allow specifying background
color in Fixed Position view. WTD-881.
2015-02-23 10:48:44 -08:00
Victor Woeltjen
8662689974 [Fixed Position] Begin breaking apart template
Begin breaking apart template to allow multiple
types of fixed position elements, WTD-879.
2015-02-18 13:19:59 -08:00