Skip to content

Commit 1da0178

Browse files
authored
Merge pull request #27 from templerobotics/fixing-image
Fixing removing image
2 parents e1a23fc + 77f8f41 commit 1da0178

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

src/pages/home/Home.tsx

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Button from '../general/button/Button'
1212
// Images
1313
import nasaLogo from '../../assets/pics/logos/nasa.png'
1414
import HOME_CAROUSEL_INFO from '../../data/HomeCarouselInfo'
15-
import TOwl from '../../assets/pics/logos/TransRoboOwl.svg'
15+
// import TOwl from '../../assets/pics/logos/TransRoboOwl.svg'
1616
const Home = (): React.ReactElement => {
1717
return (
1818
<Styles.HomeContainer>
@@ -35,19 +35,8 @@ const Home = (): React.ReactElement => {
3535
</Styles.VideoSource>
3636

3737
<Styles.SectionHeader>
38-
<h2>
39-
<img src={TOwl}
40-
alt='Owl'
41-
style={{
42-
width: '150px', // Set the width of the image
43-
height: '150px', // Set the height of the image
44-
margin: '0 0 0 -100px',// Set the margin around the image
45-
float: 'left'
46-
// us a .docx
47-
48-
}}
49-
/>
50-
We hope to see you at Temple Fest 2023!</h2>
38+
{/* <img src={TOwl} alt='Owl'/> */}
39+
<h2>We hope to see you at Temple Fest 2023!</h2>
5140
<div className='button-container'>
5241
<Button text={'Sign up here!'} size={'large'} source={'https://forms.gle/rp6BY6h4doLkZQ2E8'}/>
5342
<Button text='Join Teams Here!' source={`https://teams.microsoft.com/l/team/19%3aeaf903f

src/pages/home/HomeStyles.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default class HomeStyles {
1010
grid-template-rows:
1111
max(calc(var(--vh) * .40), 250px) /* Intro heading */
1212
calc(var(--vh) * .1) /* Intro heading button */
13-
calc(var(--vh) * .15) /* Program section heading */
13+
calc(var(--vh) * .3) /* Program section heading */
1414
calc(var(--vh) * .4) /* Carousel */
1515
max(calc(var(--vh) * .3), 100px) /* Sponsors section heading */
1616
max(calc(var(--vh) * .15), 70px); /* Contacts */
@@ -55,7 +55,6 @@ export default class HomeStyles {
5555
`
5656

5757
static readonly SectionHeader = styled.div`
58-
height: 100%;
5958
display: flex;
6059
flex-direction: column;
6160
align-items: center;
@@ -76,6 +75,13 @@ export default class HomeStyles {
7675
column-gap: 10%;
7776
justify-content: center;
7877
}
78+
79+
& > img {
80+
width: 50%; // Set the width of the image
81+
height: 50%; // Set the height of the image
82+
float: left;
83+
/* margin: 0 0 0 -500px; */
84+
}
7985
`
8086

8187
static readonly VideoSource = styled.div`

src/tools/services/SetDimensions.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import useWindowDimensions, { setVariableCssVars } from '../HelpfulFunctions'
99
const SetDimensions = (): React.ReactElement => {
1010
// This is a new component because when in <App>, it was reloading if scrolled in too soon and looking bad.
1111
document.documentElement.style.setProperty('--vh', `${useWindowDimensions().width}px`)
12+
console.log('Width: '+useWindowDimensions().width)
1213
isMobile ? null : setVariableCssVars()
1314
// console.log('Mobile user: ' + isMobile)
1415
return (<></>)

0 commit comments

Comments
 (0)