aboutsummaryrefslogtreecommitdiffhomepage
path: root/main/app/sprinkles/core/assets
diff options
context:
space:
mode:
authorMarvin Borner2018-04-21 19:20:02 +0200
committerMarvin Borner2018-04-21 19:20:02 +0200
commit73dc17ae28cd16a1f1c5f9933779c559ea6ce329 (patch)
tree7f7babc2a6e751e7323bdeb239ad85b7deb66d89 /main/app/sprinkles/core/assets
parent42906ed1cae023c8a29a4f8deaa637090f856c99 (diff)
Added some translations - including Klingon!
Diffstat (limited to 'main/app/sprinkles/core/assets')
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/css/main.css23
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/languages/ExcelFile.xlsbin52736 -> 0 bytes
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/languages/json/Translations.json50
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/languages/json/de.json14
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/languages/json/en.json14
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/languages/json/fr.json14
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/languages/json/kl.json14
7 files changed, 12 insertions, 117 deletions
diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css
index 3bf1b55..1f3b8c0 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css
+++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css
@@ -1,6 +1,8 @@
/******
GENERAL
******/
+@import url('https://fonts.googleapis.com/css?family=Nanum+Gothic');
+
* {
-webkit-touch-callout: none;
-webkit-user-select: none;
@@ -22,7 +24,7 @@ GENERAL
}
body {
- font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+ font-family: 'Nanum Gothic', sans-serif;
height: 100%;
width: 100%;
overflow: hidden;
@@ -140,6 +142,7 @@ CHAT WINDOW
word-wrap: break-word;
text-align: center;
padding: 10px;
+ font-size: 0.9em;
}
.ServerChatMessage {
@@ -160,6 +163,13 @@ CHAT WINDOW
.MessageSent {
float: right;
background-color: #12213b;
+ color: #345679;
+}
+
+.MessageReceived {
+ float: left;
+ background-color: #13223c;
+ color: #f3f4f5;
}
.AloneMessage {
@@ -186,11 +196,6 @@ CHAT WINDOW
border-radius: 10px 10px 25px 25px;
}
-.MessageReceived {
- float: left;
- background-color: #13223c;
-}
-
.ChatInput {
position: absolute;
box-sizing: border-box;
@@ -204,14 +209,10 @@ CHAT WINDOW
-webkit-border-radius: 25px;
-moz-border-radius: 25px;
border-radius: 25px;
- color: #426A91;
+ color: #f3f4f5;
background-color: #13223C;
}
-#SubscribeTextInput {
- color: #FFF;
-}
-
#ChatTextInput {
display: none;
}
diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/ExcelFile.xls b/main/app/sprinkles/core/assets/SiteAssets/languages/ExcelFile.xls
deleted file mode 100644
index ffc5552..0000000
--- a/main/app/sprinkles/core/assets/SiteAssets/languages/ExcelFile.xls
+++ /dev/null
Binary files differ
diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/Translations.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/Translations.json
deleted file mode 100644
index 3406ffb..0000000
--- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/Translations.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "en": {
- "Translator": "Marvin Borner",
- "you": "you",
- "Feed": "New",
- "Explore": "Explore",
- "Chat": "Chat",
- "Friends": "Friends",
- "Personal": "Personal",
- "joined the group": "joined the group",
- "You joined the group": "You joined the group",
- "has disconnected from the server": "has disconnected from the server"
- },
- "de": {
- "Translator": "Marvin Borner",
- "you": "du",
- "Feed": "Neues",
- "Explore": "Entdecken",
- "Chat": "Nachrichten",
- "Friends": "Freunde",
- "Personal": "Persönliche Daten",
- "joined the group": "ist der Gruppe beigetreten",
- "You joined the group": "Du bist der Gruppe beigetreten",
- "has disconnected from the server": "hat sich vom Server getrennt"
- },
- "fr": {
- "Translator": "Marvin Borner (non-french)",
- "you": "vous",
- "Feed": "D'actualités",
- "Explore": "Dépister",
- "Chat": "Message",
- "Friends": "Camarades",
- "Personal": "Personnelles",
- "joined the group": "s'est joint au groupe",
- "You joined the group": "Vous avez rejoint le groupe",
- "has disconnected from the server": "s'est déconnecté du serveur."
- },
- "kl": {
- "Translator": "Marvin Borner (probably needs corrections)",
- "you": "SoH",
- "Feed": "De'",
- "Explore": "Tu'",
- "Chat": "Qin",
- "Friends": "Jup",
- "Personal": "Ghot",
- "joined the group": "ghom muv",
- "You joined the group": "Ghom muv SoH",
- "has disconnected from the server": "disconnected vo' jabwI'"
- }
-}
diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/de.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/de.json
deleted file mode 100644
index 74d522a..0000000
--- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/de.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "de": {
- "Translator": "Marvin Borner",
- "you": "du",
- "Feed": "Neues",
- "Explore": "Entdecken",
- "Chat": "Nachrichten",
- "Friends": "Freunde",
- "Personal": "Persönliche Daten",
- "joined the group": "ist der Gruppe beigetreten",
- "You joined the group": "Du bist der Gruppe beigetreten",
- "has disconnected from the server": "hat sich vom Server getrennt"
- }
-}
diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/en.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/en.json
deleted file mode 100644
index 981bb83..0000000
--- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/en.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "en": {
- "Translator": "Marvin Borner",
- "you": "you",
- "Feed": "New",
- "Explore": "Explore",
- "Chat": "Chat",
- "Friends": "Friends",
- "Personal": "Personal",
- "joined the group": "joined the group",
- "You joined the group": "You joined the group",
- "has disconnected from the server": "has disconnected from the server"
- }
-}
diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/fr.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/fr.json
deleted file mode 100644
index 5c59619..0000000
--- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/fr.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "fr": {
- "Translator": "Marvin Borner (non-french)",
- "you": "vous",
- "Feed": "D'actualités",
- "Explore": "Dépister",
- "Chat": "Message",
- "Friends": "Camarades",
- "Personal": "Personnelles",
- "joined the group": "s'est joint au groupe",
- "You joined the group": "Vous avez rejoint le groupe",
- "has disconnected from the server": "s'est déconnecté du serveur."
- }
-}
diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/kl.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/kl.json
deleted file mode 100644
index b21768e..0000000
--- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/kl.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "kl": {
- "Translator": "Marvin Borner (probably needs corrections)",
- "you": "SoH",
- "Feed": "De'",
- "Explore": "Tu'",
- "Chat": "Qin",
- "Friends": "Jup",
- "Personal": "Ghot",
- "joined the group": "ghom muv",
- "You joined the group": "Ghom muv SoH",
- "has disconnected from the server": "disconnected vo' jabwI'"
- }
-}