Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Cleaned up layout, styles, and JavaScript.

  • Loading branch information...
commit 2852854146d67e119c97218887c89fc9a2e3e97b 1 parent 1951561
@tylerhunt authored
View
36 app/views/layouts/application.html.erb
@@ -1,20 +1,19 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
- <meta name="viewport" content="width=420; initial-scale=0.6666; maximum-scale=1.0; minimum-scale=0.6666" />
<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=400; initial-scale=0.755; maximum-scale=1.0; minimum-scale=0.6666" />
<title>BarCampOrlando Schedule</title>
- <%= javascript_include_tag 'prototype' %>
- <%= javascript_include_tag 'application' %>
+ <%= javascript_include_tag 'prototype', 'application' %>
<%= stylesheet_link_tag 'application' %>
</head>
- <body>
- <div class="wrap">
- <h1 id="logo"><%= link_to 'BarCampOrlando', root_path %></h1>
+ <body>
+ <div id="page">
+ <h1 id="logo"><%= link_to 'BarCampOrlando', root_path %></h1>
- <div class="nonsemanticprettystuff">
- <ul id="navigation">
+ <div id="navigation">
+ <ul>
<% Venue.find(:all, :order => 'id').each do |venue| %>
<li><%= link_to_unless_current venue.name, venue_path(venue) %></li>
<% end %>
@@ -22,15 +21,22 @@
<% if session[:admin] %>
<li class="right"><%= link_to 'Log Out', logout_path %></li>
<% end %>
+
<br class="clear" />
</ul>
- </div>
- <p style="color: green;"><%= flash[:notice] %></p>
+ </div>
+
+ <p style="color: green;"><%= flash[:notice] %></p>
- <%= yield %>
- <div id="footer">
- <p>Bonus: <a href="http://barcamporlando.org">BarCamp Orlando&apos; site</a>, <a href="http://search.twitter.com/search?q=&ands=&phrase=&ors=barcamporlando+%22BarCamp+Orlando%22+%23bcorlando+%23bco2009&nots=&tag=&lang=all&from=&to=&ref=&near=&within=15&units=mi&since=&until=&rpp=15">Search BarCamp Orlando on Twitter</a>, <a href="http://github.com/tylerhunt/barcamplive/tree/master">Use the source Luke!</a></p>
- </div><!-- close #footer -->
- </div><!-- close .wrap -->
+ <%= yield %>
+
+ <div id="footer">
+ <ul>
+ <li><%= link_to 'BacCamp Orlando', 'http://barcamporlando.org' %></li>
+ <li><%= link_to 'Twitter Search', 'http://search.twitter.com/search?q=BarCampOrlando+OR+%22BarCamp+Orlando%22+OR+%23bcorlando+OR+%23bco2009' %></li>
+ <li><%= link_to 'Source Code', 'http://github.com/tylerhunt/barcamplive/tree/master' %></li>
+ </ul>
+ </div>
+ </div>
</body>
</html>
View
6 public/javascripts/application.js
@@ -1,6 +1,6 @@
// Place your application-specific JavaScript functions and classes here
// This file is automatically included by javascript_include_tag :defaults
-window.onload = function() {
- setTimeout(function(){window.scrollTo(0, 1);}, 100);
- }
+window.onload = function() {
+ setTimeout(function() { window.scrollTo(0, 1); }, 100);
+}
View
200 public/stylesheets/application.css
@@ -1,128 +1,158 @@
-/* Reset Styles, haters */
+/* Reset */
-* {margin: 0; padding: 0;}
+* {
+ margin: 0;
+ padding: 0;
+}
-/* Errors */
-.fieldWithErrors {
- background-color: red;
- display: table;
- padding: 2px;
-}
+/* Elements */
-#errorExplanation {
- background-color: #F0F0F0;
- border: 2px solid red;
- margin-bottom: 20px;
- padding-bottom: 12px;
- padding: 7px;
- width: 400px;
+body {
+ color: #355C2F;
+ font-family: "Helvetica Neue", "Helvetica", "Verdana", sans-serif;
+ font-size: 14px;
+ text-align: center;
}
-#errorExplanation h2 {
- background-color: #C00;
- color: #FFF;
- font-size: 12px;
- font-weight: bold;
- margin: -7px;
- padding: 5px 5px 5px 15px;
- text-align: left;
+a {
+ color: #E98B07;
}
-#errorExplanation p {
- color: #333;
- margin-bottom: 0;
- padding: 5px;
+h2 {
+ margin-bottom: 10px;
+ margin-top: 10px;
+ text-align: center;
}
-#errorExplanation ul li {
- font-size: 12px;
- list-style: square;
+form,
+.clear {
+ clear: both;
}
-/* layout */
-
-form, .clear {clear: both;}
-
-a {color: #e98b07;}
+form label {
+ display: inline-block;
+ width: 80px;
+}
table {
- border-width: 1px 1px 1px 1px;
- border-spacing: 2px;
- border-style: outset outset outset outset;
- border-color: #646464 #646464 #646464 #646464;
+ background-color: #FFF;
border-collapse: collapse;
- background-color: white;
- width: 98%;
+ border-spacing: 2px;
+ border: 1px outset #636363;
margin-left: 1%;
margin-right: 1%;
+ width: 98%;
}
+
table th {
- border-width: 1px 1px 1px 1px;
- padding: 5px 5px 5px 5px;
- border-style: inset inset inset inset;
- border-color: gray gray gray gray;
- background-color: white;
- -moz-border-radius: 0px 0px 0px 0px;
+ background-color: #FFF;
+ border: 1px inset #999;
+ padding: 5px;
}
+
table td {
- border-width: 1px 1px 1px 1px;
- padding: 5px 5px 5px 5px;
- border-style: inset inset inset inset;
- border-color: gray gray gray gray;
- background-color: white;
- -moz-border-radius: 0px 0px 0px 0px;
+ background-color: #FFF;
+ border: 1px inset #999;
+ padding: 5px;
}
-body {text-align: center; font-family: "helvetica neue", helvetica, verdana, sans, sans-serif; font-size: 14px; color: #355c2f;}
-.wrap {margin: 0 auto; text-align: left;}
+/* Layout */
+
+#page {
+ margin: 0 auto;
+ text-align: left;
+}
h1#logo a {
- display: block;
- text-indent: -9999px;
background: url(/images/h1_background.gif) no-repeat;
- width: 400px;
+ display: block;
height: 120px;
margin-left: 10px;
+ text-indent: -9999px;
+ width: 400px;
}
-.nonsemanticprettystuff {
- background: #89c63d;
- padding: 10px;
- padding-left: 0px;
- padding-right: 0px;
- }
-
-ul#navigation {
- border: 5px solid #fff;
- border-right: none;
- border-left: none;
+#navigation {
+ background: #89C63D;
+ padding: 10px 0;
+}
+
+#navigation ul {
+ border-color: #FFF;
+ border-style: solid;
+ border-width: 5px 0 5px 0;
padding-bottom: 10px;
- }
+}
-ul#navigation li {
- list-style-type: none;
+#navigation ul li {
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ background: #355C2F;
+ border: 1px solid #355C2F;
+ color: #FFF;
display: inline-block;
float: left;
font-size: 30px;
font-weight: bold;
- padding: 10px;
- width: 380px;
- color: #fff;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border: 1px solid #355c2f;
- margin-top: 10px;
+ list-style-type: none;
margin-left: 10px;
- background: #355c2f;
- }
+ margin-top: 10px;
+ padding: 10px;
+ width: 380px;
+}
+
+#navigation ul li a {
+ display: inline-block;
+ width: 100%;
+}
+
+#footer {
+ margin: 20px 10px 10px;
+}
+
+#footer ul li {
+ float: left;
+ list-style: none;
+ margin-right: 20px;
+}
-ul#navigation li a {display: inline-block; width: 100%; }
-h2 {text-align: center; margin-top: 10px; margin-bottom: 10px;}
+/* Errors */
+
+.fieldWithErrors {
+ background-color: #FFF;
+ display: table;
+ padding: 2px;
+}
+
+#errorExplanation {
+ background-color: #F0F0F0;
+ border: 2px solid red;
+ margin-bottom: 20px;
+ padding-bottom: 12px;
+ padding: 7px;
+ width: 400px;
+}
+#errorExplanation h2 {
+ background-color: #C00;
+ color: #FFF;
+ font-size: 12px;
+ font-weight: bold;
+ margin: -7px;
+ padding: 5px 5px 15px;
+ text-align: left;
+}
-#footer p {margin-left: 10px; margin-bottom: 10px; margin-top: 20px; margin-bottom: 10px;}
+#errorExplanation p {
+ color: #333;
+ margin-bottom: 0;
+ padding: 5px;
+}
-label {width: 80px; display: inline-block;}
+#errorExplanation ul li {
+ font-size: 12px;
+ list-style: square;
+}
Please sign in to comment.
Something went wrong with that request. Please try again.