Skip to content

Commit

Permalink
Merge pull request #316 from ORNL-AMO/issue-279-c
Browse files Browse the repository at this point in the history
Set bg images to bottom, up arrow sizing
  • Loading branch information
nbintertech authored Mar 29, 2024
2 parents 67b9fae + eb11d95 commit 055a17c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
7 changes: 5 additions & 2 deletions src/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,10 @@ $landfill-gasses: #f06807;
&::before {
position: fixed;
z-index: -1;
background: url('images/lose-image-opt.jpg');
background: url('images/lose-image-opt-sm.jpg');
filter: none;
background-size: cover;
background-position: bottom;
top: -1 * $blur-radius;
left: -1 * $blur-radius;
bottom: -1 * $blur-radius;
Expand All @@ -187,6 +189,7 @@ $landfill-gasses: #f06807;
background: url($image-url);
filter: blur(3px);
background-size: cover;
background-position: bottom;
top: -1 * $blur-radius;
left: -1 * $blur-radius;
bottom: -1 * $blur-radius;
Expand Down Expand Up @@ -290,7 +293,7 @@ $landfill-gasses: #f06807;
font-weight: 1000;
font-size: 36px;
animation: fade-color 3s;
animation-delay: 0s;
animation-delay: 1s;
animation-fill-mode: both;
}

Expand Down
1 change: 0 additions & 1 deletion src/components/LoseGame.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export default class LoseGame extends React.Component<LoseGameProps> {
<div style={{ width: '100%', height: '100vh', position: 'relative' }}>
<Swiper
centeredSlides={true}
className='mySwiper'
>
<SwiperSlide id='fade-to-white' className='lose-game-bg'>
<div style={{
Expand Down
12 changes: 4 additions & 8 deletions src/components/WinGame.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Swiper, SwiperSlide, useSwiper, useSwiperSlide } from 'swiper/react';
import { Navigation, Pagination, Scrollbar, A11y, Autoplay, EffectFade } from 'swiper/modules';
import { Swiper, SwiperSlide, useSwiperSlide } from 'swiper/react';
import { Navigation, Pagination, Autoplay, EffectFade } from 'swiper/modules';
import 'swiper/css';
import 'swiper/css/pagination';
import 'swiper/css/navigation';
Expand Down Expand Up @@ -46,9 +46,7 @@ export default class WinGame extends React.Component<WinGameProps> {
clickable: true
}}
onAutoplayTimeLeft={this.onAutoplayTimeLeft}
navigation={true}
className='mySwiper'
>
navigation={true}>
<SwiperSlide className='slide1-image'>
<SlideContent
statDivs={
Expand Down Expand Up @@ -178,9 +176,7 @@ function UnderlineSpan(props: UnderlineProps) {
const underlinedText = {__html: props.text};
return (
<Fragment>
{/* <span>&nbsp;</span> */}
<span className={animationCSS} dangerouslySetInnerHTML={underlinedText}></span>
{/* <span>&nbsp;</span> */}
</Fragment>
)
}
Expand All @@ -194,7 +190,7 @@ function SlideContent(props: SlideProps) {

return (
<div style={{
marginTop: '200px',
marginTop: '100px',
color: '#444',
display: 'flex',
flexDirection: 'row',
Expand Down
Binary file added src/images/lose-image-opt-sm.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 055a17c

Please sign in to comment.