Skip to content

Commit

Permalink
Complete redesign of website
Browse files Browse the repository at this point in the history 
To view original commit history, please go to https://github.com/sarahjkim/csua-website/
  • Loading branch information
@sarahjkim
sarahjkim committed Mar 14, 2014
1 parent 64626cc commit 38c6359
Show file tree
Hide file tree
Showing 128 changed files with 14,554 additions and 2,855 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.dropbox
.DS_Store
25 changes: 25 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
## Website

These are the website files for the UC Berkeley Computer Science Undergraduate Association ([CSUA](http://csua.berkeley.edu/)).

## Website Structure

The website has six primary pages with their corresponding .css files:

```
Index - index.html
About - about.html
Politburo - politburo.html
Officers - officers.html
Constitution - constitution.html
Events - events.html
Hackathon Fall 2013 - hackathonfa13.html
Industry - industry.html
Donate - donate.html
Join - join.html
```

## Author

The site is fully built, designed, and maintained by Sarah Jiyun Kim. Graphics were created by Tirumari Jothi and Kara Gieseking.

229 changes: 155 additions & 74 deletions about.html
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,160 @@

<html>
<head>
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>About UC Berkeley CSUA</title>
<meta name="keywords" content="" />
<meta name="description" content="" />
<link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600" rel="stylesheet" type="text/css" />
<link href="default.css" rel="stylesheet" type="text/css" media="all" />
<title>About | CSUA</title>
<link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,700,600" rel="stylesheet" type="text/css"/>
<link rel="stylesheet" type="text/css" href="assets/css/about.css"/>
<script src="assets/jquery-1.9.1.js"></script>
<script src="assets/script.js"></script>
</head>
<body>
<a href="index.html"><div id="banner"><img src="images/header-image-bg.png" width="200" height="130" alt="" /></div></a>
<div id="wrapper">
<div id="header">
<div id="logo">
<h1><a href="index.html" >CSUA</a></h1>
<p>UC Berkeley Computer Science Undergraduate Association</p>
</div>
</div>
<!-- end #header -->
<div id="menu">
<ul>
<li class="current_page_item"><a href="index.html">Home</a></li>
<li><a href="about.html" >About</a></li>
<li><a href="events.html">Upcoming Events</a></li>
<li><a href="industry.html">Industry</a></li>
<li><a href="donate.html">Donate</a></li>
<li class="last"><a href="join.html"> Join</a></li>
</ul>
</div>

<div id="three-columns">
<div class="content">
<div id="column1">
<h2>Hello, world.</h2>
<ul class="list-style1">
<li class="first">
The Computer Science Undergraduate Association educates the undergraduate Computer Science student body at Berkeley, and acts as the entry point to the software industry. The CSUA hosts its biweekly eTalks speaker series, the semesterly hackathon, job/internship workshops, Friday night LAN parties, the annual Startup Fair, and monthly CS Community Meetings such as the Ruby on Rails Bay Area Meetups. The CSUA Executive Team for Spring 2010 curated the first TEDxBerkeley conference. <p> <p>

If you’re interested in sponsoring an event, please contact us at events@csua.berkeley.edu. <p>
The CSUA Office is located in front of the 3rd floor entrance to Soda Hall, across the way from Etcheverry Hall, at the corner of Hearst & LeRoy. We work around the clock and provide computing resources, support, and community to the computer science students at Berkeley.

<p><p> </p>
</ul>
</div>
<div id="column2">
<h2> Getting Involved</h2>
<ul class="list-style2">
<li><a href="politburo.html">The Politburo</a></li>
<li>The politburo are elected officers of the CSUA. You can contact the Politburo at politburo@csua.berkeley[dot]edu.</li>

<li><a href="officers.html">Officers</a></li> <p>
<li> The office hosers are people you find frequently at the office. They're responsible for keeping the place open and friendly. Many of them are very experienced at programming, and can help you with your classes.</li>
<li><a href="constitution.html">The Constitution</a></li>
<li> Our constitution is important to keep our vision and purpose in the campus community. </li>

</ul>

</div>
<div id="column3">
<h2>Contact</h2>
<p><img src="images/officers.jpg" width="300" height="400" alt="" /></p>
<p>Our office is located in 311 Soda Hall, located at the corner of Hearst & LeRoy. In the rare case that you have an emergency and the office is vacant, you may contact the CSUA via telepathy, or email us at politburo@csua.berkeley.edu.
<p><p>
Computer Science Undergraduate Association
University of California, Berkeley
311 Soda Hall
Berkeley, CA 94720-1776</p>
</div>

</div>
</div>
<div id="footer">
<p>Copyright (c) 2013 CSUA. All rights reserved. Design by Hina Sakazaki. Illustrations by <a href="http://thetirumari.carbonmade.com/">Tirumari Jothi.</a>.
</div>

</div>
<div id="header">
<div id="headerbar">
<div id="logo">
<a href="http://csua.berkeley.edu/index.html">
<img src="assets/header.png">
</a>
</div>
<div id="csua">
<a href="http://csua.berkeley.edu/index.html">
<div class="header-link">CSUA</div>
</a>
</div>
<div id="headerlinks">
<div class="header-item">
<a href="http://csua.berkeley.edu/index.html">
<div class="header-link">Home</div>
</a>
</div>
<div id="about-header" class="header-item">
<a href="http://csua.berkeley.edu/about.html">
<div class="header-link">About</div>
</a>
<div id="about">
<div id="dropdownabout">
<a href="http://csua.berkeley.edu/politburo.html">
<div class="dropdownitem">Politburo</div>
</a>
<a href="http://csua.berkeley.edu/officers.html">
<div class="dropdownitem">Officers</div>
</a>
<a href="http://csua.berkeley.edu/constitution.html">
<div class="dropdownitem">Constitution</div>
</a>
</div>
</div>
</div>
<div class="header-item">
<a href="http://csua.berkeley.edu/events.html">
<div class="header-link">Events</div>
</a>
</div>
<div class="header-item">
<a href="http://csua.berkeley.edu/industry.html">
<div class="header-link">Industry</div>
</a>
</div>
<div class="header-item">
<a href="http://csua.berkeley.edu/donate.html">
<div class="header-link">Donate</div>
</a>
</div>
<div class="header-item">
<a href="http://csua.berkeley.edu/join.html">
<div class="header-link">Join</div>
</a>
</div>
</div>
</div>
</div>
<div id="content">
<div id="block1" class="block">
<div id="helloworld">
<div class="header">Hello, World</div>
<div class="text">
The UC Berkeley Computer Science Undergraduate Association supports the
undergraduate Computer Science student body and acts as an entry point
to industry.
</div>
<div class="text">
The CSUA hosts speaker series, semesterly
hackathons, coding for grub events, job/internship workshops,
LAN parties, the annual Startup Fair, and CS community meetings.
</div>
</div>
<div id="ouroffice">
<div class="header">Our Office</div>
<div class="text">
The CSUA Office is located in 311 Soda Hall in front of the 3rd floor
entrance to Soda Hall, at the corner of Hearst &amp; LeRoy.
We also maintain a study lounge at 343 Soda Hall (within Soda).
</div>
<div class="text">
We work around the clock to provide computing resources, support, and
community to the computer science students at Berkeley.
In the rare case that you have an emergency and the office is vacant, you
may email us at politburo@csua.berkeley.edu.
</div>
</div>
</div>
<div id="block2" class="block">
<div id="officepicture">
<img src="assets/office.jpg">
</div>
<div id="officeaddress">
<div id="address" class="text">
Computer Science Undergraduate Association <br>
University of California, Berkeley <br>
311 Soda Hall <br>
Berkeley, CA 94720-1776
</div>
</div>
</div>
<div class="clear"></div>
<div id="block3" class="block">
<div id="officerpicture">
<img src="assets/officers.jpg">
</div>
</div>
<div id="block4" class="block">
<div id="politburo">
<a href="http://csua.berkeley.edu/politburo.html">
<div class="linkheader">The Politburo</div>
</a>
<div class="text">
The Politburo is composed of elected officers of the CSUA. You can
contact the Politburo at politburo@csua.berkeley.edu.
</div>
</div>
<div id="officers">
<a href="http://csua.berkeley.edu/officers.html">
<div class="linkheader">Officers</div>
</a>
<div class="text">
Officers are people you find frequently at the office. They're responsible
for keeping the place open and friendly. Many of them are experienced
with programming and can help you with your classes.
</div>
</div>
<div id="constitution">
<a href="http://csua.berkeley.edu/constitution.html">
<div class="linkheader">The Constitution</div>
</a>
<div class="text">
Our constitution represents our vision and purpose in the campus
community.
</div>
</div>
</div>
<div class="clear"></div>
<div id="footer">
<div class="text">
Copyright &copy; 2013 CSUA. All rights reserved.
Design by <a href="http://www.sarahjikim.com/">
<div class="credit">Sarah Kim</div></a>.
<!-- & <a href="http://hinasakazaki.com/">
<div class="credit">Hina Sakazaki</div></a> --!>
</div>
</div>
</div>
</body>
</html>
70 changes: 0 additions & 70 deletions amendmentsp13gm3.html
View file

This file was deleted.

Loading

0 comments on commit 38c6359

Please sign in to comment.