Update issue templates (#195)

* Update issue templates

* change logo

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,17 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+* version: 
+* project (e.g. CLI): 
+* operating system: 
+
+## Description
+
+## Steps to reproduce
+

CONTRIBUTING.md

@@ -0,0 +1,92 @@
+# Contributing to Dnote
+
+This repository contains the server side and the client side code for Dnote.
+
+## Set up
+
+1. Download and setup the [Go programming language](https://golang.org/dl/).
+2. Download the project
+
+```sh
+go get github.com/dnote/dnote
+```
+
+## CLI
+
+### Set up
+
+Download dependencies using [dep](https://github.com/golang/dep).
+
+```sh
+dep ensure
+```
+
+### Test
+
+Run:
+
+```sh
+./cli/scripts/test.sh
+```
+
+### Debug
+
+Run Dnote with `DNOTE_DEBUG=1` to print debugging statements.
+
+### Release
+
+* Build for all target platforms, tag, push tags
+* Release on GitHub and [Dnote Homebrew tap](https://github.com/dnote/homebrew-dnote).
+
+```sh
+VERSION=0.4.8 make release
+```
+
+* Build, without releasing, for all target platforms
+
+```sh
+VERSION=0.4.8 make
+```
+
+**Note**
+
+- If a release is not stable,
+  - disable the homebrew release by commenting out relevant code in the release script.
+  - mark release as pre-release on GitHub release
+
+## Web
+
+### Set up
+
+Download dependencies using [dep](https://github.com/golang/dep) and npm.
+
+```sh
+dep ensure
+npm install
+```
+
+### Test
+
+Run:
+
+```
+npm run test
+```
+
+## Server
+
+### Set up
+
+Download dependencies using [dep](https://github.com/golang/dep).
+
+```sh
+dep ensure
+```
+
+### Test
+
+Run:
+
+```
+./server/api/scripts/test-local.sh
+```

README.md

@@ -1,39 +1,63 @@
-# Dnote
+![Dnote](assets/logo.png)
+=========================
 
-A simple notebook for developers.
+Dnote is a simple notebook for developers.
 
-## What It Does
+[![Build Status](https://semaphoreci.com/api/v1/dnote/dnote-2/branches/master/badge.svg)](https://semaphoreci.com/dnote/dnote-2)
 
-Write technical notes and neatly organize them into books.
+## What is Dnote?
 
-## How to Use
+Dnote is a lightweight notebook for writing technical notes and neatly organizing them into books. The main design goal is to **keep you focused** by providing a way of swiftly capturing new information **without having to switch environment**. To that end, you can use Dnote as a command line interface, browser extension, web client, or an IDE plugin.
 
-You can use Dnote in a command line, web browser, or in an IDE.
+It also offers **end-to-end encrypted** backup with AES-256, and **automated spaced repetition** to retain your memory in case you are building a personal knowledge base.
 
-- [CLI](https://github.com/dnote/dnote/tree/master/cli)
-- [Web](https://dnote.io)
-- [Browser extension](https://github.com/dnote/browser-extension)
-- [Atom](https://github.com/dnote/dnote-atom)
+For more details, see the [download page](https://dnote.io/download) and [features](https://dnote.io/pricing).
 
-It is designed to minimize switching environment.
+## Quick install
 
-## Privacy
+The quickest way to try Dnote is to install the command line interface.
 
-Dnote is end-to-end encrypted with AES-256 to respect your privacy. It does not track you.
+### Install with Homebrew
 
-## Self-host
+On macOS, you can install using Homebrew:
 
-Instructions are coming soon.
+```sh
+brew tap dnote/dnote
+brew install dnote
 
-## User Stories
+# to upgrade to the latest version
+brew upgrade dnote
+```
+
+### Install with script
+
+You can use the installation script to install the latest version:
+
+    curl -s https://raw.githubusercontent.com/dnote/dnote/master/cli/install.sh | sh
+
+In some cases, you might need an elevated permission:
+
+    curl -s https://raw.githubusercontent.com/dnote/dnote/master/cli/install.sh | sudo sh
+
+### Install with tarball
+
+You can download the binary for your platform manually from the [releases page](https://github.com/dnote/dnote/releases).
+
+## Personal knowledge base
+
+Dnote is great for building a personal knowledge base because:
+
+* It is fully open source.
+* Your data is stored locally first and in a SQLite format which is [suitable for continued accessibility](https://www.sqlite.org/locrsf.html).
+* It provides a way of instantly capturing new lessons without distracting you.
+* It automates spaced repetition to help you retain your memory.
+
+You can read more in the following user stories:
 
 - [How I Built a Personal Knowledge Base for Myself](https://dnote.io/blog/how-i-built-personal-knowledge-base-for-myself/)
 - [I Wrote Down Everything I Learned While Programming for a Month](https://dnote.io/blog/writing-everything-i-learn-coding-for-a-month/)
 
-## Links
+## See Also
 
-- [Dnote](https://dnote.io)
-- [Dnote Pro](https://dnote.io/pricing)
+- [Homepage](https://dnote.io)
 - [Forum](https://forum.dnote.io)
-
-[![Build Status](https://semaphoreci.com/api/v1/dnote/dnote-2/branches/master/badge.svg)](https://semaphoreci.com/dnote/dnote-2)

cli/CONBTRIBUTING.md

@@ -1,50 +0,0 @@
-# Contributing
-
-This is a guide for contributors.
-
-## Set up
-
-First, download the project
-
-```sh
-go get github.com/dnote/dnote/cli
-```
-
-Go to the project root and download dependencies using [dep](https://github.com/golang/dep).
-
-```sh
-dep ensure
-```
-
-## Test
-
-Run
-
-```sh
-./scripts/test.sh
-```
-
-## Debug
-
-Run Dnote with `DNOTE_DEBUG=1` to print debugging statements.
-
-## Release
-
-* Build for all target platforms, tag, push tags
-* Release on GitHub and [Dnote Homebrew tap](https://github.com/dnote/homebrew-dnote).
-
-```sh
-VERSION=0.4.8 make release
-```
-
-* Build, without releasing, for all target platforms
-
-```sh
-VERSION=0.4.8 make
-```
-
-**Note**
-
-- If a release is not stable,
-  - disable the homebrew release by commenting out `homebrew` block in `.goreleaser.yml`
-  - mark release as pre-release on GitHub release

web/scripts/dev.sh

@@ -15,6 +15,7 @@ appPath="$basePath"/web
   PUBLIC_PATH="$appPath"/public \
   STANDALONE=true \
   COMPILED_PATH="$basePath/web/compiled" \
+  IS_TEST=true \
     "$appPath"/scripts/webpack-dev.sh
 ) &
 

web/scripts/webpack-dev.sh

@@ -14,6 +14,7 @@ appPath="$basePath"/web
   ASSET_BASE_URL=$ASSET_BASE_URL \
   COMPILED_PATH=$COMPILED_PATH \
   PUBLIC_PATH=$PUBLIC_PATH \
+  IS_TEST=true \
     "$appPath"/scripts/placeholder.sh &&
 
   "$appPath"/node_modules/.bin/webpack-dev-server\

web/src/components/Icons/Logo.js

@@ -26,23 +26,21 @@ const Icon = ({ fill, width, height, className }) => {
     <svg
       width={w}
       height={h}
-      viewBox="0 0 32 30"
+      viewBox="0 0 32 32"
       fill="none"
       xmlns="http://www.w3.org/2000/svg"
       className={className}
     >
-      <g>
-        <path
-          d="M27.7993 7.9354C23.7727 7.11689 20.126 5.10464 17.2593 2.11388L16.8326 1.66467C16.706 1.53538 16.526 1.46154 16.3393 1.46154H16.3326C16.146 1.46154 15.966 1.52922 15.8393 1.65851L15.186 2.32309C12.4593 5.08616 9.0393 6.99384 5.286 7.84308L4.84598 7.94156C4.55932 8.00308 4.34598 8.24309 4.33931 8.51998C4.09932 17.1538 9.61934 23.3754 12.006 25.6462C13.506 27.08 15.426 28.5323 16.326 28.5385C16.3326 28.5385 16.3326 28.5385 16.3326 28.5385C16.3393 28.5385 16.346 28.5385 16.346 28.5385C17.3593 28.5138 19.3393 26.9323 20.726 25.5846C23.0993 23.2769 28.586 16.9938 28.326 8.51998C28.3193 8.23693 28.0993 7.99692 27.7993 7.9354ZM17.1993 21.6647C17.086 21.7323 16.9593 21.7692 16.8326 21.7692C16.726 21.7692 16.6193 21.7446 16.5193 21.6954C16.2993 21.5846 16.166 21.3754 16.166 21.1538V8.84616C16.166 8.63695 16.2793 8.44006 16.4726 8.32925C16.6593 8.21229 16.8993 8.19997 17.106 8.28005L23.7727 11.0493C24.0393 11.16 24.1927 11.4123 24.166 11.677C24.1326 11.9292 23.386 17.9231 17.1993 21.6647Z"
-          fill={fill}
-        />
-      </g>
+      <path
+        d="M8.5968 1.5412C8.53682 1.54101 8.47683 1.54083 8.4167 1.57058C8.38671 1.57048 8.35657 1.60032 8.32658 1.60023C8.29659 1.60014 8.26645 1.62998 8.23645 1.62989C8.20646 1.62979 8.17632 1.65963 8.14618 1.68948C8.11619 1.68938 8.08605 1.71922 8.08605 1.71922C8.02592 1.74897 7.99578 1.77882 7.9355 1.8385L1.90756 7.8069C1.87742 7.83674 1.81714 7.89643 1.78685 7.95621C1.78671 7.98614 1.75671 7.98605 1.75657 8.01598C1.72643 8.04583 1.72628 8.07576 1.69614 8.1056C1.69599 8.13554 1.66585 8.16538 1.66571 8.19532C1.66556 8.22525 1.63542 8.25509 1.63527 8.28503C1.63498 8.3449 1.60469 8.40468 1.6044 8.46455L1.50125 29.4195C1.49875 29.9284 1.88673 30.3187 2.3966 30.3203L23.3912 30.3858C23.4512 30.386 23.5112 30.3862 23.5713 30.3565C23.6013 30.3566 23.6315 30.3267 23.6615 30.3268C23.6915 30.3269 23.7216 30.2971 23.7516 30.2972C23.7816 30.2972 23.8117 30.2674 23.8419 30.2376C23.8719 30.2377 23.902 30.2078 23.902 30.2078C23.9621 30.1781 23.9923 30.1482 24.0525 30.0885L30.0805 24.1201C30.2613 23.9411 30.3523 23.7318 30.3535 23.4923L30.4568 2.50748C30.4893 1.99867 30.1013 1.60829 29.5914 1.6067L8.5968 1.5412ZM8.58619 3.69656L8.56733 7.52832L23.2036 7.57398L25.9463 4.85836C26.308 4.50026 26.8778 4.50203 27.206 4.86229C27.5641 5.22264 27.5613 5.79142 27.1998 6.11958L24.4571 8.83521L24.3852 23.4438L28.2242 23.4558L23.1005 28.5289L3.36549 28.4673L3.46245 8.76971L8.58619 3.69656ZM8.55849 9.32445L8.48924 23.3942L22.5856 23.4382L22.6549 9.36843L8.55849 9.32445Z"
+        fill={fill}
+      />
     </svg>
   );
 };
 
 Icon.defaultProps = {
-  fill: '#000',
+  fill: '#2a2a2a',
   width: 32,
   height: 32
 };

web/src/components/Icons/LogoWithText.js

@@ -18,7 +18,7 @@
 
 import React from 'react';
 
-const Icon = ({ className }) => {
+const Icon = ({ className, fill }) => {
   return (
     <svg
       width="91"
@@ -29,12 +29,12 @@ const Icon = ({ className }) => {
     >
       <g clipPath="url(#clip0)">
         <path
-          d="M22.584 6.37694C18.8671 5.60958 15.5009 3.7231 12.8548 0.919266L12.4609 0.498123C12.344 0.376921 12.1778 0.307693 12.0055 0.307693H11.9994C11.8271 0.307693 11.6609 0.371147 11.544 0.492348L10.9409 1.1154C8.42398 3.70578 5.26705 5.49423 1.80247 6.29038L1.3963 6.38271C1.13169 6.44039 0.934759 6.6654 0.928599 6.92498C0.70707 15.0192 5.80247 20.8519 8.00552 22.9808C9.39014 24.325 11.1624 25.6865 11.9932 25.6923C11.9994 25.6923 11.9994 25.6923 11.9994 25.6923C12.0055 25.6923 12.0117 25.6923 12.0117 25.6923C12.9471 25.6692 14.7748 24.1866 16.0548 22.9231C18.2455 20.7596 23.3101 14.8692 23.0702 6.92498C23.064 6.65962 22.8609 6.43461 22.584 6.37694ZM12.7994 19.2481C12.6947 19.3115 12.5778 19.3462 12.4609 19.3462C12.3625 19.3462 12.264 19.3231 12.1717 19.2769C11.9686 19.1731 11.8455 18.9769 11.8455 18.7692V7.23077C11.8455 7.03464 11.9502 6.85005 12.1286 6.74618C12.3009 6.63652 12.5225 6.62497 12.7132 6.70005L18.8671 9.2962C19.1132 9.40001 19.2548 9.63657 19.2301 9.88467C19.1994 10.1212 18.5101 15.7404 12.7994 19.2481Z"
-          fill="black"
+          d="M38.2559 5.24H42.6359C44.5425 5.24 45.8892 5.41333 46.6759 5.76C47.4625 6.09333 47.9625 6.7 48.1759 7.58C48.3892 8.46 48.4959 9.97333 48.4959 12.12C48.4959 14.2667 48.3892 15.78 48.1759 16.66C47.9625 17.54 47.4625 18.1533 46.6759 18.5C45.8892 18.8333 44.5425 19 42.6359 19H38.2559V5.24ZM42.3559 17.4C43.9159 17.4 44.9625 17.32 45.4959 17.16C46.0425 16.9867 46.3959 16.5733 46.5559 15.92C46.7159 15.2533 46.7959 13.9867 46.7959 12.12C46.7959 10.2667 46.7092 9.00667 46.5359 8.34C46.3759 7.67333 46.0225 7.26 45.4759 7.1C44.9425 6.92667 43.9025 6.84 42.3559 6.84H39.9759V17.4H42.3559ZM58.6849 13.26C58.6849 12.3133 58.6249 11.64 58.5049 11.24C58.3849 10.8267 58.1583 10.5533 57.8249 10.42C57.4916 10.2867 56.9316 10.22 56.1449 10.22C55.3049 10.22 54.6849 10.3533 54.2849 10.62C53.8983 10.8867 53.6516 11.2533 53.5449 11.72C53.4516 12.1867 53.4049 12.86 53.4049 13.74V19H51.7849V8.8H53.2249L53.3049 10.24H53.4249C53.6516 9.72 54.0249 9.32667 54.5449 9.06C55.0649 8.78 55.8183 8.64 56.8049 8.64C57.7916 8.64 58.5316 8.78 59.0249 9.06C59.5316 9.34 59.8716 9.76 60.0449 10.32C60.2183 10.8667 60.3049 11.6333 60.3049 12.62V19H58.6849V13.26ZM67.7976 19.16C66.3709 19.16 65.3509 19.02 64.7376 18.74C64.1242 18.4467 63.7309 17.96 63.5576 17.28C63.3976 16.5867 63.3176 15.46 63.3176 13.9C63.3176 12.34 63.3976 11.22 63.5576 10.54C63.7309 9.84667 64.1242 9.36 64.7376 9.08C65.3509 8.78667 66.3709 8.64 67.7976 8.64C69.2109 8.64 70.2242 8.78667 70.8376 9.08C71.4509 9.36 71.8376 9.84667 71.9976 10.54C72.1709 11.22 72.2576 12.34 72.2576 13.9C72.2576 15.46 72.1709 16.5867 71.9976 17.28C71.8376 17.96 71.4509 18.4467 70.8376 18.74C70.2242 19.02 69.2109 19.16 67.7976 19.16ZM67.7976 17.68C68.7709 17.68 69.4442 17.5933 69.8176 17.42C70.1909 17.2467 70.4176 16.9333 70.4976 16.48C70.5909 16.0133 70.6376 15.1533 70.6376 13.9C70.6376 12.6467 70.5909 11.7933 70.4976 11.34C70.4176 10.8733 70.1909 10.5533 69.8176 10.38C69.4442 10.2067 68.7709 10.12 67.7976 10.12C66.8242 10.12 66.1442 10.2067 65.7576 10.38C65.3842 10.5533 65.1509 10.8733 65.0576 11.34C64.9776 11.7933 64.9376 12.6467 64.9376 13.9C64.9376 15.1533 64.9776 16.0133 65.0576 16.48C65.1509 16.9333 65.3842 17.2467 65.7576 17.42C66.1442 17.5933 66.8242 17.68 67.7976 17.68ZM76.0429 19V10.28H73.9829V8.8H76.0429V5.84H77.6629V8.8H80.1029V10.28H77.6629V19H76.0429ZM90.4527 14.48H83.4727C83.4727 15.4533 83.5394 16.1467 83.6727 16.56C83.8061 16.9733 84.0927 17.2667 84.5327 17.44C84.9861 17.6 85.7394 17.68 86.7927 17.68C87.8194 17.68 88.9061 17.6067 90.0527 17.46V18.88C89.6261 18.96 89.0727 19.0267 88.3927 19.08C87.7127 19.1333 87.0661 19.16 86.4527 19.16C85.0794 19.16 84.0661 19 83.4127 18.68C82.7727 18.36 82.3527 17.8467 82.1527 17.14C81.9527 16.4333 81.8527 15.36 81.8527 13.92C81.8527 12.5067 81.9394 11.4467 82.1127 10.74C82.2994 10.0333 82.7061 9.50667 83.3327 9.16C83.9727 8.81333 84.9794 8.64 86.3527 8.64C87.6327 8.64 88.5594 8.81333 89.1327 9.16C89.7061 9.49333 90.0661 10.0067 90.2127 10.7C90.3727 11.38 90.4527 12.4467 90.4527 13.9V14.48ZM86.3127 10.12C85.4461 10.12 84.8194 10.2 84.4327 10.36C84.0594 10.5067 83.8061 10.7933 83.6727 11.22C83.5527 11.6333 83.4861 12.3067 83.4727 13.24H88.8927V13.08C88.8927 12.2 88.8127 11.5533 88.6527 11.14C88.5061 10.7267 88.2594 10.4533 87.9127 10.32C87.5661 10.1867 87.0327 10.12 86.3127 10.12Z"
+          fill={fill}
         />
         <path
-          d="M38.2559 5.24H42.6359C44.5425 5.24 45.8892 5.41333 46.6759 5.76C47.4625 6.09333 47.9625 6.7 48.1759 7.58C48.3892 8.46 48.4959 9.97333 48.4959 12.12C48.4959 14.2667 48.3892 15.78 48.1759 16.66C47.9625 17.54 47.4625 18.1533 46.6759 18.5C45.8892 18.8333 44.5425 19 42.6359 19H38.2559V5.24ZM42.3559 17.4C43.9159 17.4 44.9625 17.32 45.4959 17.16C46.0425 16.9867 46.3959 16.5733 46.5559 15.92C46.7159 15.2533 46.7959 13.9867 46.7959 12.12C46.7959 10.2667 46.7092 9.00667 46.5359 8.34C46.3759 7.67333 46.0225 7.26 45.4759 7.1C44.9425 6.92667 43.9025 6.84 42.3559 6.84H39.9759V17.4H42.3559ZM58.6849 13.26C58.6849 12.3133 58.6249 11.64 58.5049 11.24C58.3849 10.8267 58.1583 10.5533 57.8249 10.42C57.4916 10.2867 56.9316 10.22 56.1449 10.22C55.3049 10.22 54.6849 10.3533 54.2849 10.62C53.8983 10.8867 53.6516 11.2533 53.5449 11.72C53.4516 12.1867 53.4049 12.86 53.4049 13.74V19H51.7849V8.8H53.2249L53.3049 10.24H53.4249C53.6516 9.72 54.0249 9.32667 54.5449 9.06C55.0649 8.78 55.8183 8.64 56.8049 8.64C57.7916 8.64 58.5316 8.78 59.0249 9.06C59.5316 9.34 59.8716 9.76 60.0449 10.32C60.2183 10.8667 60.3049 11.6333 60.3049 12.62V19H58.6849V13.26ZM67.7976 19.16C66.3709 19.16 65.3509 19.02 64.7376 18.74C64.1242 18.4467 63.7309 17.96 63.5576 17.28C63.3976 16.5867 63.3176 15.46 63.3176 13.9C63.3176 12.34 63.3976 11.22 63.5576 10.54C63.7309 9.84667 64.1242 9.36 64.7376 9.08C65.3509 8.78667 66.3709 8.64 67.7976 8.64C69.2109 8.64 70.2242 8.78667 70.8376 9.08C71.4509 9.36 71.8376 9.84667 71.9976 10.54C72.1709 11.22 72.2576 12.34 72.2576 13.9C72.2576 15.46 72.1709 16.5867 71.9976 17.28C71.8376 17.96 71.4509 18.4467 70.8376 18.74C70.2242 19.02 69.2109 19.16 67.7976 19.16ZM67.7976 17.68C68.7709 17.68 69.4442 17.5933 69.8176 17.42C70.1909 17.2467 70.4176 16.9333 70.4976 16.48C70.5909 16.0133 70.6376 15.1533 70.6376 13.9C70.6376 12.6467 70.5909 11.7933 70.4976 11.34C70.4176 10.8733 70.1909 10.5533 69.8176 10.38C69.4442 10.2067 68.7709 10.12 67.7976 10.12C66.8242 10.12 66.1442 10.2067 65.7576 10.38C65.3842 10.5533 65.1509 10.8733 65.0576 11.34C64.9776 11.7933 64.9376 12.6467 64.9376 13.9C64.9376 15.1533 64.9776 16.0133 65.0576 16.48C65.1509 16.9333 65.3842 17.2467 65.7576 17.42C66.1442 17.5933 66.8242 17.68 67.7976 17.68ZM76.0429 19V10.28H73.9829V8.8H76.0429V5.84H77.6629V8.8H80.1029V10.28H77.6629V19H76.0429ZM90.4527 14.48H83.4727C83.4727 15.4533 83.5394 16.1467 83.6727 16.56C83.8061 16.9733 84.0927 17.2667 84.5327 17.44C84.9861 17.6 85.7394 17.68 86.7927 17.68C87.8194 17.68 88.9061 17.6067 90.0527 17.46V18.88C89.6261 18.96 89.0727 19.0267 88.3927 19.08C87.7127 19.1333 87.0661 19.16 86.4527 19.16C85.0794 19.16 84.0661 19 83.4127 18.68C82.7727 18.36 82.3527 17.8467 82.1527 17.14C81.9527 16.4333 81.8527 15.36 81.8527 13.92C81.8527 12.5067 81.9394 11.4467 82.1127 10.74C82.2994 10.0333 82.7061 9.50667 83.3327 9.16C83.9727 8.81333 84.9794 8.64 86.3527 8.64C87.6327 8.64 88.5594 8.81333 89.1327 9.16C89.7061 9.49333 90.0661 10.0067 90.2127 10.7C90.3727 11.38 90.4527 12.4467 90.4527 13.9V14.48ZM86.3127 10.12C85.4461 10.12 84.8194 10.2 84.4327 10.36C84.0594 10.5067 83.8061 10.7933 83.6727 11.22C83.5527 11.6333 83.4861 12.3067 83.4727 13.24H88.8927V13.08C88.8927 12.2 88.8127 11.5533 88.6527 11.14C88.5061 10.7267 88.2594 10.4533 87.9127 10.32C87.5661 10.1867 87.0327 10.12 86.3127 10.12Z"
-          fill="#2A2A2A"
+          d="M6.96005 0.715881C6.91011 0.715881 6.86016 0.715881 6.81022 0.740829C6.78524 0.740829 6.76027 0.765778 6.7353 0.765778C6.71032 0.765778 6.68535 0.790725 6.66038 0.790725C6.63541 0.790725 6.61043 0.815673 6.58546 0.840621C6.56049 0.840621 6.53551 0.86557 6.53551 0.86557C6.48557 0.890518 6.46059 0.915466 6.41065 0.965362L1.41596 5.95497C1.39099 5.97991 1.34104 6.02981 1.31607 6.07971C1.31607 6.10465 1.29109 6.10466 1.29109 6.1296C1.26612 6.15455 1.26612 6.1795 1.24115 6.20445C1.24114 6.2294 1.21617 6.25434 1.21617 6.27929C1.21617 6.30424 1.1912 6.32919 1.1912 6.35413C1.19119 6.40403 1.16622 6.45393 1.16622 6.50382L1.16563 23.9674C1.16562 24.3916 1.49025 24.7159 1.91478 24.7159H19.3956C19.4455 24.7159 19.4955 24.7159 19.5454 24.6909C19.5704 24.6909 19.5954 24.666 19.6203 24.666C19.6453 24.666 19.6703 24.641 19.6953 24.641C19.7202 24.641 19.7452 24.6161 19.7702 24.5911C19.7952 24.5911 19.8201 24.5662 19.8201 24.5662C19.8701 24.5412 19.895 24.5163 19.945 24.4664L24.9397 19.4768C25.0895 19.3271 25.1644 19.1525 25.1645 18.9529L25.165 1.46432C25.19 1.04021 24.8654 0.715881 24.4409 0.715881H6.96005ZM6.95999 2.51214L6.95988 5.70549H19.1465L21.4191 3.43522C21.7188 3.13584 22.1932 3.13584 22.4679 3.43522C22.7676 3.73459 22.7676 4.2086 22.4679 4.48303L20.1953 6.7533L20.1949 18.9279H23.3914L19.1459 23.1691H2.71396L2.71451 6.7533L6.95999 2.51214ZM6.95983 7.20237L6.95944 18.9279H18.6966L18.6969 7.20237H6.95983Z"
+          fill={fill}
         />
       </g>
       <defs>
@@ -47,7 +47,7 @@ const Icon = ({ className }) => {
 };
 
 Icon.defaultProps = {
-  fill: '#000',
+  fill: '#2a2a2a',
   width: 32,
   height: 32
 };

web/src/components/Settings/Billing/PlanRow.js

@@ -67,7 +67,10 @@ function PlanRow({ subscription }) {
 
       <div>
         {!subscription.id && (
-          <Link className="button button-first" to="/subscriptions">
+          <Link
+            className="button button-normal button-first"
+            to="/subscriptions"
+          >
             Upgrade
           </Link>
         )}