Merge pull request #101 from larryyueli/develop

Develop into Master
larryyueli · Jul 9, 2018 · 5b0d03a · 5b0d03a
2 parents 7ba0f7c + 6940eb4
commit 5b0d03a
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 5 deletions.
diff --git a/Docs/Screenshots/analytics.png b/Docs/Screenshots/analytics.png
diff --git a/Docs/Screenshots/backlog.png b/Docs/Screenshots/backlog.png
diff --git a/Docs/Screenshots/board.png b/Docs/Screenshots/board.png
diff --git a/Docs/Screenshots/management.png b/Docs/Screenshots/management.png
diff --git a/Docs/Screenshots/milestone.png b/Docs/Screenshots/milestone.png
diff --git a/Docs/Screenshots/overview.png b/Docs/Screenshots/overview.png
diff --git a/Docs/Screenshots/projects.png b/Docs/Screenshots/projects.png
diff --git a/Docs/Screenshots/story.png b/Docs/Screenshots/story.png
diff --git a/Locales/es.json b/Locales/es.json
@@ -4,7 +4,7 @@
         "title": "Realimentación"
     },
     "app": {
-        "name": "Velocidad"
+        "name": "Velocity"
     },
     "actions": {
         "comment": "Comentario",

diff --git a/Locales/fr.json b/Locales/fr.json
@@ -4,7 +4,7 @@
 		"title": "Retour d'information"
 	},
 	"app": {
-		"name": "Rapidité"
+		"name": "Velocity"
 	},
 	"actions": {
 		"comment": "Commentaire",

diff --git a/Locales/ru.json b/Locales/ru.json
@@ -4,7 +4,7 @@
         "title": "Обратная связь"
     },
     "app": {
-        "name": "Скорость"
+        "name": "Velocity"
     },
     "actions": {
         "comment": "Комментарий",

diff --git a/README.md b/README.md
@@ -3,12 +3,23 @@
 ## Contents
 
 0. [Introduction](#introduction)
-1. [Setup](#quick-setup)
+2. [Screenshots](#screenshots)
+1. [Setup](#setup)
 
 ## Introduction
 
 Velocity is a CS organizational website, offering multiple kinds of developmental environments that can be used by both classes and groups.
 
+## Screenshots
+![Projects Image](/Docs/Screenshots/projects.png?raw=true "Projects Image")
+![Overview Image](/Docs/Screenshots/overview.png?raw=true "Overview Image")
+![Board Image](/Docs/Screenshots/board.png?raw=true "Board Image")
+![Backlog Image](/Docs/Screenshots/backlog.png?raw=true "Backlog Image")
+![Analytics Image](/Docs/Screenshots/analytics.png?raw=true "Analytics Image")
+![Management Image](/Docs/Screenshots/management.png?raw=true "Management Image")
+![Milestone Image](/Docs/Screenshots/milestone.png?raw=true "Milestone Image")
+![Story Image](/Docs/Screenshots/story.png?raw=true "Story Image")
+
 ## Setup
 
 These instructions will guide you through setting up an instance of Velocity.

diff --git a/Templates/#.pug b/Templates/#.pug
@@ -10,7 +10,7 @@ block content
     .layer
     .container
         .row
-            img#logo(src='img/logo.png')
+            img#logo(src='/img/logo.png')
         .row
             .col.s12.m6.offset-m3
                 .card.loginCard