From a0366085fc4910eb304af6155dfefc2bf4200fc3 Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 3 Sep 2018 21:25:32 -0700 Subject: [PATCH] Finish content loader images --- src/definitions/elements/loader.less | 23 +++++++++++++++----- src/definitions/modules/search.less | 2 ++ src/themes/default/elements/loader.variables | 6 ++++- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/definitions/elements/loader.less b/src/definitions/elements/loader.less index 998f9a1f2..0462bf926 100755 --- a/src/definitions/elements/loader.less +++ b/src/definitions/elements/loader.less @@ -187,8 +187,10 @@ } .ui.content.loader, +.ui.content.loader > :before, +.ui.content.loader .image.header:after, .ui.content.loader .line, -.ui.content.loader .image.header:after { +.ui.content.loader .line:after { background-color: @white; } @@ -218,6 +220,11 @@ animation-delay: 0.4s; } +/* Image */ +.ui.content.loader .image:not(.header) { + height: @contentImageHeight; +} + /* Lines */ .ui.content.loader .line { position: relative; @@ -308,9 +315,12 @@ } /* Paragraph */ -.ui.content.loader .paragraph + .paragraph .line:first-child, -.ui.content.loader .header + .paragraph .line:first-child { - height: @contentParagraphMarginTop; +.ui.content.loader .image:not(:first-child):before, +.ui.content.loader .paragraph:not(:first-child):before, +.ui.content.loader .header:not(:first-child):before { + height: @contentSpacing; + content: ''; + display: block; } /* Inverted Content Loader */ @@ -318,12 +328,15 @@ background-image: @contentInvertedLoadingGradient; } .ui.inverted.content.loader, +.ui.inverted.content.loader > :before, +.ui.inverted.content.loader .image.header:after, .ui.inverted.content.loader .line, -.ui.inverted.content.loader .image.header:after { +.ui.inverted.content.loader .line:after { background-color: @black; } + /*------------------- Text --------------------*/ diff --git a/src/definitions/modules/search.less b/src/definitions/modules/search.less index 06e7eced1..fc34dcfaa 100755 --- a/src/definitions/modules/search.less +++ b/src/definitions/modules/search.less @@ -72,6 +72,8 @@ left: 0%; transform-origin: center top; white-space: normal; + text-align: left; + text-transform: none; background: @resultsBackground; diff --git a/src/themes/default/elements/loader.variables b/src/themes/default/elements/loader.variables index 3edc549b1..0d240ffb6 100644 --- a/src/themes/default/elements/loader.variables +++ b/src/themes/default/elements/loader.variables @@ -30,12 +30,17 @@ @loaderTextColor: @textColor; @invertedLoaderTextColor: @invertedTextColor; +@contentSpacing: 20px; + /* Content Loader Lines */ @contentLineMargin: 12px; @contentHeaderLineHeight: 9px; @contentLineHeight: 7px; @contentParagraphLineHeight: @contentLineHeight; +/* Image */ +@contentImageHeight: 100px; + /* Header Image */ @contentImageWidth: 50px; @contentImageTextIndent: 10px; @@ -43,7 +48,6 @@ /* Paragraph */ @contentHeaderLineOneOutdent: 0px; @contentHeaderLineTwoOutdent: 120px; -@contentParagraphMarginTop: 20px; @contentLineOneOutdent: 4rem; @contentLineTwoOutdent: 7rem;