Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Review and integrate open117 #162

Merged
merged 19 commits into from
Oct 9, 2015
Merged

Review and integrate open117 #162

merged 19 commits into from
Oct 9, 2015

Conversation

charlesh88
Copy link
Contributor

open117 applies style and markup changes to open1515, the "time conductor". Styling is done, and should be reviewed and integrated. open117 also integrates the latest from github master.
#117

Author Checklist

  1. Changes address original issue? Y
  2. Unit tests included and/or updated with changes? N/A
  3. Command line build passes? N/A
  4. Expect to pass code review? Y

charlesh88 and others added 17 commits September 23, 2015 15:54
@charlesh88
Merge branch 'master' into open117
9811443
@charlesh88
[Frontend] Time Controller Markup and Styling
9f7dc1d 
open #1515
open #117
Styling for boundary inputs and
slider;
@charlesh88
[Frontend] Time Controller Markup and Styling
825d93c 
open #1515
open #117
Changed slider elements layout from relative to
absolute positioning;
Refined layout in input-holder;
Tweaks to hover classes;
@charlesh88
[Frontend] Time Controller Markup and Styling
404d1e7 
open #1515
open #117
Begin work on styling the datetime picker;
@charlesh88
[Frontend] Time Controller Markup and Styling
54a077a 
open #1515
open #117
Tweak to mixin "test";
@charlesh88
Merge branch 'open1515' of https://github.com/nasa/openmctweb into op…
09f5fa4 
…en117
@charlesh88
[Frontend] Time Controller Markup and Styling
9e64dfe 
open #1515
open #117
Tweaks to tick spacing;
@charlesh88
[Frontend] Time Controller Markup and Styling
1d83516 
open #1515
open #117
Significant re-org in menus.scss continued:
Refactored s-menu to s-menu-btn;
moved look-related style def's into .s-menu;
.menu now extends .s-menu;
@charlesh88
[Frontend] Time Controller Markup and Styling
67f627b 
open #1515
open #117
Commit prior to redoing markup of picker to use flex instead of table;
Styling in picker; tabular styles fixed somewhat;
@charlesh88
[Frontend] Time Controller Markup and Styling
b3da6ed 
open #1515
open #117
Significant new vals added to constants files
for datetime picker/calendar;
Styling for calendar, hover and selected states;
Modded DateTimePickerController.js and markup
to allow selection of out-of-month cells;
@charlesh88
[Frontend] Time controller-related styling (CP > open117)
a7153f3 
open #1515
open #117
Fixing selects;
Minor tweak to normalize espresso/.../mixins.scss;
(cherry picked from commit 2866d56)
@charlesh88
[Frontend] Time controller-related styling (CP > open117)
7a67706 
open #1515
open #117
Fixing selects;
Tweaks to constants and mixins to better
handle button dropshadowing across
themes;
(cherry picked from commit 3e34d06)
@charlesh88
[Frontend] Time controller-related styling (CP > open117)
afb1202 
open #1515
open #117
Layout styling in datetime picker;
Modded picker to hide time selects area
when time options are null;
(cherry picked from commit 6721093)
@charlesh88
[Frontend] Time controller-related styling (CP > open117)
e33485e 
open #1515
open #117
Further refinements to slider knob and range look;
(cherry picked from commit 63a1239)
@charlesh88
[Frontend] Time Controller Markup and Styling
badaca5 
open #1515
open #117
Significant mods to slider scss;
Added toi-line element and hover styles;
@charlesh88
[Frontend] Time Controller Markup and Styling
23de391 
open #1515
open #117
Animation added to .knob and .range;
@charlesh88
[Frontend] Time controller-related styling
333f7cb 
open #1515
open #117
Markup changed to utilize mct-representation via CSS;
time-controller now uses list-based _constants values;
ConductorRepresenter.js modded to remove inline styling
and to add CSS classes to enclosing mct-representation;
@charlesh88 charlesh88 added this to the Asimov milestone Sep 29, 2015
VWoeltjen added a commit that referenced this pull request Oct 9, 2015
@VWoeltjen
Merge pull request #162 from nasa/open117
4f716ad 
Review and integrate open117
@VWoeltjen VWoeltjen merged commit 4f716ad into open1515 Oct 9, 2015
@VWoeltjen
Copy link
Contributor

Reviewer Checklist

  1. Changes appear to address issue? Y
  2. Appropriate unit tests included? Y
  3. Code style and in-line documentation are appropriate? Y
  4. Commit messages meet standards? Y

@larkin larkin deleted the open117 branch October 9, 2015 16:56
@larkin larkin mentioned this pull request Oct 9, 2015
Closed
@VWoeltjen
Copy link
Contributor

Merged this into master now as well

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@VWoeltjen VWoeltjen

Labels
None yet
Projects
None yet
Milestone
Asimov
Development

Successfully merging this pull request may close these issues.
2 participants
@charlesh88 @VWoeltjen