From e6d18f2e1d3e34588a77f7751ba014696d6af410 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Mon, 3 Jul 2017 15:34:50 +0200 Subject: [PATCH] Changed forum-tags to tabs --- config.json | 1 + mixins/ForumTags.pixy | 6 +++--- pages/forum/forum.scarlet | 23 ----------------------- pages/profile/profile.go | 30 +++++++++++++++--------------- styles/forum.scarlet | 4 ---- styles/navigation.scarlet | 2 +- styles/tabs.scarlet | 26 ++++++++++++++++++++++++++ 7 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 styles/tabs.scarlet diff --git a/config.json b/config.json index b4ecbbf9..470a98c4 100644 --- a/config.json +++ b/config.json @@ -17,6 +17,7 @@ "input", "grid", "forum", + "tabs", "user", "video", "loading", diff --git a/mixins/ForumTags.pixy b/mixins/ForumTags.pixy index ff367246..44f40672 100644 --- a/mixins/ForumTags.pixy +++ b/mixins/ForumTags.pixy @@ -1,5 +1,5 @@ component ForumTags - .buttons.forum-tags + .buttons.tabs ForumTag("All", "", "list") ForumTag("General", "general", "list") ForumTag("News", "news", "list") @@ -9,6 +9,6 @@ component ForumTags ForumTag("Bugs", "bug", "list") component ForumTag(title string, category string, icon string) - a.button.forum-tag.action(href=strings.TrimSuffix("/forum/" + category, "/"), data-action="diff", data-trigger="click") + a.button.tab.action(href=strings.TrimSuffix("/forum/" + category, "/"), data-action="diff", data-trigger="click") Icon(arn.GetForumIcon(category)) - span.forum-tag-text= title \ No newline at end of file + span.tab-text= title \ No newline at end of file diff --git a/pages/forum/forum.scarlet b/pages/forum/forum.scarlet index 79f1ee73..68aba8a8 100644 --- a/pages/forum/forum.scarlet +++ b/pages/forum/forum.scarlet @@ -6,29 +6,6 @@ width 100% max-width forum-width -.forum-tag - color text-color !important - - :hover, - &.active - color white !important - background-color forum-tag-hover-color !important - - // color text-color !important - // :hover - // color white !important - // &.active - // color white !important - // background-color link-hover-color - -< 920px - .forum-tag - .icon - margin-right 0 - - .forum-tag-text - display none - > 1250px #new-thread position fixed diff --git a/pages/profile/profile.go b/pages/profile/profile.go index aaa39dfe..16117f39 100644 --- a/pages/profile/profile.go +++ b/pages/profile/profile.go @@ -36,27 +36,27 @@ func Profile(ctx *aero.Context, viewUser *arn.User) string { }, func() { animeList = viewUser.AnimeList() }, func() { - threads = viewUser.Threads() + // threads = viewUser.Threads() - arn.SortThreadsLatestFirst(threads) + // arn.SortThreadsLatestFirst(threads) - if len(threads) > maxPosts { - threads = threads[:maxPosts] - } + // if len(threads) > maxPosts { + // threads = threads[:maxPosts] + // } }, func() { - posts = viewUser.Posts() - arn.SortPostsLatestFirst(posts) + // posts = viewUser.Posts() + // arn.SortPostsLatestFirst(posts) - if len(posts) > maxPosts { - posts = posts[:maxPosts] - } + // if len(posts) > maxPosts { + // posts = posts[:maxPosts] + // } }, func() { - tracks = viewUser.SoundTracks() - arn.SortSoundTracksLatestFirst(tracks) + // tracks = viewUser.SoundTracks() + // arn.SortSoundTracksLatestFirst(tracks) - if len(tracks) > maxTracks { - tracks = tracks[:maxTracks] - } + // if len(tracks) > maxTracks { + // tracks = tracks[:maxTracks] + // } }) return ctx.HTML(components.Profile(viewUser, user, animeList, threads, posts, tracks)) diff --git a/styles/forum.scarlet b/styles/forum.scarlet index 75c239fa..3ba161ef 100644 --- a/styles/forum.scarlet +++ b/styles/forum.scarlet @@ -63,10 +63,6 @@ .thread-link-title color text-color -.forum-tags - // justify-content flex-start !important - margin-bottom 1rem - .post-author horizontal justify-content center diff --git a/styles/navigation.scarlet b/styles/navigation.scarlet index d22110d4..a2204384 100644 --- a/styles/navigation.scarlet +++ b/styles/navigation.scarlet @@ -83,7 +83,7 @@ .extra-navigation display block -< 400px height +< 380px height #navigation vertical height 100% diff --git a/styles/tabs.scarlet b/styles/tabs.scarlet new file mode 100644 index 00000000..ed305f6b --- /dev/null +++ b/styles/tabs.scarlet @@ -0,0 +1,26 @@ +.tab + color text-color !important + + :hover, + &.active + color white !important + background-color forum-tag-hover-color !important + + // color text-color !important + // :hover + // color white !important + // &.active + // color white !important + // background-color link-hover-color + +< 920px + .tab + .icon + margin-right 0 + + .tab-text + display none + +.tabs + // justify-content flex-start !important + margin-bottom 1rem \ No newline at end of file