Merge pull request #586 from Studio-Yandex-Practicum/feature/festival…

…-event-time-zone Merge pull request #584 from Studio-Yandex-Practicum/bugfix-orientation
Studio-Yandex-Practicum · Sep 20, 2024 · 866b8e4 · 866b8e4
2 parents 6020af5 + 38914f3
commit 866b8e4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/src/components/event-card/event-card.module.css b/src/components/event-card/event-card.module.css
@@ -110,3 +110,12 @@
     }
   }
 }
+
+.timeZone {
+  @mixin text;
+  @mixin textMedium;
+
+  margin-left: 5px;
+  line-height: 30px;
+  vertical-align: super;
+}
diff --git a/src/components/event-card/event-card.tsx b/src/components/event-card/event-card.tsx
@@ -67,6 +67,9 @@ export const EventCard = forwardRef<HTMLDivElement, EventCardProps>((props, ref)
           </span>
           <span>
             {time}
+            <span className={cx('timeZone')}>
+              мск
+            </span>
           </span>
         </time>
         <h3 className={cx('title')}>

diff --git a/src/components/festival-event-card/festival-event-card.module.css b/src/components/festival-event-card/festival-event-card.module.css
@@ -157,3 +157,12 @@
     }
   }
 }
+
+.timeZone {
+  @mixin text;
+  @mixin textMedium;
+
+  margin-left: 5px;
+  line-height: 30px;
+  vertical-align: super;
+}
diff --git a/src/components/festival-event-card/festival-event-card.tsx b/src/components/festival-event-card/festival-event-card.tsx
@@ -59,6 +59,9 @@ export const FestivalEventCard: React.VFC<FestivalEventCardProps> = (props) => {
         </dt>
         <dd className={cx('time')}>
           {time}
+          <span className={cx('timeZone')}>
+            мск
+          </span>
         </dd>
         <dt className={cx('hiddenText')}>
           Место
-Original file line number
+Diff line change
@@ Expand Up @@
               </span>
               <span>
                 {time}
+                <span className={cx('timeZone')}>
+                  мск
+                </span>
               </span>
             </time>
             <h3 className={cx('title')}>
@@ Expand Down @@