about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatryk Niedźwiedziński <pniedzwiedzinski19@gmail.com>2019-08-13 11:20:02 +0200
committerPatryk Niedźwiedziński <pniedzwiedzinski19@gmail.com>2019-08-13 11:20:02 +0200
commit91baeba409e8480d1762c3aa8edfb121cff062d5 (patch)
tree739e7efbe30aa6d1da67c8456fe3beefc454ed36
parent71abfc6cdfd94ff403575efcbd80f90dac402a12 (diff)
downloadpuszcza-91baeba409e8480d1762c3aa8edfb121cff062d5.tar.gz
puszcza-91baeba409e8480d1762c3aa8edfb121cff062d5.zip
Move asstes to public
-rw-r--r--public/assets/LogoCalosc.svg (renamed from public/LogoCalosc.svg)0
-rw-r--r--public/assets/krajka-logo.svg (renamed from src/assets/krajka-logo.svg)0
-rw-r--r--public/assets/krajka.svg (renamed from src/assets/krajka.svg)0
-rw-r--r--public/assets/logo.png (renamed from src/assets/logo.png)bin6849 -> 6849 bytes
-rw-r--r--public/assets/wip.png (renamed from src/assets/wip.png)bin4963 -> 4963 bytes
-rw-r--r--public/assets/zhr.svg (renamed from public/zhr.svg)0
-rw-r--r--src/App.vue2
-rw-r--r--src/components/NavBar.vue9
-rw-r--r--src/views/HomeView.vue2
9 files changed, 9 insertions, 4 deletions
diff --git a/public/LogoCalosc.svg b/public/assets/LogoCalosc.svg
index 268f73e..268f73e 100644
--- a/public/LogoCalosc.svg
+++ b/public/assets/LogoCalosc.svg
diff --git a/src/assets/krajka-logo.svg b/public/assets/krajka-logo.svg
index 6014783..6014783 100644
--- a/src/assets/krajka-logo.svg
+++ b/public/assets/krajka-logo.svg
diff --git a/src/assets/krajka.svg b/public/assets/krajka.svg
index b7def23..b7def23 100644
--- a/src/assets/krajka.svg
+++ b/public/assets/krajka.svg
diff --git a/src/assets/logo.png b/public/assets/logo.png
index f3d2503..f3d2503 100644
--- a/src/assets/logo.png
+++ b/public/assets/logo.png
Binary files differdiff --git a/src/assets/wip.png b/public/assets/wip.png
index 945e984..945e984 100644
--- a/src/assets/wip.png
+++ b/public/assets/wip.png
Binary files differdiff --git a/public/zhr.svg b/public/assets/zhr.svg
index 8d58c50..8d58c50 100644
--- a/public/zhr.svg
+++ b/public/assets/zhr.svg
diff --git a/src/App.vue b/src/App.vue
index 083edd3..5526676 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,7 +4,7 @@
       :routes="routes"
       :externalRoutes="externalRoutes"
       title="19 PDH Puszcza"
-      logoPath="../assets/krajka-logo.svg"
+      logo="assets/krajka-logo.svg"
     />
     <router-view></router-view>
   </div>
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 0cae182..6497804 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -1,7 +1,7 @@
 <template>
   <nav class="navbar">
     <div class="title">
-      <img class="logo" :src="logoPath" />
+      <img v-if="logo" class="logo" :src="logo" />
       <router-link class="title-name" to="/">{{ title }}</router-link>
     </div>
     <div class="space"></div>
@@ -31,7 +31,7 @@ export default {
     routes: Array,
     externalRoutes: Array,
     title: String,
-    logoPath: String
+    logo: String
   },
   data: function() {
     return {
@@ -49,6 +49,11 @@ export default {
 
 <style scoped>
 .navbar {
+  font-family: "Roboto Slab", serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  color: #181818;
+
   box-sizing: border-box;
   width: 100vw;
   height: 80px;
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 1a6cc4b..1b73240 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <h1>19 PDH Puszcza</h1>
-    <img alt="Work in progress" src="../assets/wip.png" />
+    <img alt="Work in progress" src="assets/wip.png" />
     <h3>Strona w trakcie budowy</h3>
   </div>
 </template>