Merge branch 'ui_work' of github.com:Bushido/Kandan into ui_work

kandanapp · Mar 30, 2012 · f945c2f · f945c2f
2 parents 6001c75 + 41b02b8
commit f945c2f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 4 deletions.
diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png
diff --git a/app/assets/images/page_bg.png b/app/assets/images/page_bg.png
diff --git a/app/assets/stylesheets/_activity.scss b/app/assets/stylesheets/_activity.scss
@@ -25,12 +25,14 @@
       float: left;
       width: 100%;
       margin-bottom: 4px;
+      font-size: 14px;
     }
 
     .content {
       float: left;
       width: 80%;
       color: #797D7F;
+      font-size: 14px;
 
       .image-preview, .youtube-preview {
         a { width: 100%; }
@@ -52,6 +54,7 @@
       float: left;
       width: 20%;
       text-align: right;
+      font-size: 11px;
 
       span {
         @include border-radius(4px);

diff --git a/app/assets/stylesheets/_base.scss b/app/assets/stylesheets/_base.scss
@@ -12,6 +12,7 @@
   top: 0px;
   left: 0px;
   z-index: 1;
+  margin: 5px;
 }
 
 html {
@@ -20,6 +21,7 @@ html {
 
 body {
   background: $page-bg;
+  background-image: url("/assets/page_bg.png");
   height: 100%;
   min-height: 100%;
   font-size: 13px;

diff --git a/app/assets/stylesheets/_chat_area.scss b/app/assets/stylesheets/_chat_area.scss
@@ -19,9 +19,9 @@
 
 
 .ui-tabs {
+  @include border-radius(0px);
   padding: 0px;
   margin-top: 0px;
-  @include border-radius(0px);
   border: none;
 
   .ui-tabs-nav {
@@ -32,7 +32,11 @@
     top: 0px;
 
     li:first-child {
-      margin-left: 50px;
+      margin-left: 90px;
+    }
+
+    li a {
+      font-size: 14px;
     }
 
     .ui-tab-selected {
@@ -129,5 +133,6 @@
     padding: 0px;
     margin: 0px;
     height: 40px;
+    font-size: 16px;
   }
 }
diff --git a/app/assets/stylesheets/_sidebar.scss b/app/assets/stylesheets/_sidebar.scss
@@ -1,7 +1,6 @@
 .sidebar {
   min-height: 100%;
   height: 100%;
-  background: $sidebar-bg;
   width: $sidebar-width;
   float: left;
   position: fixed;

diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
@@ -6,7 +6,7 @@
 
 
 
-<div class="logo">Kandan</div>
+<%= image_tag "logo.png", :class=>"logo" %>
 
 <div class="main-area"></div>
 <div class="sidebar">