From 7fa294f11c9ea3912b134a16225b3fc0c2ad29cc Mon Sep 17 00:00:00 2001
From: taehoon
Date: Sat, 30 Nov 2019 12:30:25 -0500
Subject: [PATCH 1/2] add icons to nav panel
---
src/components/nav_panel/nav_panel.vue | 14 +++++-----
src/components/side_drawer/side_drawer.vue | 28 ++++++++++----------
static/fontello.json | 30 ++++++++++++++++++++++
3 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 28589bb1..d660f189 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -4,22 +4,22 @@
-
- {{ $t("nav.timeline") }}
+ {{ $t("nav.timeline") }}
-
- {{ $t("nav.interactions") }}
+ {{ $t("nav.interactions") }}
-
- {{ $t("nav.dms") }}
+ {{ $t("nav.dms") }}
-
- {{ $t("nav.friend_requests") }}
+ {{ $t("nav.friend_requests") }}
-
- {{ $t("nav.public_tl") }}
+ {{ $t("nav.public_tl") }}
-
- {{ $t("nav.twkn") }}
+ {{ $t("nav.twkn") }}
-
- {{ $t("nav.about") }}
+ {{ $t("nav.about") }}
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index eb429f29..1c65c173 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -36,7 +36,7 @@
@click="toggleDrawer"
>
- {{ $t("login.login") }}
+ {{ $t("login.login") }}
- {{ $t("nav.dms") }}
+ {{ $t("nav.dms") }}
- {{ $t("nav.interactions") }}
+ {{ $t("nav.interactions") }}
@@ -62,7 +62,7 @@
@click="toggleDrawer"
>
- {{ $t("nav.timeline") }}
+ {{ $t("nav.timeline") }}
- {{ $t("nav.friend_requests") }}
+ {{ $t("nav.friend_requests") }}
- {{ $t("nav.public_tl") }}
+ {{ $t("nav.public_tl") }}
- {{ $t("nav.twkn") }}
+ {{ $t("nav.twkn") }}
- {{ $t("nav.chat") }}
+ {{ $t("nav.chat") }}
-
- {{ $t("nav.search") }}
+ {{ $t("nav.search") }}
-
- {{ $t("nav.who_to_follow") }}
+ {{ $t("nav.who_to_follow") }}
-
- {{ $t("settings.settings") }}
+ {{ $t("settings.settings") }}
-
- {{ $t("nav.about") }}
+ {{ $t("nav.about") }}
-
- {{ $t("nav.administration") }}
+ {{ $t("nav.administration") }}
-
- {{ $t("login.logout") }}
+ {{ $t("login.logout") }}
diff --git a/static/fontello.json b/static/fontello.json
index c0cf1727..c1ed3393 100755
--- a/static/fontello.json
+++ b/static/fontello.json
@@ -303,6 +303,36 @@
"css": "gauge",
"code": 61668,
"src": "fontawesome"
+ },
+ {
+ "uid": "31972e4e9d080eaa796290349ae6c1fd",
+ "css": "users",
+ "code": 59421,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "e82cedfa1d5f15b00c5a81c9bd731ea2",
+ "css": "info-circled",
+ "code": 59423,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "w3nzesrlbezu6f30q7ytyq919p6gdlb6",
+ "css": "home-2",
+ "code": 59425,
+ "src": "typicons"
+ },
+ {
+ "uid": "dcedf50ab1ede3283d7a6c70e2fe32f3",
+ "css": "chat",
+ "code": 59422,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "3a00327e61b997b58518bd43ed83c3df",
+ "css": "login",
+ "code": 59424,
+ "src": "fontawesome"
}
]
}
\ No newline at end of file
From a412b53801bb9e9398c4c32aad7c430bf922c723 Mon Sep 17 00:00:00 2001
From: taehoon
Date: Mon, 2 Dec 2019 11:45:55 -0500
Subject: [PATCH 2/2] increase icon width a little bit in the nav panel
---
src/components/nav_panel/nav_panel.vue | 4 ++++
src/components/side_drawer/side_drawer.vue | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index d660f189..4b79b500 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -113,4 +113,8 @@
}
}
}
+
+.nav-panel .button-icon:before {
+ width: 1.1em;
+}
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 1c65c173..31724fa2 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -215,6 +215,10 @@
box-shadow: var(--panelShadow);
background-color: $fallback--bg;
background-color: var(--bg, $fallback--bg);
+
+ .button-icon:before {
+ width: 1.1em;
+ }
}
.side-drawer-logo-wrapper {