Skip to content

Commit

Permalink
Fix slideshow width (#51)
Browse files Browse the repository at this point in the history 
* Fix slideshow width

* Update history
  • Loading branch information
@Dwooll94
Dwooll94 authored Aug 12, 2024
1 parent cac4ed6 commit 2802744
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 14 deletions.
6 changes: 5 additions & 1 deletion public/css/main_stylesheet.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ body {
.swat-slideshow {
float:left;
display:inline;
width:75%;
width:100%;
background-color: #000;
color:#fff;
}
Expand All @@ -77,6 +77,10 @@ body {
width: 75%;
}

.swat-slide-image-caption{
font-size: .75em
}

.frontpageinfo {
clear: left;
}
Expand Down
29 changes: 24 additions & 5 deletions public/history-page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,45 @@
</div>
<!-- Timeline of the team -->
<div class="timeline">
<div class="container left">
<div class="content">
<div class="pic">
<img class="responsive clickable" src="pictures/robots/game/25.png" width="200" height="200" onclick="_expandCont(25)">
<h2>2025: Reefscape</h2>
</div>
<div class="cont" id="25">
<h4>Game Field: Coming Soon</h4>
<!--<img class="responsive" src="pictures/robots/game/field/2024-game.png" style="margin-top:15px"> -->
<h4>Game Description:</h4>
<p>In Reefscape&trade;, we don't know what we're doing yet, check back after January 4th.</p>
<h4>Description of Robot:</h4>
<p>404 robot not found.</p>
<img class="responsive" src="pictures/robots/placeholderrobot.jpg">
<!--<a href="https://github.com/frc1806/Crescendo-1806"><p>Code</p></a>
<a href="https://cad.onshape.com/documents/241f2253507606c76021332d/w/af9b88b7a8fe9387e4a7ba96/e/279410e9fe0c1ef537b2a937"><p>CAD</p></a> -->
</div>
</div>
</div>
<div class="container right">
<div class="content">
<div class="pic">
<img class="responsive clickable" src="pictures/robots/game/24.svg" width="200" height="200" onclick="_expandCont(24)">
<h2>2024: Crescendo</h2>
</div>
<div class="cont" id="24">
<h4>Game Field: Coming Soon</h4>
<img class="responsive" src="pictures/robots/game/field/2024-game.jpg" style="margin-top:15px">
<!--<img class="responsive" src="pictures/robots/game/field/2024-game.png" style="margin-top:15px"> -->
<h4>Game Description:</h4>
<p>In Crescendo&trade;, we don't know what we're doing yet, check back after January 6th.</p>
<p>In Crescendo&trade; presented by Haas, two competing alliances are invited to score notes, amplify their speaker, harmonize onstage, and take the spotlight before time runs out. Alliances earn additional rewards for meeting specific scoring thresholds and for cooperating with their opponents.</p>
<h4>Description of Robot:</h4>
<p>404 robot not found.</p>
<img class="responsive" src="pictures/robots/placeholderrobot.jpg">
<p>Our 2024 Robot Pizza Planet specialized in scoring notes into the speaker. Our first Robot with fully independent swerve drive allowed us to quickly pick up notes from the ground and score them. The robot's low center of gravity was useful for not tipping over and making our robot more agile. This robot featured a 4-camera april tag tracking system which when combined with swerve odometry allowed for 1 button automatic scoring within 1.5 meters of the subwoofer.</p>
<img class="responsive" src="pictures/robots/24robot.png">
<a href="https://github.com/frc1806/Crescendo-1806"><p>Code</p></a>
<a href="https://cad.onshape.com/documents/241f2253507606c76021332d/w/af9b88b7a8fe9387e4a7ba96/e/279410e9fe0c1ef537b2a937"><p>CAD</p></a>
<a href="https://www.chiefdelphi.com/t/frc-1806-s-w-a-t-2024-build-thread/447060"><p>Build Thread</p></a>
</div>
</div>
</div>
<div class="timeline">
<div class="container left">
<div class="content">
<div class="pic">
Expand Down
16 changes: 8 additions & 8 deletions public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,41 +61,41 @@

<div class="w3-display-container slides">
<img src="pictures/image/slides/_u/2024-MOKANState.jpg" class="swat-slide-image w3-rounded">
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4>2024 - MOKAN State Championships</h4></div>
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4 class="swat-slide-image-caption">2024 - MOKAN State Championships</h4></div>
</div>

<div class="w3-display-container slides">
<img src="pictures/image/slides/_u/2024-GKC.jpg" class="swat-slide-image w3-rounded">
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4>2024 - Greater Kansas City Regional</h4></div>
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4 class="swat-slide-image-caption">2024 - Greater Kansas City Regional</h4></div>
</div>

<div class="w3-display-container slides">
<img src="pictures/image/slides/_u/2023-cowtown.jpg" class="swat-slide-image w3-rounded">
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4>2023 - Cowtown Throwdown</h4></div>
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4 class="swat-slide-image-caption">2023 - Cowtown Throwdown</h4></div>
</div>

<div class="w3-display-container slides">
<img src="pictures/image/slides/_u/2023-remakelearning.jpg" class="swat-slide-image w3-rounded">
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4>2023 - Remake Learning Days Smithville</h4></div>
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4 class="swat-slide-image-caption">2023 - Remake Learning Days Smithville</h4></div>
</div>

<div class="w3-display-container slides">
<img src="pictures/image/slides/_u/2023-Board-Meeting.jpg" class="swat-slide-image w3-rounded">
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4>2023 - Smithville School Board Meeting</h4></div>
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4 class="swat-slide-image-caption">2023 - Smithville School Board Meeting</h4></div>
</div>

<div class="w3-display-container slides">
<img src="pictures/image/slides/_u/2023-greencountry.jpg" class="swat-slide-image w3-rounded">
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4>2023 - Green Country Regional</h4></div>
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4 class="swat-slide-image-caption">2023 - Green Country Regional</h4></div>
</div>
<div class="w3-display-container slides">
<img src="pictures/image/slides/_u/2023-heartland.jpg" class="swat-slide-image w3-rounded">
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4>2023 - Heartland Regional</h4></div>
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4 class="swat-slide-image-caption">2023 - Heartland Regional</h4></div>
</div>

<div class="w3-display-container slides">
<img src="pictures/image/slides/_u/2023-Robot-in-progress.jpg" class="swat-slide-image w3-rounded">
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4>2023 - Charged Up Competition Bot</h4></div>
<div class="w3-display-bottommiddle w3-container w3-padding-small w3-black"><h4 class="swat-slide-image-caption">2023 - Charged Up Competition Bot</h4></div>
</div>

<div class="w3-center">
Expand Down
Binary file added public/pictures/robots/24robot.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/pictures/robots/game/25.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/pictures/robots/game/field/2024-game.jpg
View file
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 2802744

Please sign in to comment.