Gltch Homepage Navigation Fixed reactplay#741

dev0869 · Dec 30, 2023 · 359dd3b · 359dd3b
1 parent ccf53c7
commit 359dd3b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -37,8 +37,8 @@
  "lodash": "^4.17.21",
  "lodash.memoize": "^4.1.2",
  "mathjs": "^11.11.2",
- "node-sass": "^8.0.0",
  "p5": "^1.7.0",
+ "plays": "^0.7.0",
  "react": "^18.2.0",
  "react-codemirror2": "^7.3.0",
  "react-color": "^2.19.3",
@@ -70,6 +70,7 @@
  "redux-persist": "^6.0.0",
  "remarkable": "^2.0.1",
  "reselect": "^4.1.8",
+ "sass": "^1.69.6",
  "styled-components": "^6.1.0",
  "swiper": "^9.4.1",
  "url": "^0.11.3",

diff --git a/src/App.css b/src/App.css
@@ -106,7 +106,7 @@ textarea {
 
 html,
 body {
- height: 100%;
+ height: auto;
  padding: 0;
  margin: 0;
  font-family: var(--ff-default);

diff --git a/src/common/header/Header.jsx b/src/common/header/Header.jsx
@@ -96,6 +96,9 @@ const Header = () => {
 
  return (
  <>
+ {process.env.REACT_APP_ACTIVITIES_ON === 'true' && showHideBits.showActivityTimer && (
+ <Countdown date={new Date(1675209600000)} renderer={activityTimerRenderer} />
+ )}
  <header
  className={`app-header ${
  showHideBits.setHeaderStyle
@@ -116,11 +119,9 @@ const Header = () => {
  <div className="app-header-search">
  {showHideBits.showSearch && <SearchBox reset={reset} />}
  </div>
+
  <HeaderNav showBrowse={showHideBits.showBrowse} />
  </header>
- {process.env.REACT_APP_ACTIVITIES_ON === 'true' && showHideBits.showActivityTimer && (
- <Countdown date={new Date(1675209600000)} renderer={activityTimerRenderer} />
- )}
  </>
  );
 };

diff --git a/src/common/header/header.css b/src/common/header/header.css
@@ -21,7 +21,7 @@
 }
 
 .app-header-home {
- position: fixed;
+ position: sticky;
 }
 
 .app-header-home.app-header-home--promo {
@@ -503,7 +503,8 @@
  justify-content: center;
  background-color: #fad900;
  min-height: 32px;
- position: fixed;
+ position: sticky;
+ top: 0;
  font-size: var(--fs-sm);
  line-height: var(--fs-sm);
  z-index: 9;

diff --git a/src/common/home/home.css b/src/common/home/home.css
@@ -10,7 +10,6 @@
  background: -webkit-linear-gradient(180deg, rgba(1, 4, 38, 1) 0%, rgba(76, 91, 94, 1) 100%);
  background: linear-gradient(180deg, rgba(1, 4, 38, 1) 0%, rgba(76, 91, 94, 1) 100%);
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#010426", endColorstr="#4c5b5e", GradientType=1);
- padding: 6rem 0 2rem 0;
  width: 100%;
  overflow-x: hidden;
  min-height: 100vh;
@@ -24,7 +23,7 @@
 .app-home-body .body-title {
  margin-top: 3.2rem;
  margin-bottom: 1rem;
- font-family: var(--ff-accent);
+ font-family: var(--ff-accent); 
  font-size: var(--fs-xxl);
  color: var(--color-neutral-10);
  text-align: center;