Merge pull request #131 from tadyjp/140807/kitakuni/fix_design_bug

[REVIEW] 140807/kitakuni/fix design bug

app/assets/stylesheets/flow.css.scss

@@ -63,6 +63,7 @@
   background-color: #e67e22;
   background-color: #e67e22;
   padding-top: 4px;
   padding-top: 4px;
   font-weight: 300;
   font-weight: 300;
+  @include border_radius(20px);
 }
 }
 
 
 .post-show-wrapper {
 .post-show-wrapper {

app/assets/stylesheets/lib/mod-md-editor.css.scss

@@ -19,11 +19,9 @@
   font-size: 12pt;
   font-size: 12pt;
   padding: 3px;
   padding: 3px;
   tab-size: 2;
   tab-size: 2;
-  font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'Ricty', monospace;
 }
 }
 
 
 .mod-mdEditor-preview {
 .mod-mdEditor-preview {
   min-height: 400px;
   min-height: 400px;
-  font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'Ricty', monospace;
 }
 }
 
 

app/assets/stylesheets/lib/select2.css

@@ -489,34 +489,20 @@ disabled look for disabled choices in the results dropdown
 }
 }
 
 
 .select2-container-multi .select2-choices .select2-search-choice {
 .select2-container-multi .select2-choices .select2-search-choice {
-    padding: 3px 5px 3px 18px;
+    padding: 5px 10px 5px 20px;
     margin: 3px 0 3px 5px;
     margin: 3px 0 3px 5px;
     position: relative;
     position: relative;
-
     line-height: 13px;
     line-height: 13px;
-    color: #333;
+    color: #fff;
     cursor: default;
     cursor: default;
-    border: 1px solid #aaaaaa;
-
-    border-radius: 3px;
-
-    -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
-            box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
-
+    border-radius: 20px;
+    background-color: #e67e22!important;
     background-clip: padding-box;
     background-clip: padding-box;
-
     -webkit-touch-callout: none;
     -webkit-touch-callout: none;
       -webkit-user-select: none;
       -webkit-user-select: none;
          -moz-user-select: none;
          -moz-user-select: none;
           -ms-user-select: none;
           -ms-user-select: none;
               user-select: none;
               user-select: none;
-
-    background-color: #e4e4e4;
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
-    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
-    background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
-    background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
-    background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
 }
 }
 .select2-container-multi .select2-choices .select2-search-choice .select2-chosen {
 .select2-container-multi .select2-choices .select2-search-choice .select2-chosen {
     cursor: default;
     cursor: default;
@@ -530,12 +516,12 @@ disabled look for disabled choices in the results dropdown
     width: 12px;
     width: 12px;
     height: 13px;
     height: 13px;
     position: absolute;
     position: absolute;
-    right: 3px;
-    top: 4px;
+    right: 6px;
+    top: 5px;
 
 
     font-size: 1px;
     font-size: 1px;
     outline: none;
     outline: none;
-    background: url('select2.png') right top no-repeat;
+    background: url('../close.png') center center no-repeat;
 }
 }
 
 
 .select2-container-multi .select2-search-choice-close {
 .select2-container-multi .select2-search-choice-close {

app/assets/stylesheets/templates.css.scss

@@ -91,11 +91,11 @@ $main-color: #75b3c8;
   .badge {
   .badge {
     background-color: transparent;
     background-color: transparent;
     color: #fff;
     color: #fff;
-    font-family: 'Quicksand';
-    font-weight: 300;
     letter-spacing: 0;
     letter-spacing: 0;
     border: 1px solid #fff;
     border: 1px solid #fff;
-    padding: 4px 6px;
+    padding: 4px 4px;
     margin-left: 5px;
     margin-left: 5px;
+    min-width: 20px;
+    min-height: 20px;
   }
   }
 }
 }

app/views/partials/_app_header.html.slim

@@ -42,7 +42,6 @@ nav.navbar.navbar-fixed-top.navbar-original role="navigation"
         li.dropdown
         li.dropdown
           a.dropdown-toggle data-toggle="dropdown"
           a.dropdown-toggle data-toggle="dropdown"
             = current_user.name
             = current_user.name
-            img src=current_user.image_url width="20" height="20"/
             span.badge = current_user.decorate.draft_count
             span.badge = current_user.decorate.draft_count
             b.caret
             b.caret
           ul.dropdown-menu
           ul.dropdown-menu

app/views/posts/_large_item.html.slim

@@ -16,7 +16,7 @@ a.list-group-item.post-list.mod-hover-hidden data-post-id=post.id href=post_path
           abbr.js-time-ago data-time-ago-at=post.updated_at
           abbr.js-time-ago data-time-ago-at=post.updated_at
           |.  
           |.  
           - post.tags.each do |tag|
           - post.tags.each do |tag|
-            span.label.label-success.label-tag ##{tag.name}
+            span.label.label-success.label-tag #{tag.name}
             |  
             |  
       .col-xs-4
       .col-xs-4
         small.pull-right
         small.pull-right

app/views/posts/show.html.slim

@@ -48,7 +48,7 @@
           - @post.tags.each do |tag|
           - @post.tags.each do |tag|
             span.label.label-tag
             span.label.label-tag
               a href=tag.decorate.show_path
               a href=tag.decorate.show_path
-                | ##{tag.name}
+                | #{tag.name}
             |  
             |  
 
 
         dt 指定日
         dt 指定日