Fixed invalid markup and cleaned up issue styling.

christydennison · Apr 19, 2012 · f0837c5 · f0837c5
1 parent ac80812
commit f0837c5
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 71 deletions.
diff --git a/app/assets/stylesheets/issues.css b/app/assets/stylesheets/issues.css
diff --git a/app/assets/stylesheets/issues.css.scss b/app/assets/stylesheets/issues.css.scss
@@ -0,0 +1,55 @@
+.reopen_issue_button {
+}
+.close_issue_button {
+}
+.issue_status {
+  font-size: 14px;
+  font-weight: bold;
+  color: white;
+  border-radius: 3px;
+  padding: 7px 10px;
+  display: block;
+  text-align: center;
+  width: 80%;
+}
+.closed_issue {
+  background-color: red;
+}
+.open_issue {
+  background-color: green;
+}
+.sensitive_issue {
+  background-color: #81C3EA;
+}
+.repository_issue {
+  margin: 5px 0;
+  padding: 0;
+  border: 1px solid #BECFA2;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  background: #E7F5D0;
+  overflow: hidden;
+
+  .title {
+    margin: 0;
+    padding: 5px;
+    font-weight: bold;
+  }
+  .author {
+    margin: 0;
+    padding: 5px;
+  }
+  .time {
+    margin: 0;
+    padding: 5px 5px 5px 1em;
+    color: #666666;
+  }
+  .edges {
+    float: right;
+    width: 130px;
+    margin: 0;
+    border-left: 1px solid #D6E8B6;
+    padding: 5px;
+  }
+}
diff --git a/app/views/issues/_issue.html.erb b/app/views/issues/_issue.html.erb
@@ -1,5 +1,5 @@
 <div class="repository_issue">
-  <dl class="edges">
+  <div class="edges">
     <% if issue.open %>
       <div class="issue_status open_issue">Open</div>
     <% else %>
@@ -11,6 +11,7 @@
       <br />
     <% end %>
     <% if issue.can_edit? current_user %>
+    <p>
       <%= link_to 'Edit', edit_profile_repository_issue_path(
               issue.repository.profile,
               issue.repository, issue), 
@@ -20,8 +21,9 @@
               issue.repository, issue), 
               confirm: 'Are you sure?', 
               method: :delete %>
+    </p>
     <% end %>
-  </dl>
+  </div>
   <div class="metadata">
     <p class="title">
       <%= link_to issue.title, profile_repository_issue_path(

diff --git a/app/views/issues/_issue_show.html.erb b/app/views/issues/_issue_show.html.erb
@@ -1,5 +1,5 @@
 <div class="repository_issue">
-  <dl class="edges">
+  <div class="edges">
     <% if issue.open %>
       <div class="issue_status open_issue">Open</div>
     <% else %>
@@ -11,14 +11,15 @@
       <br />
     <% end %>
     <% if issue.can_edit? current_user %>
+    <p>
       <%= link_to 'Edit', edit_profile_repository_issue_path(
               issue.repository.profile, issue.repository, issue),
               :method => :get %>
       <%= link_to 'Delete', profile_repository_issue_path(
               issue.repository.profile, issue.repository, issue),
               :confirm => 'Are you sure?', :method => :delete %>
-      <br />
-      <br />
+    </p>
+    <p>
       <% if issue.open %>
       <%= button_to 'Close Issue', profile_repository_issue_path(
               issue.repository.profile, issue.repository, issue,
@@ -30,8 +31,9 @@
               :issue => { :open => true }),
               :method => :put, :class => 'reopen_issue_button' %>
       <% end %>
+    </p>
     <% end %>
-  </dl>
+  </div>
   <div class="metadata">
     <p class="author">
       <%= issue_author_image issue %>