Permalink
Browse files

Improve styling

  • Loading branch information...
1 parent c975819 commit 0a54129f48c93c05f4047bd7bec88d514c3b0600 @radar radar committed Jul 2, 2012
@@ -38,13 +38,21 @@ a {
color: #1B7EE0;
}
-input[type=text], textrea {
+input[type=text], input[type=email], input[type=password], textarea {
+ font-size: 125%;
+ border: 0px;
border-top: 1px solid #aaa;
border-left: 1px solid #aaa;
+ border-right: 1px solid #ddd;
+ border-bottom: 1px solid #ddd;
padding: 3px;
margin: 5px 0px;
}
+textarea {
+ resize: none;
+}
+
input[type=file] {
margin-top: 10px;
margin-bottom: 10px;
@@ -95,6 +103,12 @@ ul#projects {
}
+.project {
+ em {
+ color: #8a8a8a;
+ }
+}
+
ul#tickets {
padding: 15px;
list-style-type: none;
@@ -138,16 +152,11 @@ ul#tickets .state {
#ticket, .comment {
margin: 15px 0 15px 0;
padding: 15px;
- background: #eaeaea;
border: 1px solid #e0e0e0;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
-#ticket a {
- color: #67A300;
-}
-
#ticket menu {
float: right;
font-size: 75%;
@@ -194,14 +203,6 @@ ul#tickets .state {
text-decoration: none;
}
-.new_comment {
- padding: 15px;
- background: #eaeaea;
- color: black;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
-
.comment, .new_comment {
width: 75%;
}
View
@@ -1,5 +1,5 @@
class Project < ActiveRecord::Base
- attr_accessible :name
+ attr_accessible :name, :description
validates :name, :presence => true
@@ -3,7 +3,7 @@
<%= f.error_messages %>
<p>
<%= f.label :text %><br>
- <%= f.text_area :text %>
+ <%= f.text_area :text, :rows => 3 %>
</p>
<% authorized?(:"change states", @project) do %>
@@ -7,7 +7,7 @@
<% @projects.each do |project| %>
<li class="<%= cycle("odd", "even") %>">
<h3><%= link_to project.name, project %></h3>
- Some description goes here.
+ <%= project.description %>
</li>
<% end %>
</ul>
@@ -1,28 +1,30 @@
-<% title("TextMate 2 - Projects") %>
-<h2><%= @project.name %></h2>
-<div class='sidebar'>
- <h4>Project tasks</h4>
- <ul>
- <% authorized?("create tickets".to_sym, @project) do %>
- <li><%= link_to "New Ticket", new_project_ticket_path(@project) %></li>
- <% end %>
+<div class="project">
+ <% title("TextMate 2 - Projects") %>
+ <h2><%= @project.name %></h2>
+ <em><%= @project.description %></em>
- <% admins_only do %>
- <li><%= link_to "Edit Project", edit_project_path(@project) %></li>
- <li><%= link_to "Delete Project", project_path(@project), :method => :delete,
- :confirm => "Are you sure you want to delete this project?" %></li>
- <% end %>
- </ul>
-</div>
+ <div class='sidebar'>
+ <ul>
+ <% authorized?("create tickets".to_sym, @project) do %>
+ <li><%= link_to "New Ticket", new_project_ticket_path(@project) %></li>
+ <% end %>
+ <% admins_only do %>
+ <li><%= link_to "Edit Project", edit_project_path(@project) %></li>
+ <li><%= link_to "Delete Project", project_path(@project), :method => :delete,
+ :confirm => "Are you sure you want to delete this project?" %></li>
+ <% end %>
+ </ul>
+ </div>
-<ul id='tickets'>
- <% @project.tickets.each do |ticket| %>
- <li>
- <%= render ticket.state if ticket.state %>
- #<%= ticket.id %> - <%= link_to ticket.title, [@project, ticket] %>
- </li>
- <% end %>
-</ul>
+ <ul id='tickets'>
+ <% @project.tickets.each do |ticket| %>
+ <li>
+ <%= render ticket.state if ticket.state %>
+ #<%= ticket.id %> - <%= link_to ticket.title, [@project, ticket] %>
+ </li>
+ <% end %>
+ </ul>
+</div>
@@ -5,8 +5,8 @@
<%= f.text_field :title %>
</p>
<p>
- <%= f.label :description %><br>
- <%= f.text_area :description %>
+ <%= f.label :description %><br />
+ <%= f.text_area :description, :rows => 10 %>
</p>
<% number = 0 %>
<div id='files'>
@@ -1,5 +1,6 @@
<div id='ticket'>
<h2><%= @ticket.title %></h2>
+ <small>Created by <%= @ticket.user.email %></small><br>
<% authorized?("edit tickets", @project) do %>
<%= link_to "Edit Ticket", [:edit, @project, @ticket] %>
<% end %>
@@ -11,12 +12,9 @@
:confirm => "Are you sure you want to delete this ticket?" %>
<% end %>
- <span id='author'>Created by <%= @ticket.user.email %></span>
<%= render @ticket.state if @ticket.state %>
<%= simple_format(@ticket.description) %>
- <small>Created by <%= @ticket.user.email %></small>
- <%= simple_format(@ticket.description) %>
<% if @ticket.assets.exists? %>
<h3>Attached Files</h3>
View
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120610043514) do
+ActiveRecord::Schema.define(:version => 20120630063001) do
create_table "assets", :force => true do |t|
t.string "asset_file_name"
@@ -44,8 +44,9 @@
create_table "projects", :force => true do |t|
t.string "name"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ t.text "description"
end
create_table "states", :force => true do |t|

0 comments on commit 0a54129

Please sign in to comment.