diff --git a/config.json b/config.json index 6f37214e..4cdf58b1 100644 --- a/config.json +++ b/config.json @@ -8,6 +8,7 @@ "reset", "font-awesome", "config", + "mixins", "base", "typography", "layout", diff --git a/pages/anime/anime.pixy b/pages/anime/anime.pixy index 347a9d25..4ca603fc 100644 --- a/pages/anime/anime.pixy +++ b/pages/anime/anime.pixy @@ -39,7 +39,7 @@ component Anime(anime *arn.Anime) each relation in anime.Relations a.relation.ajax(href="/anime/" + toString(relation.ID), title=relation.Anime().Title.Romaji) img.anime-image.relation-image(src=relation.Anime().Image, alt=relation.Anime().Title.Romaji) - span= arn.Capitalize(relation.Type) + .relation-type= arn.Capitalize(relation.Type) if len(anime.Genres) > 0 h3.anime-section-name Genres diff --git a/pages/anime/anime.scarlet b/pages/anime/anime.scarlet index 3343147f..9da8d796 100644 --- a/pages/anime/anime.scarlet +++ b/pages/anime/anime.scarlet @@ -1,11 +1,9 @@ .anime-header - display flex - flex-flow row + horizontal .anime-image-container + horizontal flex 1 - display flex - flex-flow row justify-content center align-items flex-start @@ -22,9 +20,8 @@ box-shadow 6px 6px 12px rgba(0, 0, 0, 0.2) .anime-info + vertical flex 9999999 - display flex - flex-flow column margin-left content-padding .anime-title @@ -39,17 +36,17 @@ opacity 0.5 .relations - float left - display flex - flex-flow row wrap + horizontal-wrap .relation - display flex - flex-flow column - font-size 0.9rem + vertical align-items center padding 0.5rem +.relation-type + font-size 0.7rem + margin-top 0.1rem + .relation-image width 100px height 141px \ No newline at end of file diff --git a/pages/anime/anime.styl b/pages/anime/anime.styl index b214924b..c51946e2 100644 --- a/pages/anime/anime.styl +++ b/pages/anime/anime.styl @@ -1,14 +1,10 @@ .anime-container - float left - width 100% padding 0 text-align left border-radius 3px box-sizing border-box .anime-links - float left - width 100% display flex flex-flow row wrap diff --git a/pages/profile/profile.scarlet b/pages/profile/profile.scarlet index 4338bfb8..a124e5d3 100644 --- a/pages/profile/profile.scarlet +++ b/pages/profile/profile.scarlet @@ -57,8 +57,7 @@ profile-boot-duration = 2s // ... .intro-container - display flex - flex-flow column + vertical align-items flex-start padding content-padding padding-top 0 diff --git a/styles/content.scarlet b/styles/content.scarlet index ba734dc2..cff70750 100644 --- a/styles/content.scarlet +++ b/styles/content.scarlet @@ -1,5 +1,4 @@ #content - display flex - flex-flow column + vertical padding content-padding line-height 1.7em \ No newline at end of file diff --git a/styles/grid.scarlet b/styles/grid.scarlet index fac4508f..29091522 100644 --- a/styles/grid.scarlet +++ b/styles/grid.scarlet @@ -1,6 +1,5 @@ .grid - display flex - flex-flow row wrap + horizontal-wrap justify-content center .grid-cell @@ -57,10 +56,9 @@ border none .grid-text + vertical width 100% height 100% - display flex - flex-flow column align-items center justify-content center font-size 1rem diff --git a/styles/layout.scarlet b/styles/layout.scarlet index db722d4e..39706978 100644 --- a/styles/layout.scarlet +++ b/styles/layout.scarlet @@ -1,7 +1,6 @@ #container + vertical height 100% - display flex - flex-flow column #header background-color header-color diff --git a/styles/mixins.scarlet b/styles/mixins.scarlet new file mode 100644 index 00000000..ea99260d --- /dev/null +++ b/styles/mixins.scarlet @@ -0,0 +1,15 @@ +mixin horizontal + display flex + flex-direction row + +mixin horizontal-wrap + display flex + flex-flow row wrap + +mixin vertical + display flex + flex-direction column + +mixin vertical-wrap + display flex + flex-flow column wrap \ No newline at end of file diff --git a/styles/navigation.scarlet b/styles/navigation.scarlet index 8a0c9602..5fedd7ba 100644 --- a/styles/navigation.scarlet +++ b/styles/navigation.scarlet @@ -1,6 +1,5 @@ #navigation - display flex - flex-flow row + horizontal padding 0 content-padding height nav-height overflow hidden