Merge pull request #117 from digi-trust/master

v1.2.1 - CSS fix for logo-less CMPs

Author: SupahNickie

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} />

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;

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>

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;
 				}