sr-rolando/contactorama
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

FogBugz #83: neues Farbschema.

Browse source
This commit is contained in:
Roland Jesse 2011-09-24 23:19:21 +02:00
parent 61283003c8
commit c3c9d972f3
5 changed files with 61 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/views/contacts/index.html.erb
View file

@ -1,21 +1,11 @@
<div class="row">
<div class="twelvecol">
<div align="center">
| <%= link_to 'new', new_contact_path %>
&middot;
<%= link_to 'birthdays', birthdays_path %> |
</div>
</div>
</div>
<% @contacts.each do |c| %>
<div class="row contact-summary">
<div class="onecol">
<div class="row contact_summary">
<div class="onecol avatar_summary">
<img src="/images/dummy_buddy_m.png" />
</div>
<div class="twocol">
<strong><%= c.firstname.blank? ? "&nbsp;".html_safe : c.firstname %></strong>
<span class="name_summary"><%= c.firstname.blank? ? "&nbsp;".html_safe : c.firstname %></span><br />
<strong><%= c.lastname.blank? ? "&nbsp;".html_safe : c.lastname %></strong>
</div>
<div class="twocol">

33
app/views/layouts/application.html.erb
View file

@ -1,3 +1,4 @@
<!DOCTYPE html>
<html lang="en">
<head>
@ -15,23 +16,23 @@
</head>
<body>
<div class="container">
<div class="container">
<%# The header. %>
<div class="row">
<div class="sevencol header_red"><span class="logo_white">Contact</span><span class="logo_black">-o-Rama</span> - we care about your contacts!</div>
<div class="fivecol header_black">
<span id="username">
<% if user_signed_in? %>
<%=h current_user.email %>
|
<%= link_to t('devise.actions.logout'), destroy_user_session_path %>
<% else %>
<%# link_to t('devise.actions.signup'), new_user_registration_path %>
<%= link_to t('devise.actions.signin'), new_user_session_path %>
<% end %>
</span>
</div> <%# end header_black %>
</div> <%# row %>
<div class="row header">
<div class="threecol"><span class="logo">Contact-o-Rama</span></div>
<div class="threecol">
<%= form_tag("/search", :method => "get") do %>
<%= text_field_tag(:q, nil, :placeholder => "Vorname / Nachname") %>
<%= submit_tag("Search") %>
<% end %>
</div>
<div class="onecol header_actions"><%= link_to "Geb", birthdays_path %></div>
<div class="onecol header_actions"><%= link_to "Neu", new_contact_path %></div>
<div class="threecol omega header_email">
<%= current_user.email %>
(<%= link_to t('sessions.actions.logout'), destroy_user_session_path %>)
</div>
</div> <%# row %>
<%= yield %>

6
config/locales/de.yml
View file

@ -6,3 +6,9 @@ de:
contacts:
edit_contact: "Kontakt bearbeiten"
new_contact: "Neuer Kontakt"
sessions:
actions:
logout: "out"

3
config/locales/en.yml
View file

@ -10,3 +10,6 @@ en:
edit_contact: "Edit Contact"
new_contact: "New Contact"
sessions:
actions:
logout: "out"

34
public/stylesheets/layout.css
View file

@ -10,7 +10,7 @@ font-style: inherit;
}
body {
background-color: #ffffff;
background-color: #414443;
line-height: 1.5;
font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
@ -35,6 +35,18 @@ h2 {
/* Header & Footer */
.header {
background: #134026;
padding-top: 15px;
padding-bottom: 15px;
}
.header_actions, .header_actions a {
color: #f2ea79;
}
.header_email { color: #f2ea79; text-align: right; border-left: solid }
.header_red {
background: #E5000A;
color: #ffffff;
@ -52,6 +64,11 @@ h2 {
text-align: right;
}
.logo {
color: #f2ea79;
font-weight: bold;
font-size: 150%;
}
.logo_white { color: #fff; }
.logo_black { color: #000; }
#logo-accounting { color: red; }
@ -221,10 +238,23 @@ font-weight: 400;
}
/* contact list */
.contact-summary {
.contact_summary {
background: #f2ea79;
border-bottom-color: #999999;
border-bottom-style: dotted;
border-bottom-width: 1px;
padding-top: 5px;
padding-bottom: 5px;
}
.name_summary {
font-size: 150%;
font-weight: bold;
}
/* The avatar in the summary overview. */
.avatar_summary {
padding-left: 3px;
}
/* Styles for entry forms. */