diff options
-rw-r--r-- | angular.json | 4 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/index.html | 2 | ||||
-rw-r--r-- | src/scss/base/_body.scss | 2 | ||||
-rw-r--r-- | src/scss/settings/_colors.scss | 4 | ||||
-rw-r--r-- | yarn.lock | 8 |
6 files changed, 16 insertions, 6 deletions
diff --git a/angular.json b/angular.json index b396b5d..29b717b 100644 --- a/angular.json +++ b/angular.json | |||
@@ -27,7 +27,9 @@ | |||
27 | "src/assets" | 27 | "src/assets" |
28 | ], | 28 | ], |
29 | "styles": [ | 29 | "styles": [ |
30 | "src/styles.scss" | 30 | "src/styles.scss", |
31 | "./node_modules/font-awesome/css/font-awesome.css", | ||
32 | "./node_modules/roboto-fontface/css/roboto/roboto-fontface.css" | ||
31 | ], | 33 | ], |
32 | "scripts": [] | 34 | "scripts": [] |
33 | }, | 35 | }, |
diff --git a/package.json b/package.json index 0401090..50bf8fa 100644 --- a/package.json +++ b/package.json | |||
@@ -22,7 +22,9 @@ | |||
22 | "@angular/platform-browser-dynamic": "^6.0.0", | 22 | "@angular/platform-browser-dynamic": "^6.0.0", |
23 | "@angular/router": "^6.0.0", | 23 | "@angular/router": "^6.0.0", |
24 | "core-js": "^2.5.4", | 24 | "core-js": "^2.5.4", |
25 | "font-awesome": "^4.7.0", | ||
25 | "iotacss": "^1.6.0", | 26 | "iotacss": "^1.6.0", |
27 | "roboto-fontface": "^0.9.0", | ||
26 | "rxjs": "^6.0.0", | 28 | "rxjs": "^6.0.0", |
27 | "zone.js": "^0.8.26" | 29 | "zone.js": "^0.8.26" |
28 | }, | 30 | }, |
diff --git a/src/index.html b/src/index.html index 434133e..99158cd 100644 --- a/src/index.html +++ b/src/index.html | |||
@@ -4,8 +4,6 @@ | |||
4 | <meta charset="utf-8"> | 4 | <meta charset="utf-8"> |
5 | <title>Gnunet Web UI</title> | 5 | <title>Gnunet Web UI</title> |
6 | <base href="/"> | 6 | <base href="/"> |
7 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> | ||
8 | <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"> | ||
9 | <meta name="viewport" content="width=device-width, initial-scale=1"> | 7 | <meta name="viewport" content="width=device-width, initial-scale=1"> |
10 | <link rel="icon" type="image/x-icon" href="favicon.ico"> | 8 | <link rel="icon" type="image/x-icon" href="favicon.ico"> |
11 | </head> | 9 | </head> |
diff --git a/src/scss/base/_body.scss b/src/scss/base/_body.scss index 74c1df2..a6fd80d 100644 --- a/src/scss/base/_body.scss +++ b/src/scss/base/_body.scss | |||
@@ -1,6 +1,6 @@ | |||
1 | body { | 1 | body { |
2 | background-color: $color-grey-light; | 2 | background-color: $color-grey-light; |
3 | font-family: 'Roboto', sans-serif; | 3 | font-family: 'Roboto', sans-serif; |
4 | font-weight: 200; | 4 | font-weight: normal; |
5 | height: 100%; | 5 | height: 100%; |
6 | } | 6 | } |
diff --git a/src/scss/settings/_colors.scss b/src/scss/settings/_colors.scss index f6f94a4..b154393 100644 --- a/src/scss/settings/_colors.scss +++ b/src/scss/settings/_colors.scss | |||
@@ -4,7 +4,7 @@ $color-red: #FC4A33; | |||
4 | $color-grey: #A3ADBF; | 4 | $color-grey: #A3ADBF; |
5 | $color-grey-light: #F5F5F7; | 5 | $color-grey-light: #F5F5F7; |
6 | $color-white: #FFFFFF; | 6 | $color-white: #FFFFFF; |
7 | $color-blue: #38B2FF; | 7 | $color-blue: #336699; |
8 | $color-amber: #ffb549; | 8 | $color-amber: #ffb549; |
9 | $color-deep-blue: #03A9F4; | 9 | $color-deep-blue: #03A9F4; |
10 | $color-cyan: #0288D1; | 10 | $color-cyan: #0288D1; |
@@ -26,7 +26,7 @@ $info-color: #0c5460; | |||
26 | $info-bgcolor: #d1ecf1; | 26 | $info-bgcolor: #d1ecf1; |
27 | $info-border-color: #bee5eb; | 27 | $info-border-color: #bee5eb; |
28 | 28 | ||
29 | $color-primary: $color-purple; | 29 | $color-primary: $color-blue; |
30 | $color-primary-light: lighten($color-primary, 10%); | 30 | $color-primary-light: lighten($color-primary, 10%); |
31 | $color-contrary: $color-white; | 31 | $color-contrary: $color-white; |
32 | $color-secondary: $color-primary-light; | 32 | $color-secondary: $color-primary-light; |
@@ -2327,6 +2327,10 @@ follow-redirects@^1.0.0: | |||
2327 | dependencies: | 2327 | dependencies: |
2328 | debug "^3.1.0" | 2328 | debug "^3.1.0" |
2329 | 2329 | ||
2330 | font-awesome@^4.7.0: | ||
2331 | version "4.7.0" | ||
2332 | resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" | ||
2333 | |||
2330 | for-in@^0.1.3: | 2334 | for-in@^0.1.3: |
2331 | version "0.1.8" | 2335 | version "0.1.8" |
2332 | resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" | 2336 | resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" |
@@ -5072,6 +5076,10 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: | |||
5072 | hash-base "^3.0.0" | 5076 | hash-base "^3.0.0" |
5073 | inherits "^2.0.1" | 5077 | inherits "^2.0.1" |
5074 | 5078 | ||
5079 | roboto-fontface@^0.9.0: | ||
5080 | version "0.9.0" | ||
5081 | resolved "https://registry.yarnpkg.com/roboto-fontface/-/roboto-fontface-0.9.0.tgz#4829eeffc0502f09b88c7f3980fa3b304eda4c49" | ||
5082 | |||
5075 | run-queue@^1.0.0, run-queue@^1.0.3: | 5083 | run-queue@^1.0.0, run-queue@^1.0.3: |
5076 | version "1.0.3" | 5084 | version "1.0.3" |
5077 | resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" | 5085 | resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" |