updaste

neekey · Mar 26, 2012 · 2229364 · 2229364
1 parent 6e2733b
commit 2229364
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 22 deletions.
diff --git a/public/css/editor.css b/public/css/editor.css
@@ -7,10 +7,8 @@ form{background:white;}
 .meta-box{padding:0 10px;color:#999;margin-bottom:1px;}
 .edit-content{float:right;}
 .desc-box{padding:10px 20px;background:#DDD;margin:20px 0;max-width:560px;}
-.content-bd{margin:20px 0;max-width:600px;padding-left:20px;font-size:14px;}
-.content-bd h1{font-size:20px;font-weight:bold;margin:20px 0 15px 0;}
-.content-bd h2{color:#9d261d;font-size:18px;font-weight:normal;line-height:1.5;margin:20px 0 15px 0;}
-.content-bd h3{font-size:14px;}
+.content-bd{margin:20px 0;max-width:600px;padding-left:20px;}
+.content-bd blockquote{border-left:5px solid #adadad;}
 .subtext{color:#999;}
 .dsq-comment-text{color:#333;}
 .textarea-container{width:900px;margin:0 auto;position:relative;}.textarea-container .form-actions{margin:0 0 10px 0;text-align:right;}

diff --git a/public/css/mods/share-show.less b/public/css/mods/share-show.less
@@ -22,26 +22,30 @@
     margin:20px 0;
     max-width:600px;
     padding-left:20px;
-    font-size:14px;
+    //font-size:14px;
     h1, h2, h3, h4, h5 {
     }
 
     h1 {
-        font-size:20px;
-        font-weight:bold;
-        margin:20px 0 15px 0;
+        //font-size:20px;
+        //font-weight:bold;
+        //margin:20px 0 15px 0;
     }
 
     h2 {
 
-        color:@red;
-        font-size:18px;
-        font-weight:normal;
-        line-height:1.5;
-        margin:20px 0 15px 0;
+        //color:@red;
+        //font-size:18px;
+        //font-weight:normal;
+        //line-height:1.5;
+        //margin:20px 0 15px 0;
     }
     h3 {
-        font-size:14px;
+        //font-size:14px;
         //margin:20px 0 16px 0;
     }
+    blockquote {
+        border-left:5px solid #adadad;
+    }
 }
+
diff --git a/public/css/share.css b/public/css/share.css
@@ -20,10 +20,8 @@ form{background:white;}
 .meta-box{padding:0 10px;color:#999;margin-bottom:1px;}
 .edit-content{float:right;}
 .desc-box{padding:10px 20px;background:#DDD;margin:20px 0;max-width:560px;}
-.content-bd{margin:20px 0;max-width:600px;padding-left:20px;font-size:14px;}
-.content-bd h1{font-size:20px;font-weight:bold;margin:20px 0 15px 0;}
-.content-bd h2{color:#9d261d;font-size:18px;font-weight:normal;line-height:1.5;margin:20px 0 15px 0;}
-.content-bd h3{font-size:14px;}
+.content-bd{margin:20px 0;max-width:600px;padding-left:20px;}
+.content-bd blockquote{border-left:5px solid #adadad;}
 .ratelist{*zoom:1;*zoom:1;margin:0;}.ratelist:before,.ratelist:after{display:table;content:"";}
 .ratelist:after{clear:both;}
 .ratelist:before,.ratelist:after{display:table;content:"";}
@@ -88,6 +86,12 @@ textarea{min-height:60px;}
 .chooser h3{margin:10px 0;}
 .chooser .share-list{background:#fff;height:280px;clear:both;}
 .chooser .search-box{float:right;}
+.action-box .bd{*zoom:1;*zoom:1;padding:30px 0;}.action-box .bd:before,.action-box .bd:after{display:table;content:"";}
+.action-box .bd:after{clear:both;}
+.action-box .bd:before,.action-box .bd:after{display:table;content:"";}
+.action-box .bd:after{clear:both;}
+.action-box .bd .btn-large{float:left;margin-right:10px;}
+.loading{text-align:center;padding:40px;}
 .latest .accordion-group{background:#fff;background:rgba(255, 255, 255, 0.8);}
 .latest ul{margin:0;list-style:none;}
 .latest li{padding:5px;}

diff --git a/public/css/share.less b/public/css/share.less
@@ -276,6 +276,21 @@ textarea  {
         float:right;
     }
 }
+
+.action-box .bd {
+    .clearfix();
+    padding : 30px 0;
+    .btn-large {
+        float:left;
+        margin-right:10px;
+    }
+}
+
+
+.loading {
+    text-align:center;
+    padding:40px;
+}
 //  首页近期分享
 
 .latest {

diff --git a/public/js/editor.js b/public/js/editor.js
@@ -37,10 +37,11 @@ $(function(){
 
     function insertInNewLine(text){
         var position = editor.getCursorPosition();
-        position.row++;
+        position.row ++;
         position.column = 0;
         session.insert(position, text+'\n');
         editor.moveCursorTo(position.row, text.length);
+        editor.selection.clearSelection();
     };
 
     function postContent(save){

diff --git a/public/js/main.js b/public/js/main.js
@@ -1,3 +1,5 @@
+/*jslint devel: false, browser: true, passfail: true, nomen: true, maxerr: 50, indent: 4 */
+/*global seajs */
 seajs.config({
     alias : {
         'jquery' : 'jquery/1.7.1/jquery',
@@ -10,8 +12,8 @@ seajs.config({
     },
 
     preload : [
-        Function.prototype.bind?'':'es5-safe',
-        this.JSON?'':'json'
+        Function.prototype.bind ? '' : 'es5-safe',
+        this.JSON ? '' : 'json'
     ],
 
     debug : 'false'

diff --git a/public/js/tags.js b/public/js/tags.js
@@ -4,7 +4,6 @@
 define(function(require, exports, module){
     var $ = require('jquery'),
         mustache = require('mustache');
-
     module.exports = function(config){
         var tmpl = $(config.template).html();
         $.ajax({