From 9e32aadefdc09a7c3351d8efe5105d2631fe62e7 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Thu, 30 Nov 2017 17:57:31 +0100 Subject: [PATCH] Removed genres from sidebar (on explore page now) --- layout/sidebar/sidebar.pixy | 6 +----- pages/anime/genres.scarlet | 4 ++-- pages/explore/explore.pixy | 14 ++++++++++---- pages/explore/explore.scarlet | 5 ++++- scripts/Actions/Theme.ts | 2 ++ styles/corner-buttons.scarlet | 7 ++++++- styles/include/config.scarlet | 2 ++ 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/layout/sidebar/sidebar.pixy b/layout/sidebar/sidebar.pixy index eb892f4a..1c1a14cd 100644 --- a/layout/sidebar/sidebar.pixy +++ b/layout/sidebar/sidebar.pixy @@ -16,12 +16,7 @@ component Sidebar(user *arn.User) SidebarButton("Forum", "/forum", "comment") SidebarButton("Explore", "/explore", "th") SidebarButton("Calendar", "/calendar", "calendar") - SidebarButton("Genres", "/genres", "clone") SidebarButton("Soundtracks", "/soundtracks", "headphones") - - if user != nil && user.Role == "admin" - - SidebarButton("Users", "/users", "globe") if user != nil @@ -36,6 +31,7 @@ component Sidebar(user *arn.User) //- SidebarButton("Groups", "/groups", "users") //- SidebarButton("Statistics", "/statistics", "pie-chart") //- SidebarButton("Companies", "/companies", "building") + //- SidebarButton("Genres", "/genres", "clone") .spacer diff --git a/pages/anime/genres.scarlet b/pages/anime/genres.scarlet index 9109f111..64a790c2 100644 --- a/pages/anime/genres.scarlet +++ b/pages/anime/genres.scarlet @@ -7,7 +7,7 @@ padding 0.25rem 0.75rem font-size 85% color text-color - background hsla(0, 0%, 100%, 0.1) + background reverse-light-color border-radius ui-element-border-radius margin 0.35rem @@ -18,7 +18,7 @@ color text-color opacity 1.0 text-shadow none - background hsla(0, 0%, 100%, 0.2) + background reverse-light-hover-color > 800px .anime-genres diff --git a/pages/explore/explore.pixy b/pages/explore/explore.pixy index bc45aff7..1decab78 100644 --- a/pages/explore/explore.pixy +++ b/pages/explore/explore.pixy @@ -1,12 +1,18 @@ component ExploreAnime(animeList []*arn.Anime, year string, status string, typ string, user *arn.User) ExploreFilters(year, status, typ) + .corner-buttons-hide-on-mobile + a.button.ajax(href="/genres") + Icon("clone") + span View genres + h1.page-title Explore - if len(animeList) == 0 - p.no-data.mountable No anime found using the above filters. - else - AnimeGrid(animeList, user) + .explore-anime + if len(animeList) == 0 + p.no-data.mountable No anime found using the above filters. + else + AnimeGrid(animeList, user) component ExploreFilters(year string, status string, typ string) .explore-filters diff --git a/pages/explore/explore.scarlet b/pages/explore/explore.scarlet index 62b4b477..55ae4542 100644 --- a/pages/explore/explore.scarlet +++ b/pages/explore/explore.scarlet @@ -1,11 +1,14 @@ .explore-filters horizontal justify-content center - margin-bottom content-padding + margin-bottom calc(content-padding / 2) select margin 0.05rem +.explore-anime + margin-top calc(content-padding / 2) + #filter-year max-width 80px diff --git a/scripts/Actions/Theme.ts b/scripts/Actions/Theme.ts index 38b2267f..fc082f5d 100644 --- a/scripts/Actions/Theme.ts +++ b/scripts/Actions/Theme.ts @@ -11,6 +11,8 @@ let dark = { "link-color": "hsl(var(--hue), var(--saturation), 66%)", "link-hover-color": "hsl(var(--hue), var(--saturation), 76%)", "link-hover-text-shadow": "0 0 8px hsla(var(--hue), var(--saturation), 66%, 0.5)", + "reverse-light-color": "rgba(255, 255, 255, 0.1)", + "reverse-light-hover-color": "rgba(255, 255, 255, 0.2)", "ui-background": "hsl(0, 0%, 18%)", "sidebar-background": "hsla(0, 0%, 0%, 0.2)", "sidebar-opaque-background": "hsl(0, 0%, 18%)", diff --git a/styles/corner-buttons.scarlet b/styles/corner-buttons.scarlet index 61852f57..ecfa679f 100644 --- a/styles/corner-buttons.scarlet +++ b/styles/corner-buttons.scarlet @@ -2,8 +2,13 @@ display flex justify-content center +.corner-buttons-hide-on-mobile + display none + > 600px - .corner-buttons + .corner-buttons, + .corner-buttons-hide-on-mobile + display flex position absolute top content-padding right content-padding \ No newline at end of file diff --git a/styles/include/config.scarlet b/styles/include/config.scarlet index 5fafd9e5..21941f6d 100644 --- a/styles/include/config.scarlet +++ b/styles/include/config.scarlet @@ -7,6 +7,8 @@ link-hover-color = rgb(242, 60, 30) link-active-color = link-hover-color pro-color = hsla(0, 100%, 73%, 0.87) anime-alternative-title-color = hsla(0, 0%, 0%, 0.5) +reverse-light-color = rgba(0, 0, 0, 0.05) +reverse-light-hover-color = rgba(0, 0, 0, 0.1) theme-white = bg-color theme-black = text-color