From 94156420c1c0e268fd4ee9fec4df1ea3496ca9e1 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 4 Oct 2018 00:56:57 +0100 Subject: [PATCH] Sass tidy --- assets/sass/base/base.sass | 8 ++++---- assets/sass/base/images.sass | 6 +++--- assets/sass/base/vue.sass | 22 +++++++++++----------- assets/sass/components/blockquote.sass | 2 +- assets/sass/components/button.sass | 9 ++------- assets/sass/components/link.sass | 2 +- assets/sass/components/listing.sass | 6 +++--- assets/sass/components/markdown.sass | 11 ++--------- assets/sass/components/note.sass | 12 ++++-------- assets/sass/components/talk/video.sass | 6 +----- assets/sass/components/widget.sass | 2 +- 11 files changed, 33 insertions(+), 53 deletions(-) diff --git a/assets/sass/base/base.sass b/assets/sass/base/base.sass index 8696a3f6..f4060d44 100644 --- a/assets/sass/base/base.sass +++ b/assets/sass/base/base.sass @@ -14,12 +14,12 @@ main a text-decoration: none h1, h2, h3 - @apply .mb-2 + @apply mb-2 .content h2, h3 - @apply .mt-6 + @apply mt-6 p, ul, @@ -27,10 +27,10 @@ ol, blockquote, table, pre - @apply .mb-6 + @apply mb-6 .element-invisible - @apply .absolute .overflow-hidden .break-normal + @apply absolute overflow-hidden break-normal clip: rect(1px, 1px, 1px, 1px) height: 1px width: 1px diff --git a/assets/sass/base/images.sass b/assets/sass/base/images.sass index 76e09d4e..f46537f4 100644 --- a/assets/sass/base/images.sass +++ b/assets/sass/base/images.sass @@ -1,12 +1,12 @@ img &.with-border - @apply .border .border-solid .border-grey-light + @apply border border-solid border-grey-light &.with-padding - @apply .p-1 + @apply p-1 &.avatar - @apply .border .p-1 .rounded-full + @apply border p-1 rounded-full svg fill: currentColor diff --git a/assets/sass/base/vue.sass b/assets/sass/base/vue.sass index 54492e7d..8548f077 100644 --- a/assets/sass/base/vue.sass +++ b/assets/sass/base/vue.sass @@ -1,20 +1,20 @@ [v-cloak] - .v-cloak-block - display: block + .v-cloak-block + @apply block - .v-cloak-inline - display: inline + .v-cloak-inline + @apply inline - .v-cloak-inline-block - display: inline-block + .v-cloak-inline-block + @apply inline-block - .v-cloak-hidden - display: none + .v-cloak-hidden + @apply hidden - .v-cloak-invisible - visibility: hidden + .v-cloak-invisible + @apply invisible .v-cloak-block, .v-cloak-inline, .v-cloak-inline-block - display: none + @apply hidden diff --git a/assets/sass/components/blockquote.sass b/assets/sass/components/blockquote.sass index a95d9540..32ea9906 100644 --- a/assets/sass/components/blockquote.sass +++ b/assets/sass/components/blockquote.sass @@ -1,2 +1,2 @@ blockquote - @apply .border-l-4 .border-blue .pl-4 + @apply border-l-4 border-blue pl-4 diff --git a/assets/sass/components/button.sass b/assets/sass/components/button.sass index a2bb4a66..318dac97 100644 --- a/assets/sass/components/button.sass +++ b/assets/sass/components/button.sass @@ -1,11 +1,6 @@ .button - @apply .bg-blue - @apply .inline-block - @apply .rounded - @apply .text-white - @apply .px-4 - @apply .py-2 + @apply bg-blue inline-block rounded text-white px-4 py-2 &:active, &:hover - @apply .bg-blue-dark + @apply bg-blue-dark diff --git a/assets/sass/components/link.sass b/assets/sass/components/link.sass index 5f65bcf3..5090ca45 100644 --- a/assets/sass/components/link.sass +++ b/assets/sass/components/link.sass @@ -1,2 +1,2 @@ .link - @apply .text-blue + @apply text-blue diff --git a/assets/sass/components/listing.sass b/assets/sass/components/listing.sass index efe07f43..e6553913 100644 --- a/assets/sass/components/listing.sass +++ b/assets/sass/components/listing.sass @@ -1,8 +1,8 @@ .listing - @apply .pl-0 + @apply pl-0 .listing-item - @apply .overflow-hidden .pb-8 + @apply overflow-hidden pb-8 &:not(:last-child) - @apply .border-b .border-grey-light .mb-8 + @apply border-b border-grey-light mb-8 diff --git a/assets/sass/components/markdown.sass b/assets/sass/components/markdown.sass index eeff6d23..07ae940b 100644 --- a/assets/sass/components/markdown.sass +++ b/assets/sass/components/markdown.sass @@ -20,12 +20,5 @@ pre code, .hljs - @apply bg-grey-lighter - @apply block - @apply border-grey-dark - @apply border-l-4 - @apply font-mono - @apply leading-loose - @apply overflow-x-scroll - @apply p-4 - @apply rounded text-sm + @apply bg-grey-lighter block border-grey-dark border-l-4 font-mono + @apply leading-loose overflow-x-scroll p-4 rounded text-sm diff --git a/assets/sass/components/note.sass b/assets/sass/components/note.sass index da4de850..d10b0bbb 100644 --- a/assets/sass/components/note.sass +++ b/assets/sass/components/note.sass @@ -1,13 +1,9 @@ .note - @apply .bg-blue-lighter - @apply .border-blue - @apply .border-l-4 - @apply .mb-4 - @apply .p-4 - @apply .rounded + @apply bg-blue-lighter + @apply border-blue border-l-4 mb-4 p-4 rounded & > *:last-child - @apply .mb-0 + @apply mb-0 p a - @apply .text-black + @apply text-black diff --git a/assets/sass/components/talk/video.sass b/assets/sass/components/talk/video.sass index 30855f70..97a47e1d 100644 --- a/assets/sass/components/talk/video.sass +++ b/assets/sass/components/talk/video.sass @@ -1,8 +1,4 @@ .talk-video iframe, embed - @apply .absolute - @apply .h-full - @apply .pin-l - @apply .pin-t - @apply .w-full + @apply absolute h-full pin-l pin-t w-full diff --git a/assets/sass/components/widget.sass b/assets/sass/components/widget.sass index 5948d77c..12f3f3b9 100644 --- a/assets/sass/components/widget.sass +++ b/assets/sass/components/widget.sass @@ -1,2 +1,2 @@ .widget - @apply .mb-6 .block + @apply mb-6 block