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

Netsim imports colors from shared color scss #2015

Merged
merged 2 commits into from
Apr 10, 2015
Merged

Conversation

islemaster
Copy link
Contributor

As a proof-of-concept for using the shared color.scss file from the apps pipeline.

@@ -208,7 +208,8 @@ config.lodash = {
config.sass = {
all: {
options: {
outputStyle: (MINIFY ? 'compressed' : 'nested')
outputStyle: (MINIFY ? 'compressed' : 'nested'),
includePaths: ['../shared/css/']
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Here's the new include path. @wjordan is there a new version of this I need to modify as well?

Copy link
Contributor

Choose a reason for hiding this comment

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

The new version is currently in the frontend_pipeline branch at lib/frontend/sass.js, I've added a commit that matches this change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍 Thanks!

@islemaster
Copy link
Contributor Author

Of course, this changes the netsim colors a bit. Now using official colors for packet header columns:

screenshot from 2015-04-09 17 41 58

@joshlory
Copy link
Contributor

2015 in history: April 9 – This pull request is opened.

@wjordan
Copy link
Contributor

wjordan commented Apr 10, 2015

👍 shared code 😍

islemaster added a commit that referenced this pull request Apr 10, 2015
Netsim imports colors from shared color scss
@islemaster islemaster merged commit cb2861e into staging Apr 10, 2015
@islemaster islemaster deleted the Update-netsim-colors branch April 10, 2015 01:04
deploy-code-org added a commit that referenced this pull request Apr 10, 2015
commit cb2861e
Merge: 90bf3ad 6d94f33
Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
Date:   Thu Apr 9 18:04:27 2015 -0700

    Merge pull request #2015 from code-dot-org/Update-netsim-colors

    Netsim imports colors from shared color scss

commit 6d94f33
Author: Brad Buchanan <brad@code.org>
Date:   Thu Apr 9 18:03:48 2015 -0700

    Use 'white' and 'black' CSS color constants

commit d15c8c3
Author: Brad Buchanan <brad@code.org>
Date:   Thu Apr 9 17:39:36 2015 -0700

    Netsim imports colors from shared color scss
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.

None yet

4 participants