From ed9031d68813daf5a6d9b0c14eabc8c4b651c20e Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Sun, 5 Nov 2017 11:02:31 +0100 Subject: [PATCH] Redesign --- pages/anime/anime.pixy | 16 +++++++--------- pages/anime/anime.scarlet | 14 +++++++++++++- pages/anime/episodes.pixy | 4 ++-- pages/search/search.scarlet | 3 ++- pages/soundtracks/soundtracks.scarlet | 4 ++++ 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/pages/anime/anime.pixy b/pages/anime/anime.pixy index eb1b914e..9429f016 100644 --- a/pages/anime/anime.pixy +++ b/pages/anime/anime.pixy @@ -28,10 +28,8 @@ component AnimeMainColumn(anime *arn.Anime, tracks []*arn.SoundTrack, episodes [ //- h3.anime-section-name.anime-summary-header Summary p.anime-summary.mountable= anime.Summary - - //- AnimeActions(anime, user) - - //- AnimeTabs(anime) + + AnimeActions(anime, user) AnimeCharacters(anime) AnimeRelations(anime, user) @@ -54,11 +52,11 @@ component AnimeSideColumn(anime *arn.Anime, friends []*arn.User, listItems map[* component AnimeActions(anime *arn.Anime, user *arn.User) if user != nil - .buttons.anime-actions - //- if user.Role == "editor" || user.Role == "admin" - //- a.button.ajax(href=anime.Link() + "/edit") - //- Icon("pencil-square-o") - //- span Edit anime + .buttons.anime-actions.mountable + if user.Role == "editor" || user.Role == "admin" + a.button.ajax(href=anime.Link() + "/edit") + Icon("pencil-square-o") + span Edit anime if user.AnimeList().Contains(anime.ID) a.button.ajax(href="/+" + user.Nick + "/animelist/anime/" + anime.ID) diff --git a/pages/anime/anime.scarlet b/pages/anime/anime.scarlet index 491ca5ea..be76338c 100644 --- a/pages/anime/anime.scarlet +++ b/pages/anime/anime.scarlet @@ -29,6 +29,8 @@ > 800px .anime-header horizontal + padding-bottom content-padding + border-bottom 1px solid rgba(0, 0, 0, 0.05) .anime-title text-align left @@ -36,6 +38,16 @@ .anime-alternative-title text-align left + .anime-actions + flex 1 + justify-content flex-end + align-items flex-end + + button, + .button + margin-right 0 + margin-bottom 0 + .anime-info-table margin 0 // width 100% @@ -126,7 +138,7 @@ .anime-actions horizontal - justify-content flex-end + justify-content center // Action button margin // margin calc(content-padding - 0.5rem) -0.5rem diff --git a/pages/anime/episodes.pixy b/pages/anime/episodes.pixy index 46223df3..5b149e8b 100644 --- a/pages/anime/episodes.pixy +++ b/pages/anime/episodes.pixy @@ -1,11 +1,11 @@ component AnimeEpisodes(episodes []*arn.AnimeEpisode) if len(episodes) > 0 - .anime-section + .anime-section.mountable h3.anime-section-name Episodes table.episodes tbody each episode in episodes - tr.episode.mountable + tr.episode.mountable(data-mountable-type="episode") td.episode-number if episode.Number != -1 span= episode.Number diff --git a/pages/search/search.scarlet b/pages/search/search.scarlet index 216d8a7c..89befb2f 100644 --- a/pages/search/search.scarlet +++ b/pages/search/search.scarlet @@ -1,4 +1,5 @@ -.anime-search +.anime-search, +.user-search justify-content flex-start .anime-search-result diff --git a/pages/soundtracks/soundtracks.scarlet b/pages/soundtracks/soundtracks.scarlet index e9cab0eb..d61517ee 100644 --- a/pages/soundtracks/soundtracks.scarlet +++ b/pages/soundtracks/soundtracks.scarlet @@ -35,6 +35,10 @@ .sound-track-anime-image max-width 142px +.music-buttons + display flex + justify-content center + > 600px .music-buttons position absolute