#11 markup updated

fedgkr · Sep 16, 2018 · b22b8bc · b22b8bc
1 parent 3086004
commit b22b8bc
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 14 deletions.
diff --git a/src/components/ScheduleSection/components/SessionItem/SessionItem.tsx b/src/components/ScheduleSection/components/SessionItem/SessionItem.tsx
@@ -16,16 +16,26 @@ export class SessionItem extends React.Component<SessionItemProps> {
       <div className={css.SessionItem}>
         <div className={css.TimeIndicator}>
           <div className={css.Indicator} />
-          <div className={css.Time}>{time}</div>
+          <div className={css.Time}>
+            <span>{time}</span>
+          </div>
           <div className={css.Line} />
         </div>
         {speaker && (
           <div className={css.Speaker}>
-            <div className={css.Title}>{speaker.presentTitle}</div>
-            <div className={css.Name}>{speaker.name}</div>
+            <div className={css.Title}>
+              <span>{speaker.presentTitle}</span>
+            </div>
+            <div className={css.Name}>
+              <span>{speaker.name}</span>
+            </div>
           </div>
         )}
-        {noSpeaker ? <div className={css.LaunchTitle}>{content}</div> : null}
+        {noSpeaker ? (
+          <div className={css.LaunchTitle}>
+            <span>{content}</span>
+          </div>
+        ) : null}
         <div className="clear" />
       </div>
     );

diff --git a/src/components/ScheduleSection/components/SessionPair/SessionPair.scss b/src/components/ScheduleSection/components/SessionPair/SessionPair.scss
@@ -32,6 +32,7 @@
     .Title {
       font-weight: 600;
       color: #22032b;
+      word-break: keep-all;
     }
     .Name {
       margin-top: 5px;

diff --git a/src/components/ScheduleSection/components/SessionPair/SessionPair.tsx b/src/components/ScheduleSection/components/SessionPair/SessionPair.tsx
@@ -38,20 +38,28 @@ export class SessionPair extends React.Component<SessionPairProps> {
         })}
       >
         <div>
-          {speakerList.map((speaker, idx) => {
-            return (
-              <div key={idx} className={css.SessionItem}>
-                <div className={css.Title}>{speaker.presentTitle}</div>
-                <div className={css.Name}>{speaker.name}</div>
+          {speakerList.map((speaker, idx) => (
+            <div key={idx} className={css.SessionItem}>
+              <div className={css.Title}>
+                <span>{speaker.presentTitle}</span>
               </div>
-            );
-          })}
+              <div className={css.Name}>
+                <span>{speaker.name}</span>
+              </div>
+            </div>
+          ))}
           <div className="clear" />
         </div>
         <div className={css.TimeIndicator}>
           <div className={css.Indicator} />
-          <div className={css.Time}>{time}</div>
-          {noSpeaker ? <div className={css.LaunchTitle}>{content}</div> : null}
+          <div className={css.Time}>
+            <span>{time}</span>
+          </div>
+          {noSpeaker ? (
+            <div className={css.LaunchTitle}>
+              <span>{content}</span>
+            </div>
+          ) : null}
         </div>
         <div className={css.Line} />
       </div>

diff --git a/src/db/Speaker.ts b/src/db/Speaker.ts
@@ -1,5 +1,5 @@
 import { ArrayUtils } from '../utils/ArrayUtils';
-import {Company, companyList, getCompanyByName} from './Company';
+import { Company, companyList, getCompanyByName } from './Company';
 
 export class Speaker {
   public name: string;