summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil <phil.buschmann@tum.de>2018-06-27 13:11:36 +0200
committerPhil <phil.buschmann@tum.de>2018-06-27 13:11:36 +0200
commitda35c827784ee689f638eb31525142f4aaa5027a (patch)
treecda8ee7a5606b9546ef7afa8b93f580dd1b228b8
parentde6217c4b4ed2194ea49db1b61f527cd8dc49f63 (diff)
fix local host fontsHEADmaster
-rw-r--r--angular.json4
-rw-r--r--package.json2
-rw-r--r--src/index.html2
-rw-r--r--src/scss/base/_body.scss2
-rw-r--r--src/scss/settings/_colors.scss4
-rw-r--r--yarn.lock8
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 @@
"src/assets"
],
"styles": [
- "src/styles.scss"
+ "src/styles.scss",
+ "./node_modules/font-awesome/css/font-awesome.css",
+ "./node_modules/roboto-fontface/css/roboto/roboto-fontface.css"
],
"scripts": []
},
diff --git a/package.json b/package.json
index 0401090..50bf8fa 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,9 @@
"@angular/platform-browser-dynamic": "^6.0.0",
"@angular/router": "^6.0.0",
"core-js": "^2.5.4",
+ "font-awesome": "^4.7.0",
"iotacss": "^1.6.0",
+ "roboto-fontface": "^0.9.0",
"rxjs": "^6.0.0",
"zone.js": "^0.8.26"
},
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 @@
<meta charset="utf-8">
<title>Gnunet Web UI</title>
<base href="/">
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
- <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
</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 @@
body {
background-color: $color-grey-light;
font-family: 'Roboto', sans-serif;
- font-weight: 200;
+ font-weight: normal;
height: 100%;
}
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;
$color-grey: #A3ADBF;
$color-grey-light: #F5F5F7;
$color-white: #FFFFFF;
-$color-blue: #38B2FF;
+$color-blue: #336699;
$color-amber: #ffb549;
$color-deep-blue: #03A9F4;
$color-cyan: #0288D1;
@@ -26,7 +26,7 @@ $info-color: #0c5460;
$info-bgcolor: #d1ecf1;
$info-border-color: #bee5eb;
-$color-primary: $color-purple;
+$color-primary: $color-blue;
$color-primary-light: lighten($color-primary, 10%);
$color-contrary: $color-white;
$color-secondary: $color-primary-light;
diff --git a/yarn.lock b/yarn.lock
index 3a11f2b..df703f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2327,6 +2327,10 @@ follow-redirects@^1.0.0:
dependencies:
debug "^3.1.0"
+font-awesome@^4.7.0:
+ version "4.7.0"
+ resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+
for-in@^0.1.3:
version "0.1.8"
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:
hash-base "^3.0.0"
inherits "^2.0.1"
+roboto-fontface@^0.9.0:
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/roboto-fontface/-/roboto-fontface-0.9.0.tgz#4829eeffc0502f09b88c7f3980fa3b304eda4c49"
+
run-queue@^1.0.0, run-queue@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"