Browse Source

Revert height in content, fix spelling and capitalization errors

Edvin 3 years ago
parent
commit
2ffda65511

+ 1 - 0
pioneer/packages/apps/src/Content/index.tsx

@@ -100,6 +100,7 @@ export default React.memo(styled(Content)`
   padding: 0 1.5rem;
   position: relative;
   width: 100%;
+  height: 100%;
 
   @media(max-width: 768px) {
     padding: 0 0.5rem;

+ 8 - 8
pioneer/packages/apps/src/SidebarBanner.tsx

@@ -170,7 +170,7 @@ const StyledLoader = styled(Loader)`
 `;
 
 const FM_DATA_URL = 'https://raw.githubusercontent.com/Joystream/founding-members/main/data/fm-info.json';
-const MILISECONDS_TO_DAYS = 1000 * 60 * 60 * 24;
+const MILLISECONDS_TO_DAYS = 1000 * 60 * 60 * 24;
 
 type FoundingMembersData = {
   scoringPeriodsFull: {
@@ -219,23 +219,23 @@ const SidebarBanner = ({ isSidebarCollapsed } : { isSidebarCollapsed: boolean})
 
   useEffect(() => {
     if (foundingMembersData && !foundingMembersDataError) {
-      const ScoringPeriodStartedDate = new Date(foundingMembersData.scoringPeriodsFull.currentScoringPeriod.started);
-      const ScoringPeriodEndedDate = new Date(foundingMembersData.scoringPeriodsFull.currentScoringPeriod.ends);
+      const scoringPeriodStartedDate = new Date(foundingMembersData.scoringPeriodsFull.currentScoringPeriod.started);
+      const scoringPeriodEndedDate = new Date(foundingMembersData.scoringPeriodsFull.currentScoringPeriod.ends);
       const now = new Date();
 
       // calculate the elapsed time from start of scoring period until now
-      const timeDifferenceBetweenDates = Math.abs(ScoringPeriodEndedDate.getTime() - ScoringPeriodStartedDate.getTime()) / MILISECONDS_TO_DAYS;
-      const timePassedUntilNow = Math.abs(now.getTime() - ScoringPeriodStartedDate.getTime()) / MILISECONDS_TO_DAYS;
+      const timeDifferenceBetweenDates = Math.abs(scoringPeriodEndedDate.getTime() - scoringPeriodStartedDate.getTime()) / MILLISECONDS_TO_DAYS;
+      const timePassedUntilNow = Math.abs(now.getTime() - scoringPeriodStartedDate.getTime()) / MILLISECONDS_TO_DAYS;
       const progressPercentage = (timePassedUntilNow / timeDifferenceBetweenDates) * 100;
 
       // calculate the amount of days remaining until the end of the scoring period
-      const remainingTime = Math.abs(ScoringPeriodEndedDate.getTime() - now.getTime()) / MILISECONDS_TO_DAYS;
+      const remainingTime = Math.abs(scoringPeriodEndedDate.getTime() - now.getTime()) / MILLISECONDS_TO_DAYS;
 
       setRemainingTime(remainingTime);
 
       setDates({
-        started: ScoringPeriodStartedDate,
-        ends: ScoringPeriodEndedDate
+        started: scoringPeriodStartedDate,
+        ends: scoringPeriodEndedDate
       });
 
       setProgress(progressPercentage > 100 ? 100 : progressPercentage);

+ 1 - 1
pioneer/packages/joy-forum/src/style.ts

@@ -6,7 +6,7 @@ export default css`
   }
 
   .ui.breadcrumb {
-    margin-top: 2em;
+    margin-top: 2rem;
   }
 
   .ForumPageTitle {