Skip to content

Ginafish/contrib #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 24, 2018
Merged

Ginafish/contrib #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d672a78
Added link to hosted site and contributing info to README
ginafish Apr 23, 2018
b2d3668
Flex-ified index columns
ginafish Apr 23, 2018
6cdf182
Adjusted column resizing and border
ginafish Apr 24, 2018
1f3323f
Made navbar responsive
ginafish Apr 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# osusec.github.io
The official website for OSU Security Club
The official website for OSU Security Club. Hosted at [osusec.github.io](http://osusec.github.io/) .

# Contributing
If you would like to contribute, please read CONTRIBUTING.md first.
45 changes: 28 additions & 17 deletions assets/css/main.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 36 additions & 12 deletions assets/css/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//@import 'normalize';

$bodybg: #FFF;
$nav-color: rgba(249, 249, 249, .7);
$prim: #AE1215;
$sec: #292929;
$accent: #AE1215;
Expand All @@ -18,23 +19,25 @@ body{

//Navigation
#navbar{
height: $navheight;
background: rgba(249, 249, 249, .7);
height: auto;
background: $nav-color;
display: flex;

ul{
height: $navheight;
margin: 0px;
padding: 0px;
display: inline-block;
display: flex;
flex-wrap: wrap;
background: $nav-color;

li{
display: inline-block;
height: $navheight;
display: inline-flex;
padding: 0px;
margin: 0px;

a{
line-height: $navheight;
display: block;
padding: 0px 10px;
color: $accent;
font-size: 20px;
Expand Down Expand Up @@ -95,14 +98,17 @@ li{
padding: 0px;
background: $prim;
height: auto;
display: block;
display: flex;
flex-wrap: wrap;
color: $light;

.column{
height: inherit;
width: 30%;
padding: 20px;
display: table-cell;
vertical-align: top;
flex-grow: 1;
}

#one{
Expand Down Expand Up @@ -201,16 +207,34 @@ li{
}
}

@media (max-width: 550px){
@media (max-width: 600px){
.columns{
.column{
width: 100%;

ul{
padding: 0;
}
}

#one{
border-right: none;
border-bottom: 2px dotted $dark;
}
#three{
border-left: none;
border-top: 2px dotted $dark;
}
}

.officer{
min-width: 300px;
max-width: 100%;
}

#navbar{
display:none;
}
#mobile-nav{
display: block;
ul{
justify-content: center;
}
}
}