diff --git a/pages/character/character.scarlet b/pages/character/character.scarlet index e4fb7e53..c082fd18 100644 --- a/pages/character/character.scarlet +++ b/pages/character/character.scarlet @@ -60,9 +60,7 @@ margin-top typography-margin .character-sidebar - margin-left content-padding - margin-top 0 - min-width 270px + sidebar > 1400px .character-sidebar diff --git a/pages/company/company.pixy b/pages/company/company.pixy index 51d546c7..3a3e5c93 100644 --- a/pages/company/company.pixy +++ b/pages/company/company.pixy @@ -1,23 +1,32 @@ component CompanyPage(company *arn.Company, user *arn.User) CompanyTabs(company, user) + + .company-page + .company-header + h1.company-name= company.Name.English - h1= company.Name.English + .company-description + div!= markdown.Render(company.Description) - .company-description - div!= markdown.Render(company.Description) - ul - each link in company.Links - li - a(href=link.URL, target="_blank", rel="noopener")= link.Title + h3 Anime + + .company-anime + each anime in company.Anime() + a.company-anime-item.ajax(href=anime.Link(), title=anime.Title.ByUser(user)) + img.company-anime-item-image.lazy(data-src=anime.Image("small"), data-webp="true", alt=anime.Title.ByUser(user)) - if company.Location.Latitude != 0 && company.Location.Longitude != 0 - iframe.company-location.lazy(data-src="https://www.google.com/maps/embed/v1/place?q=" + toString(company.Location.Latitude) + "," + toString(company.Location.Longitude) + "&key=AIzaSyAsx6fhqRGaMLTixIJMIZBU4Mg6HJmvQf0") - - .company-anime - each anime in company.Anime() - a.company-anime-item.ajax(href=anime.Link(), title=anime.Title.ByUser(user)) - img.company-anime-item-image.lazy(data-src=anime.Image("small"), data-webp="true", alt=anime.Title.ByUser(user)) + .company-sidebar + if company.Location.Latitude != 0 && company.Location.Longitude != 0 + h3 Location + iframe.company-location.lazy(data-src="https://www.google.com/maps/embed/v1/place?q=" + toString(company.Location.Latitude) + "," + toString(company.Location.Longitude) + "&key=AIzaSyAsx6fhqRGaMLTixIJMIZBU4Mg6HJmvQf0") + if len(company.Links) > 0 + h3 Links + ul + each link in company.Links + li + a(href=link.URL, target="_blank", rel="noopener")= link.Title + component CompanyTabs(company *arn.Company, user *arn.User) .tabs Tab("Company", "building", company.Link()) diff --git a/pages/company/company.scarlet b/pages/company/company.scarlet index 1dca8d6a..7bb1bdc0 100644 --- a/pages/company/company.scarlet +++ b/pages/company/company.scarlet @@ -1,6 +1,23 @@ +.company-page + vertical + +.company-header + vertical + +> 1250px + .company-page + horizontal + + .company-sidebar + sidebar + +> 1400px + .company-sidebar + min-width 300px + +.company-name, .company-description - max-width 700px - margin 0 auto + text-align left .company-location width 100% diff --git a/styles/include/mixins.scarlet b/styles/include/mixins.scarlet index 35ebc235..79917900 100644 --- a/styles/include/mixins.scarlet +++ b/styles/include/mixins.scarlet @@ -64,6 +64,11 @@ mixin anime-mini-item-image :hover filter saturate(1.3) +mixin sidebar + margin-left content-padding + margin-top 0 + min-width 270px + mixin bg-dark-up background-color transparent :hover