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

modified task style for locked and added style for badimagery #47

Merged
merged 2 commits into from
Mar 10, 2017

Conversation

feenster
Copy link
Contributor

@feenster feenster commented Mar 9, 2017

No description provided.

@feenster feenster requested a review from LindaAlblas March 9, 2017 17:12
@feenster feenster assigned hunt3ri and LindaAlblas and unassigned hunt3ri Mar 9, 2017
@feenster feenster removed the request for review from LindaAlblas March 9, 2017 17:16
@@ -27,15 +27,14 @@
function getTaskStyleFunction(feature){

var FILL_COLOUR_READY = 'rgba(223,223,223,0.1)';//very light gray, 0.1 opacity
var FILL_COLOUR_INVALIDATED = 'rgba(84,84,84,0.4)';//grey, 0.4 opacity
var FILL_COLOUR_INVALIDATED = 'rgba(255,0,0,0.4)';//purple, 0.4 opacity
Copy link
Contributor

Choose a reason for hiding this comment

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

255, 0, 0 is red and not purple

var FILL_COLOUR_DONE = 'rgba(255,165,0,0.4)';//orange, 0.4 opacity
var FILL_COLOUR_VALIDATED = 'rgba(0,128,0,0.4)';//green, 0.4 opacity
var FILL_COLOUR_LOCKED = 'rgba(30,144,255,0.4)';//red, 0.4 opacity
Copy link
Contributor

Choose a reason for hiding this comment

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

30,144,255 is blue I think?

var FILL_COLOUR_DONE = 'rgba(255,165,0,0.4)';//orange, 0.4 opacity
var FILL_COLOUR_VALIDATED = 'rgba(0,128,0,0.4)';//green, 0.4 opacity
var FILL_COLOUR_LOCKED = 'rgba(30,144,255,0.4)';//red, 0.4 opacity
var FILL_COLOUR_BADIMAGERY = 'rgba(0,0,0,0.4)';//red, 0.4 opacity
Copy link
Contributor

Choose a reason for hiding this comment

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

And this is black?

@@ -4,15 +4,14 @@ describe('style.service', function () {
var styleService = null;

var FILL_COLOUR_READY = 'rgba(223,223,223,0.1)';//very light gray, 0.1 opacity
var FILL_COLOUR_INVALIDATED = 'rgba(84,84,84,0.4)';//grey, 0.4 opacity
var FILL_COLOUR_INVALIDATED = 'rgba(255,0,0,0.4)';//purple, 0.4 opacity
Copy link
Contributor

Choose a reason for hiding this comment

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

red?

var FILL_COLOUR_DONE = 'rgba(255,165,0,0.4)';//orange, 0.4 opacity
var FILL_COLOUR_VALIDATED = 'rgba(0,128,0,0.4)';//green, 0.4 opacity
var FILL_COLOUR_LOCKED = 'rgba(30,144,255,0.4)';//red, 0.4 opacity
Copy link
Contributor

Choose a reason for hiding this comment

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

blue?

var FILL_COLOUR_DONE = 'rgba(255,165,0,0.4)';//orange, 0.4 opacity
var FILL_COLOUR_VALIDATED = 'rgba(0,128,0,0.4)';//green, 0.4 opacity
var FILL_COLOUR_LOCKED = 'rgba(30,144,255,0.4)';//red, 0.4 opacity
var FILL_COLOUR_BADIMAGERY = 'rgba(0,0,0,0.4)';//red, 0.4 opacity
Copy link
Contributor

Choose a reason for hiding this comment

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

black?

@LindaAlblas
Copy link
Contributor

@feenster, just some comment changes!

@LindaAlblas LindaAlblas merged commit 1c0791c into develop Mar 10, 2017
@LindaAlblas LindaAlblas deleted the ammend-task-styles branch March 10, 2017 10:10
varun2948 pushed a commit to varun2948/tasking-manager that referenced this pull request Jan 30, 2024
…-crash-for-archived-projects

fix/6131 stats page crash for archived projects
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