Permalink
Browse files

Basic formatting HTML, CSS improvements

  • Loading branch information...
1 parent eb29c02 commit a10eb4f8d13c3496ee881d183d28d70459153462 @todditron todditron committed Jan 15, 2012
@@ -15,23 +15,88 @@ $taavo: #EFF3F8;
$hilary: #F1F7F0;
body {
-padding: 20px;
+
}
#wrapper {
- padding: 20px;
+ width: 960px;
+ margin: 5px auto;
+}
+#content {
+
+ padding-top: 10px;
}
ul.hmenu {
list-style: none;
- margin: 0 0 2em;
+ margin: 0;
padding: 0;
li {
display: inline;
+
}
}
+#prenav {
+ float: right;
+ font-style: oblique;
+}
+#prenav ul li{
+ margin-left: 5px;
+}
+
+table {
+ border: 1px solid #F3F3F3;
+ border-collapse:collapse;
+}
+
+#nav {
+ border-top: 1px solid #730500;
+ border-bottom: 1px solid #730500;
+ height: 26px;
+ background-color: #730500;
+}
+#nav a {
+ line-height: 26px;
+ text-decoration: none;
+ padding: 0px 10px;
+ color: #FFF;
+ display: inline-block;
+}
+#nav a:hover {
+ background-color: #900900;
+ color: #FFF;
+}
+.hourlogname, .companyname {
+ text-decoration: underline;
+}
+
+th td, thead td {
+ background-color: #F0F0F0;
+ background: #F0F0F0;
+ padding: 6px 10px;
+}
+
+caption, th, td {
+ padding: 4px 10px;
+}
+table#users tbody tr:hover td, table#hour_logs tbody tr:hover td, table#time_entries tbody tr:hover td, table#companies tbody tr:hover td {
+ background-color: #FBF9EE;
+ background: #FBF9EE;
+
+}
+
+td.total_hours {
+ font-family: Georgia, "Times New Roman", Times, serif;
+ font-weight: 500;
+ font-size:16px;
+}
+h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5 {
+ font-family: Georgia, "Times New Roman", Times, serif;
+ font-weight: 500;
+}
+
$startcolor: saturate($todd, 20%);
$midcolor1: #ffffff;
$midcolor2: $todd;
@@ -1,4 +1,7 @@
-%h1 Current Hour Log for #{@company.name}
+%h1
+ %span.hourlogname Current
+ Hour Log for
+ %span.companyname #{@company.name}
%table#time_entries
%thead
@@ -1,4 +1,7 @@
-%h1 Hour Log #{@hour_log.company.name} #{best_in_place_if User.current.admin?, @hour_log, :title}
+%h1
+ %span.hourlogname #{best_in_place_if User.current.admin?, @hour_log, :title}
+ Hour Log for
+ %span.companyname #{@hour_log.company.name}
%table#time_entries
%thead
@@ -1,29 +1,31 @@
-!!!
-%html
- %head
- %title
- = page_title
-
- = stylesheet_link_tag 'application'
- /[if IE 6]
- = stylesheet_link_tag 'ie6'
- /[if IE 7]
- = stylesheet_link_tag 'ie7'
-
- = javascript_include_tag 'application'
- = csrf_meta_tags
-
- %body{:class => body_class}
-
- #wrapper
-
- %img#logo{:src => '/assets/DD9_header_logo.png'}
-
- = render 'shared/navigation'
-
- #flash
- - flash.each do |name, msg|
- = content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String)
-
- #content
- = yield
+!!!
+%html
+ %head
+ %title
+ = page_title
+
+ = stylesheet_link_tag 'application'
+ /[if IE 6]
+ = stylesheet_link_tag 'ie6'
+ /[if IE 7]
+ = stylesheet_link_tag 'ie7'
+
+ = javascript_include_tag 'application'
+ = csrf_meta_tags
+
+ %body{:class => body_class}
+
+ #wrapper
+
+ = render 'shared/prenav'
+
+ %img#logo{:src => '/assets/DD9_header_logo.png'}
+
+ = render 'shared/navigation'
+
+ #flash
+ - flash.each do |name, msg|
+ = content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String)
+
+ #content
+ = yield
@@ -1,5 +1,8 @@
#nav
%ul.hmenu
+
+ %li= link_to 'Home', "/"
+
- if user_signed_in?
- if can? :index, HourLog
@@ -17,12 +20,7 @@
- if can? :index, User
%li= link_to 'Users', users_path
- #{current_user.name}, #{current_user.company.name}
- %li= link_to 'My account', edit_user_path(current_user)
-
- - if can? :show, current_user.company
- %li= link_to 'My company', current_user.company
-
- %li= link_to 'Logout', destroy_user_session_path, :method => 'delete'
- else
%li= link_to 'Login', new_user_session_path
+
+ %li#dd9home= link_to 'DD9.com', "http://dd9.com"
@@ -0,0 +1,13 @@
+#prenav
+ %ul.hmenu
+ - if user_signed_in?
+ %li= link_to current_user.name, edit_user_path(current_user)
+
+ - if can? :show, current_user.company
+ %li= link_to current_user.company.name, current_user.company
+
+ %li= link_to 'Logout', destroy_user_session_path, :method => 'delete'
+
+ - else
+ %li= link_to 'Login', new_user_session_path
+

0 comments on commit a10eb4f

Please sign in to comment.