Skip to content

Commit b281478

Browse files
authored
Merge pull request #385 from ComputerScienceHouse/develop
Develop
2 parents 3297453 + 64a0805 commit b281478

5 files changed

Lines changed: 60 additions & 6 deletions

File tree

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# CSHPublicSite - [csh.rit.edu](https://csh.rit.edu)
1+
# Pubsite - [csh.rit.edu](https://csh.rit.edu)
22

33
The public facing website for [Rochester Institute of Technology](https://rit.edu/)'s [Computer Science House](https://csh.rit.edu).
44

@@ -8,8 +8,8 @@ This site is written using [Jekyll](https://jekyllrb.com/), a static site genera
88

99
## Local Development
1010

11-
Build the container: `docker build -t cshpublicsite .`
12-
Run the container: `docker run -p 4000:80 cshpublicsite`
11+
Build the container: `docker build -t pubsite .`
12+
Run the container: `docker run -p 4000:80 pubsite` or pick your favorite port
1313
You will be able to access the site at http://localhost:4000.
1414

1515
You can either edit files in the container, or rebuild the container when you want to test changes.
@@ -23,4 +23,4 @@ You can either edit files in the container, or rebuild the container when you wa
2323

2424
## Questions/Concerns
2525

26-
Please file an [Issue](https://github.com/ComputerScienceHouse/CSHPublicSite/issues/new) on this repository or contact [webmaster@csh.rit.edu](mailto:webmaster@csh.rit.edu) with inquiries about the site.
26+
Please file an [Issue](https://github.com/ComputerScienceHouse/pubsite/issues/new) on this repository or contact [webmaster@csh.rit.edu](mailto:webmaster@csh.rit.edu) with inquiries about the site.

_includes/nav.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
<nav class="navbar navbar-expand-lg navbar-dark">
1+
<nav class="navbar navbar-expand-lg navbar-dark d-flex flex-column">
2+
<!-- Banner for 50th anniversary information -->
3+
<div id="info-banner">
4+
<p>ATTENTION ALUMNI & MEMBERS: The 50th Anniversary will be held from April 10th-12th, 2026!</p>
5+
<p>Find out more at <a href="https://50th.csh.rit.edu">50th.csh.rit.edu</a></p>
6+
<button id="close-banner" onclick="document.getElementById('info-banner').style.display='none'"></button>
7+
</div>
8+
29
<div class="container">
310
<a href="/" class="navbar-brand" aria-label="Return to Computer Science House's Homepage">&nbsp;</a>
411
<button type="button" data-toggle="collapse" data-target="#navigation" aria-controls="navigation" aria-expanded="false" aria-label="Toggle navigation" class="navbar-toggler"><span class="navbar-toggler-icon"></span></button>

_sass/_splash.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $size: 350px;
1212
h1 {
1313
color: white;
1414
font-size: 3em;
15-
margin: 0;
15+
margin: 40px 0 0;
1616
padding: 0 1rem;
1717
max-width: 100%;
1818
word-wrap: break-word;

assets/css/main.scss

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,52 @@ a.btn {
154154
}
155155
}
156156

157+
// CSS For 50th Info Banner
158+
#info-banner {
159+
background-color: #B0197E;
160+
color: #fff;
161+
text-align: center;
162+
padding: 10px 40px;
163+
width: 100%;
164+
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
165+
}
166+
167+
#info-banner p {
168+
margin: 0;
169+
display: inline-block;
170+
171+
position: relative;
172+
}
173+
174+
#close-banner {
175+
background: none;
176+
border: none;
177+
font-size: 16px;
178+
cursor: pointer;
179+
margin-left: 10px;
180+
color: #fff;
181+
182+
183+
position: fixed;
184+
top: 10px;
185+
right: 20px;
186+
}
187+
188+
#info-banner a {
189+
color: white;
190+
text-decoration: underline;
191+
}
192+
193+
#info-banner a:visited {
194+
color: white;
195+
}
196+
197+
@media screen and (min-width: 1100px) {
198+
#close-banner {
199+
top: 20px;
200+
right: 30px;
201+
}
202+
}
157203

158204

159205
@import "typography";

index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
active: home
44
---
55

6+
67
<div style="top:0;position:absolute;display: inline;">
78
<!-- Floating scroll-down button -->
89
<button id="carousel-scroll-down-button" aria-label="Scroll to the end/bottom of the image carousel">

0 commit comments

Comments
 (0)