From 02dab452a11a401e37b40a5d541c38ca4d42f67a Mon Sep 17 00:00:00 2001 From: Zhana Dougherty <38818964+ZPPD@users.noreply.github.com> Date: Thu, 14 Feb 2019 19:00:02 -0500 Subject: [PATCH] Navbar on small screens, hover over content (#63) * Navbar on small screens, hover over content * removed empty div in navbar * Remove topnav-placeholder everywhere and extra whitespace --- website/404.html | 4 ++-- website/about.html | 34 ++++++++++++++++++++++------------ website/index.html | 1 - website/projects.html | 22 ++++++++++++++-------- website/signin.html | 4 ++-- website/styles/unified.css | 18 ++++++++---------- 6 files changed, 48 insertions(+), 35 deletions(-) diff --git a/website/404.html b/website/404.html index cc98aad..9362f51 100644 --- a/website/404.html +++ b/website/404.html @@ -22,10 +22,10 @@
-
Sign in Projects - + Events diff --git a/website/about.html b/website/about.html index fa5d2e5..e6da158 100644 --- a/website/about.html +++ b/website/about.html @@ -22,10 +22,10 @@
-
Sign in Projects - + Events @@ -50,7 +50,8 @@

About OSC

- OSC is the Open Source Club at the University of Florida. We are a community of makers, who want to solve problems + OSC is the Open Source Club at the University of Florida. We are a community of makers, who want to solve + problems and improve our world using open source projects.

The OSC is first and foremost, about working on open source projects. Student choose what they want to work on, @@ -60,8 +61,10 @@

About OSC

We also preform technical talks on various open source topics. Anything from Linux to Typescript. Students are encouraged to submit ideas or even volunteer to give a talk.

- Collaborating with other clubs is another one of our goals. We love to work with others on presentations, events, - or projects! If you are interested in working together email gator.osc@gmail.com. + Collaborating with other clubs is another one of our goals. We love to work with others on presentations, + events, + or projects! If you are interested in working together email gator.osc@gmail.com.

@@ -73,9 +76,12 @@

Meetings

  1. Casual Coding Sessions are laid back meetings. You can work on projects, homework, or just hang out! They happen twice weekly. It's a great time to find people with similar interest and create something cool.
    2. -
  2. General Body Meetings (GBMs) open up with a brief round of project updates. Following that, there is a tech - talk on an open source technology. This is great for anyone to come in and learn. They happen every other week.
    3. -
  3. Code Jams are a once a month workshop and hack sessions. Spend the morning of Saturday learning about an open +
  4. General Body Meetings (GBMs) open up with a brief round of project updates. Following that, there is a + tech + talk on an open source technology. This is great for anyone to come in and learn. They happen every other + week.
    5. +
  5. Code Jams are a once a month workshop and hack sessions. Spend the morning of Saturday learning about an + open source technology then in the afternoon work on existing open source projects or start you own!

@@ -87,13 +93,15 @@

Getting Started

After noticing a lack of general project focused clubs on campus, Matthew Booe (President) brought together Nick Cioli (Vice President) and Nick Barnes (Treasure) and their enthusiasm for open source to create the club at the - start of Spring 2016. They found Professor Ira Hill to become their faculty adviser. It gathered enough sign-ups to + start of Spring 2016. They found Professor Ira Hill to become their faculty adviser. It gathered enough sign-ups + to become an official student government organization. During the first year of operation, there were about five active members. The focus was primarily on teaching Git/Web Design and working on the club website and other basic projects. - In the middle of Fall 2016, the OSC became a Special Interest Group of the UF ACM chapter. The goal of this was to + In the middle of Fall 2016, the OSC became a Special Interest Group of the UF ACM chapter. The goal of this was + to improve relations with the computer science community and find a source of funding.

Growing Up

@@ -101,7 +109,8 @@

Growing Up

There were two problems that became apparent over the previous year: 1. There wasn't a lot of time to work on projects 2. Administrative duties make it really hard to work on other things. - As a result, in the Spring of 2017 Casual Coding Sessions were introduced as two regular weekly meetings and more + As a result, in the Spring of 2017 Casual Coding Sessions were introduced as two regular weekly meetings and + more officer positions were added. This brought on Anthony Rossello (Secretary), Greg Fussell (External Relations Chair), Will Owens (Social Chair), and Vaibhav Yenamandra (Project Lead). @@ -110,7 +119,8 @@

Growing Up

The end of Spring elections resulted in news officers Joe Komskis (External Relations Chair) and Josh Hew (Secretary). A representative from Mozilla also reached out to learn more about the club. - Over the Summer of 2017 Matthew and Josh worked with Mozilla and eighteen other students to help put together the + Over the Summer of 2017 Matthew and Josh worked with Mozilla and eighteen other students to help put together + the Mozilla Open Source Student Network.

Staying Strong

diff --git a/website/index.html b/website/index.html index 8d4fcd7..46bd1e2 100644 --- a/website/index.html +++ b/website/index.html @@ -22,7 +22,6 @@
-
Sign in Projects diff --git a/website/projects.html b/website/projects.html index 81ce068..e39ba74 100644 --- a/website/projects.html +++ b/website/projects.html @@ -22,10 +22,10 @@
-
Sign in Projects - + Events @@ -62,7 +62,8 @@

The thing your on right now!

- The website is built from scratch, using basic HTML, CSS, and JavaScript, to be a one-stop-shop for information + The website is built from scratch, using basic HTML, CSS, and JavaScript, to be a one-stop-shop for + information about the Open Source Club. It's provides information about what the club is, the projects we work on, and upcoming events.

@@ -129,7 +130,8 @@

Open source teacher/professor interaction software<

- Teacher/student interaction software designed to provide an open source alternative to existing solutions like Top + Teacher/student interaction software designed to provide an open source alternative to existing solutions like + Top Hat. It is being built with Ruby on Rails.

@@ -162,9 +164,11 @@

A simple UF themed Multi-User Dungeon

- Multi-user dungeons, or "MUDs" are text-based role-playing games, that naturally evolved from the text-based rpg + Multi-user dungeons, or "MUDs" are text-based role-playing games, that naturally evolved from the text-based + rpg and adventure games of the 1970s. This project aims to introduce a new generation—one that never experienced a - world without broadband internet—to this classic game genre. While this code can be adapted for any setting, we + world without broadband internet—to this classic game genre. While this code can be adapted for any setting, + we intend to render our university in beautiful ASCII.

@@ -197,7 +201,8 @@

Discord bots written in Python

- A python3 Discord bot used to run the Open Source Club's Discord server. The bot is using the Discord.py rewrite. + A python3 Discord bot used to run the Open Source Club's Discord server. The bot is using the Discord.py + rewrite.

@@ -229,7 +234,8 @@

A RESTful API for club information (events, project

- A RESTful API for club information (events, projects, sign-ins, etc) that is used for the club website, bots, and + A RESTful API for club information (events, projects, sign-ins, etc) that is used for the club website, bots, + and any future projects related to administration. Built using Rust, Rocket, PostgreSQL, and Diesel.

diff --git a/website/signin.html b/website/signin.html index f72e11e..7d42c07 100644 --- a/website/signin.html +++ b/website/signin.html @@ -22,10 +22,10 @@
-
Sign in Projects - + Events diff --git a/website/styles/unified.css b/website/styles/unified.css index 61834cf..dde5891 100644 --- a/website/styles/unified.css +++ b/website/styles/unified.css @@ -186,7 +186,7 @@ body { } /* Effect all header links except the logo */ - .topnav-link:not(:first-child) { + .topnav-right { display: none; } @@ -196,10 +196,6 @@ body { padding: 18px 16px; } - /* Header on smaller devices when clicked */ - .topnav.drop-down-menu { - position: relative; - } /* Keep the menu icon on the right when clicked */ .topnav.drop-down-menu .topnav-menu-icon { @@ -225,15 +221,17 @@ body { } /* Make the menu items be below the menu icon when clicked */ + /* Hover the menu over content in a less obtrusive way */ .topnav.drop-down-menu > .topnav-right { + display: block; + position: absolute; + z-index: 10; + top: 59px; + right: 0; + background-color: var(--primary-color); flex-direction: column; } - /* Empty space between the top of the screen and the first menu item */ - .topnav.drop-down-menu > .topnav-right > .topnav-placeholder { - height: 60px; - } - } /* Footer CSS */