Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Color Editor CSS cleanups #2225

Merged
merged 4 commits into from
Dec 8, 2012
Merged

Conversation

ZweiSteinSoft
Copy link
Contributor

Fix for #2216.

@ghost ghost assigned RaymondLim Nov 27, 2012
this.$buttonList = this.$element.find("ul.button-bar");
this.$rgbaButton = this.$element.find(".rgba");
this.$hexButton = this.$element.find(".hex");
this.$hslButton = this.$element.find(".hsla");
this.$currentColor = this.$element.find(".current_color");
this.$currentColor = this.$element.find(".current-color");
this.$lastColor = this.$element.find(".last_color");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to change this to .last-color. Actually, this has also been renamed to original_color.

@RaymondLim
Copy link
Contributor

Nice work! You did exactly what @peterflynn said in #2216. I only found one instance that you missed in converting _ to -.

We're closing down for Sprint 17 and your pull request just missed our pencil-downs yesterday. Also, you may need to redo part of your work with the latest code as @peterflynn had a major clean up in ColorEditor.js.

Conflicts:
	src/extensions/default/InlineColorEditor/ColorEditor.js
	src/extensions/default/InlineColorEditor/ColorEditorTemplate.html
	src/extensions/default/InlineColorEditor/css/main.css
@RaymondLim
Copy link
Contributor

Great! ready to merge but we have to wait until sprint 17 close.

@RaymondLim
Copy link
Contributor

Merging now.

RaymondLim added a commit that referenced this pull request Dec 8, 2012
@RaymondLim RaymondLim merged commit f0fd4f5 into adobe:master Dec 8, 2012
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants