diff --git a/README.md b/README.md index cc68e02..41331ab 100644 --- a/README.md +++ b/README.md @@ -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. \ No newline at end of file diff --git a/assets/css/main.css b/assets/css/main.css index 2033ee9..3da8a49 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -4,20 +4,22 @@ body { background: #FFF; } #navbar { - height: 50px; - background: rgba(249, 249, 249, 0.7); } + height: auto; + background: rgba(249, 249, 249, 0.7); + display: flex; } #navbar ul { - height: 50px; margin: 0px; padding: 0px; - display: inline-block; } + display: flex; + flex-wrap: wrap; + background: rgba(249, 249, 249, 0.7); } #navbar ul li { - display: inline-block; + height: 50px; + display: inline-flex; padding: 0px; margin: 0px; } #navbar ul li a { line-height: 50px; - display: block; padding: 0px 10px; color: #AE1215; font-size: 20px; } @@ -68,19 +70,20 @@ li { margin: 0px; padding: 0px; background: #AE1215; + color: #fff; height: auto; - display: block; - color: #fff; } + display: flex; + flex-wrap: wrap; } .columns .column { + height: inherit; width: 30%; padding: 20px; display: table-cell; - vertical-align: top; } + vertical-align: top; + flex-grow: 1; } .columns #one { - height: 100%; border-right: 2px dotted #000; } .columns #three { - height: 100%; border-left: 2px dotted #000; } .columns a { color: #ababab; } @@ -151,15 +154,23 @@ li { .footer h4 { color: #000; } -@media (max-width: 550px) { +@media (max-width: 600px) { + .columns .column { + width: 100%; } + .columns .column ul { + padding: 0; } + .columns #one { + border-right: none; + border-bottom: 2px dotted #000; } + .columns #three { + border-left: none; + border-top: 2px dotted #000; } + .officer { min-width: 300px; max-width: 100%; } - #navbar { - display: none; } - - #mobile-nav { - display: block; } } + #navbar ul { + justify-content: center; } } /*# sourceMappingURL=main.css.map */ diff --git a/assets/css/main.scss b/assets/css/main.scss index 4121aad..05e6f29 100755 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -1,6 +1,7 @@ //@import 'normalize'; $bodybg: #FFF; +$nav-color: rgba(249, 249, 249, .7); $prim: #AE1215; $sec: #292929; $accent: #AE1215; @@ -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; @@ -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{ @@ -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; + } } }