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.

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

Merge open933-1112 > open933 #1113

Closed
wants to merge 94 commits into from
Closed

Merge open933-1112 > open933 #1113

wants to merge 94 commits into from

Conversation

charlesh88
Copy link
Contributor

@akhenry Just pushed a fix for this issue, was a pretty trivial move of some CSS.

akhenry and others added 30 commits July 7, 2016 09:47
Fixes #993
In-progress; class renaming continued,
cleanups in markup file, in-page styles
ported to scss
Fixes #993
In-progress; Create menu refactoring and new
mini Create menu
Fixes #993
In-progress; mode menu names and
descriptors modified, markup cleaned up
Fixes #933
Resolve conflicts in
mode-menu.html, mode-selector.html,
time-conductor.html; apply tweaks, language, etc.
Fixes #933
Tweaks to language; tweak to class name in markup
Fixes #933
Conflicts:
	platform/features/conductor-v2/src/TimeConductorController.js
Fixes #933
Renamed main class; removed unused <style>
defs
Fixes #933
Color adjusts, mini super-menu size
and font tweaks, glyphs added to selector,
SVG style fixes in progress
Fixes #933
In-progress; fixed SVG text color
Fixes #933
In-progress: fixed SVG text color, field
styling for fixed vs. real-time, markup cleanup
Fixes #933
In-progress: color tweaks, bar sizing,
field widths
Fixes #933
In-progress: restructured markup to move
modeModel farther out; animated icon
Fixes #933
Fair amount of manual fixing in time-conductor.html
Fixes #933
Fair amount of manual fixing in time-conductor.html
Fixes #933
In-progress: color/size tweaks, fixes for espresso
theme
@charlesh88 charlesh88 added this to the Niven milestone Aug 8, 2016
@larkin
Copy link
Contributor

larkin commented Aug 8, 2016

@charlesh88 Gotcha, I've merged this to open933. Closing this PR.

@larkin larkin closed this Aug 8, 2016
@larkin larkin deleted the open933-1112 branch August 8, 2016 18:38
@charlesh88 charlesh88 reopened this Aug 8, 2016
@charlesh88
Copy link
Contributor Author

For #1112 - just pushed new fix, please integrate.

Fixes #1112
Put overflow: hidden back at
outer wrapper level (now on .t-object.primary-pane
) which doens't clip the Inspector expand/collapse;
did better unit testing;
@larkin
Copy link
Contributor

larkin commented Aug 8, 2016

Merged into open933

@larkin larkin closed this Aug 8, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants