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

eth theme and eth logo #1874

Merged
merged 6 commits into from
May 6, 2019
Merged

eth theme and eth logo #1874

merged 6 commits into from
May 6, 2019

Conversation

maxgrapps
Copy link
Contributor

@maxgrapps maxgrapps commented May 1, 2019

We need to update just _ethereum_variables.scss and ethereum_logo.svg

screencapture-localhost-4000-2019-05-03-16_03_59

@vbaranov
Copy link
Member

vbaranov commented May 1, 2019

@maxgrapps please update CHANGELOG

And please attach to PR the screenshot of the main page of BlockScout

@vbaranov
Copy link
Member

vbaranov commented May 2, 2019

@maxgrapps I've tried to build from this PR by preliminarily setting

@import "ethereum_variables";
@import "theme/base_variables";

in

https://github.com/poanetwork/blockscout/blob/master/apps/block_scout_web/assets/css/theme/_variables.scss

I've got

    ERROR in ./css/app.scss
    Module build failed (from ./node_modules/css-loader/index.js):
    ModuleBuildError: Module build failed (from ./node_modules/sass-loader/lib/loader.js):

      margin-right: $common-container-margin;
                   ^
          Undefined variable: "$common-container-margin".
          in /Users/viktor/Documents/POANetwork/blockscout-max/apps/block_scout_web/assets/css/_helpers.scss (line 18, column 17)
        at runLoaders (/Users/viktor/Documents/POANetwork/blockscout-max/apps/block_scout_web/assets/node_modules/webpack/lib/NormalModule.js:303:20)
        at /Users/viktor/Documents/POANetwork/blockscout-max/apps/block_scout_web/assets/node_modules/loader-runner/lib/LoaderRunner.js:364:11
        at /Users/viktor/Documents/POANetwork/blockscout-max/apps/block_scout_web/assets/node_modules/loader-runner/lib/LoaderRunner.js:230:18
        at context.callback (/Users/viktor/Documents/POANetwork/blockscout-max/apps/block_scout_web/assets/node_modules/loader-runner/lib/LoaderRunner.js:111:13)
        at Object.asyncSassJobQueue.push [as callback] (/Users/viktor/Documents/POANetwork/blockscout-max/apps/block_scout_web/assets/node_modules/sass-loader/lib/loader.js:67:13)
        at Object.done [as callback] (/Users/viktor/Documents/POANetwork/blockscout-max/apps/block_scout_web/assets/node_modules/neo-async/async.js:7974:18)
        at options.error (/Users/viktor/Documents/POANetwork/blockscout-max/apps/block_scout_web/assets/node_modules/node-sass/lib/index.js:294:32)
     @ ./css/app.scss

    ERROR in ./css/app.scss (./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js??ref--5-4!./css/app.scss)
    Module build failed (from ./node_modules/sass-loader/lib/loader.js):

      margin-right: $common-container-margin;
                   ^
          Undefined variable: "$common-container-margin".
          in /Users/viktor/Documents/POANetwork/blockscout-max/apps/block_scout_web/assets/css/_helpers.scss (line 18, column 17)
     @ ./css/app.scss 2:14-169
    Child extract-text-webpack-plugin node_modules/extract-text-webpack-plugin/dist node_modules/css-loader/index.js!node_modules/postcss-loader/lib/index.js!node_modules/sass-loader/lib/loader.js??ref--5-4!css/app.scss:
        [0] ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js??ref--5-4!./css/app.scss 335 bytes {0} [built] [failed] [1 error]

        ERROR in ./css/app.scss (./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js??ref--5-4!./css/app.scss)
        Module build failed (from ./node_modules/sass-loader/lib/loader.js):

          margin-right: $common-container-margin;
                       ^
              Undefined variable: "$common-container-margin".
              in /Users/viktor/Documents/POANetwork/blockscout-max/apps/block_scout_web/assets/css/_helpers.scss (line 18, column 17)

Please provide instruction in the description of PR which changes should be made to run Blockscout with this update.

@maxgrapps
Copy link
Contributor Author

@vbaranov

  1. About change log. I need just click edit and add something like this "eth theme and eth logo #1874 - add ethereum theme" in the end?

  2. How I can attach screenshot?

  3. About instruction - okay, I will.

@vbaranov
Copy link
Member

vbaranov commented May 3, 2019

@maxgrapps

  1. About change log. I need just click edit and add something like this "eth theme and eth logo #1874 - add ethereum theme" in the end?

yes, you can see an example of this in the current open/closed PRs to the repo, for example, https://github.com/poanetwork/blockscout/pull/1875/files

  1. How I can attach screenshot?

The easiest way to drag & drop the screenshot when posting a comment

@maxgrapps
Copy link
Contributor Author

screenshot

@maxgrapps
Copy link
Contributor Author

@vbaranov - I attached screenshot

  • We need to update only theme scss and logo file to avoid conflicts, as example for this commit it should be ethereum_variables.scss and ethereum_logo.svg

@maxgrapps
Copy link
Contributor Author

@vbaranov I also added changes to changelog.

@maxgrapps
Copy link
Contributor Author

@vbaranov

  1. I added new real screenshot for main page
  2. Added changes to changelog
  3. Try to launch my branch and it works without error

@vbaranov
Copy link
Member

vbaranov commented May 6, 2019

@maxgrapps works fine now.

@vbaranov vbaranov merged commit 03ec74e into blockscout:master May 6, 2019
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.

2 participants