Merge pull request #117 from digi-trust/master

v1.2.1 - CSS fix for logo-less CMPs
IABTechLab · Jun 13, 2018 · 7deedf9 · 7deedf9
2 parents b4c2b47 + 3458e8e
commit 7deedf9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/components/popup/intro/intro.jsx b/src/components/popup/intro/intro.jsx
@@ -33,7 +33,7 @@ export default class Intro extends Component {
 		} = props;
 
 		return (
-			<div class={style.intro}>
+			<div class={config.logoUrl ? style.flexColumn + " " + style.intro : style.intro}>
 				<div class={style.top}>
 					{config.logoUrl &&
 						<img class={style.logo} src={config.logoUrl} />

diff --git a/src/components/popup/intro/intro.less b/src/components/popup/intro/intro.less
@@ -1,6 +1,9 @@
+.flexColumn {
+	flex-direction: column;
+}
+
 div.intro {
 	display: flex;
-	flex-direction: column;
 	align-items: center;
 	padding: 0 4em;
 	flex: 1;

diff --git a/src/components/popup/intro/introV2.jsx b/src/components/popup/intro/introV2.jsx
@@ -39,7 +39,7 @@ export default class IntroV2 extends Component {
               {config.logoUrl &&
                 <img class={style.logo} src={config.logoUrl} />
               }
-              <div class={style.title}>
+              <div class={config.logoUrl ? style.title + " " + style.imagePadding : style.title}>
                 <LocalLabel providedValue={localization && localization.intro ? localization.intro.title : ''} localizeKey='title'>Thanks for visiting </LocalLabel>
                 <LocalLabel providedValue={localization && localization.intro ? localization.intro.domain : ''} localizeKey='domain'></LocalLabel>
               </div>

diff --git a/src/components/popup/intro/introV2.less b/src/components/popup/intro/introV2.less
@@ -1,5 +1,9 @@
 @import '../../../style/variables';
 
+.imagePadding {
+	padding-left: 10px;
+}
+
 div.intro {
 padding: 0 32px;
 max-height: 100%;
@@ -22,7 +26,6 @@ max-height: 100%;
 				font-weight: bold;
 
 				.title {
-					padding-left: 10px;
 					float: left;
 					line-height: 1.5;
 				}