Unify stylesheets.

kkosuge · Dec 11, 2011 · 958ae61 · 958ae61
1 parent 66f003b
commit 958ae61
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -3,6 +3,5 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require twitter/bootstrap
  *= require_tree . 
-*/
+*/
diff --git a/app/assets/stylesheets/bootstrap.css.less b/app/assets/stylesheets/bootstrap.css.less
diff --git a/app/assets/stylesheets/undersky.css.scss → app/assets/stylesheets/undersky.css.less b/app/assets/stylesheets/undersky.css.scss → app/assets/stylesheets/undersky.css.less
@@ -1,3 +1,12 @@
+// Bootstrap
+@import "twitter/bootstrap";
+
+// Baseline grid
+@basefont:          13px;
+@baseline:          18px;
+
+// Griditude
+@gridColumns:       15;
 
 // Topbar
 .topbar {
@@ -17,10 +26,10 @@
   a {
     &:focus {
       outline: 0;
-      border-color: #0069d6;
+      border-color: @linkColor;
     }
     &.focused {
-      border-color: #f89406;
+      border-color: @orange;
     }
   }
 }
@@ -32,7 +41,7 @@
     background-color: whiteSmoke;
     .modal-header,
     .modal-body {
-      background-color: white;
+      background-color: @white;
     }
   }
   &.media-panel {
@@ -54,9 +63,6 @@
         display: block;
       }
     }
-    .created_time {
-      color: gray;
-    }
   }
   &.create-comment {
     form textarea {
@@ -119,6 +125,9 @@
     font-weight: bold;
   }
 }
+.created-time {
+  color: @gray;
+}
 .delete {
   color: gray;
   font-weight: bold;

diff --git a/app/views/layouts/_comment.html.erb b/app/views/layouts/_comment.html.erb
@@ -5,7 +5,7 @@
   <span class="text">
     <%= emoji_tag tags_tag comment.text %>
   </span>
-  <span class="created_time">
+  <span class="created-time">
     <%= Time.at(comment.created_time.to_i).to_pretty %>
   </span>
   <% if authenticated? && (mine?(comment.from.id) || (photo && mine?(photo.user.id))) %>

diff --git a/app/views/layouts/_media-panel.html.erb b/app/views/layouts/_media-panel.html.erb
@@ -35,7 +35,7 @@
       <span class="text">
         <%= emoji_tag tags_tag caption_text p %>
       </span>
-      <span class="created_time">
+      <span class="created-time">
         <%= Time.at(p.created_time.to_i).to_pretty %>
       </span>
     </div>