Skip to content

Conversation

@devinmatte
Copy link
Member

@devinmatte devinmatte commented Nov 1, 2017

Added 6 new Colors to fix #132. I only added 6 because after that finding complementary colors was a little difficult

screenshot from 2017-11-01 11-08-00

Also added a version bump to allow changes to take effect

"#658B76",
"#92838F",
"#A9ABC3",
"#7c7fa4",
Copy link
Collaborator

Choose a reason for hiding this comment

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

I would say just uppercase the letters in these so that it looks more consistent

@@ -1,10 +1,10 @@
angular.module('sm').controller("AppController", function($scope, localStorage, $window, $filter, $state, $stateParams) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Normally I'd say keep all formatting-related changes in their own commit, but this is fine because I see no reason we would ever revert this.

Copy link
Member Author

Choose a reason for hiding this comment

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

So this was a mistake where vim had retab on, was not intentional

Copy link
Collaborator

Choose a reason for hiding this comment

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

Always check diffs before making the PR 😄

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed it

@bgrawi bgrawi merged commit bc30681 into ComputerScienceHouse:develop Nov 1, 2017
@devinmatte devinmatte mentioned this pull request Nov 2, 2017
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.

Not enough colors

2 participants