more css fixes

HelloBetterLTD · Dec 12, 2017 · 209409d · 209409d
1 parent ba7da42
commit 209409d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/components/SEOEditorHolder/SEOEditorHolder.js b/client/src/components/SEOEditorHolder/SEOEditorHolder.js
@@ -38,7 +38,8 @@ class SEOEditorHolder extends React.Component {
             FacebookImageURL: props.seodata.FacebookImageURL,
             FacebookImageID: props.seodata.FacebookImageID,
             TwitterImageURL: props.seodata.TwitterImageURL,
-            TwitterImageID: props.seodata.TwitterImageID
+            TwitterImageID: props.seodata.TwitterImageID,
+            HostName: props.seodata.HostName
         };
     }
 
@@ -166,16 +167,15 @@ class SEOEditorHolder extends React.Component {
                     </div>
                     <h3>{this.state.FacebookTitle}</h3>
                     <p className="preview-description">{this.state.FacebookDescription}</p>
-                    <p className="preview-link">{this.state.Link}</p>
+                    <p className="preview-link">{this.state.HostName}</p>
                   </div>
                 </div>
               </div>
             </div>
 
             <div className={`seo-tab ${this.state.CurrentTab === 'twitter' ? 'active' : ''}`} data-tab="twitter">
-
+              <h3 className="seo-tab__title">Twitter</h3>
               <div className="seo-section">
-                <h3 className="seo-tab__title">Twitter</h3>
                 <div className="fields">
                   <SEOInput
                     label="Twitter Title"
@@ -208,7 +208,7 @@ class SEOEditorHolder extends React.Component {
                       </div>
                       <h3>{this.state.TwitterTitle}</h3>
                       <p className="preview-description">{this.state.TwitterDescription}</p>
-                      <p className="preview-link">{this.state.Link}</p>
+                      <p className="preview-link">{this.state.HostName}</p>
                     </div>
                   </div>
                 </div>

diff --git a/client/src/styles/_editor.scss b/client/src/styles/_editor.scss
@@ -135,35 +135,42 @@
 		}
 
 		.preview-card.twitter {
-			max-width: 506px;
-			width: 100%;
+			width: 456px;
 			border-radius: .42857em;
 			border-width: 1px;
 			border-style: solid;
 			border-color: #E1E8ED;
 			box-sizing: border-box;
 			color: inherit!important;
 			overflow: hidden;
+			padding: 0;
+
+			.preview-card--image {
+				padding-top: (230/458)*100%;
+				margin-bottom: 10px;
+			}
 
 			.preview-contents {
-				padding: 10px;
 				font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
 				line-height: 1.3em;
+				padding: 0;
 			}
 
 			h3 {
 				font-size: 14px;
 				color: black;
 				font-weight: bold;
+				padding: 0 14px;
 			}
 
 			.preview-description {
 				margin: 0;
+				padding: 0 14px;
 			}
 
 			.preview-link {
 				margin: 0;
-				padding: 0;
+				padding: 0 14px;
 				color: #8899A6;
 				border: 0;
 			}

diff --git a/src/Extensions/SEODataExtension.php b/src/Extensions/SEODataExtension.php
@@ -13,6 +13,7 @@
 use SilverStripe\Assets\Image;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Control\ContentNegotiator;
+use SilverStripe\Control\Director;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\i18n\i18n;
@@ -51,6 +52,7 @@ public function updateCMSFields(FieldList $fields)
 	public function SEOData()
 	{
 		return [
+			'HostName'				=> Director::host(),
 			'MetaTitle'				=> $this->owner->MetaTitle,
 			'MetaDescription'		=> $this->owner->MetaDescription,
 			'FacebookTitle'			=> $this->owner->FacebookTitle,