历史消息

settingview/src/less/app/app.bootstrap.less

@@ -3,7 +3,8 @@
     &.input-sm,
     .input-group-sm &,
     .form-group-sm & {
-      line-height: 1em;
+      line-height: normal;
+      font-size: 12px;
       padding: 2px 4px;
       height: 24px;
     }
@@ -14,7 +15,7 @@
 .form-group-sm .form-control + .form-control-feedback {
   width: 1em;
   height: 1em;
-  line-height: 1em;
+  line-height: normal;
   top: 5px;
   right: 20px;
 }
@@ -39,4 +40,4 @@
       padding: 5px 10px;
     }   
   }
-}
+}

common/app.utilities.less

@@ -1,3 +1,42 @@
+@import "../common/mixins/hide-text.less";
+@import "../common/mixins/opacity.less";
+@import "../common/mixins/image.less";
+@import "../common/mixins/labels.less";
+@import "../common/mixins/reset-filter.less";
+@import "../common/mixins/resize.less";
+@import "../common/mixins/responsive-visibility.less";
+@import "../common/mixins/size.less";
+@import "../common/mixins/tab-focus.less";
+@import "../common/mixins/reset-text.less";
+@import "../common/mixins/text-emphasis.less";
+@import "../common/mixins/text-overflow.less";
+@import "../common/mixins/vendor-prefixes.less";
+
+// Components
+@import "../common/mixins/alerts.less";
+@import "../common/mixins/buttons.less";
+@import "../common/mixins/panels.less";
+@import "../common/mixins/pagination.less";
+@import "../common/mixins/list-group.less";
+@import "../common/mixins/nav-divider.less";
+@import "../common/mixins/forms.less";
+@import "../common/mixins/progress-bar.less";
+@import "../common/mixins/table-row.less";
+
+// Skins
+@import "../common/mixins/background-variant.less";
+@import "../common/mixins/border-radius.less";
+@import "../common/mixins/gradients.less";
+
+// Layout232
+@import "../common/mixins/clearfix.less";
+@import "../common/mixins/center-block.less";
+@import "../common/mixins/nav-vertical-align.less";
+@import "../common/mixins/grid-framework.less";
+@import "../common/mixins/grid.less";
+@import "../common/app.bootstrap.less";
+@import "../common/app.variables.less";
+
 * {
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;

settingview/Gulpfile.js

@@ -19,13 +19,13 @@ var paths = {
     frontend: {
         scripts: [
             '../common/*.js',
-            'src/js/**/*.js'   
+            'src/js/**/*.js'
         ],
-        styles: [            
-			'temp/css/*'    
+        styles: [
+            'temp/css/*'
         ],
         less: [
-            // '../common/*.less',
+            //'../common/*.less',
             'src/less/*.less'
         ],
         imgs: [
@@ -41,7 +41,7 @@ var distpath = '../dist/settingview';
 // console.log('Current directory: '+process.cwd());
 
 gulp.task('app-css', function() {
-    del([distpath + '/app-*.css'],{cwd:process.cwd(),force:true});
+    del([distpath + '/app-*.css'], { cwd: process.cwd(), force: true });
     return gulp.src(paths.frontend.less)
         .pipe(less())
         .pipe(concat('app.css'))
@@ -52,7 +52,7 @@ gulp.task('app-css', function() {
         .pipe(gulp.dest('temp/manifest'));
 });
 
-gulp.task('rev', ['app-css','js'], function() {    
+gulp.task('rev', ['app-css', 'js'], function() {
     return gulp.src(['temp/manifest/*.json', 'src/html/index.html'])
         .pipe(revCollector())
         .pipe(gulp.dest(distpath));
@@ -60,14 +60,14 @@ gulp.task('rev', ['app-css','js'], function() {
 
 gulp.task('template', function() {
     return gulp.src(paths.frontend.template)
-        .pipe(templateCache('templates.js', { module:'templatescache', standalone:true, root: 'templates/' }))
+        .pipe(templateCache('templates.js', { module: 'templatescache', standalone: true, root: 'templates/' }))
         .pipe(gulp.dest('src/js'));
 });
 
 gulp.task('js', ['template'], function() {
     // Cleanup old assets
-    del([distpath+ '/app-*.js'], {cwd:process.cwd(),force:true});
-    
+    del([distpath + '/app-*.js'], { cwd: process.cwd(), force: true });
+
     return gulp.src(paths.frontend.scripts)
         .pipe(concat('app.js'))
         .pipe(minifyjs())
@@ -89,7 +89,7 @@ gulp.task('js', ['template'], function() {
 
 gulp.task('build', ['app-css', 'template', 'js', 'rev']);
 
-gulp.task('watch', function(){
+gulp.task('watch', function() {
     gulp.watch('src/less/**/*.less', ['app-css', 'rev']);
     gulp.watch('src/html/**/*.html', ['rev']);
     gulp.watch('src/templates/**/*.html', ['template', 'js', 'rev']);

settingview/src/less/app.less

@@ -1,47 +1,5 @@
 // Core variables and mixins
 
-
-// Mixins
-// --------------------------------------------------
-
 // Utilities
-@import "mixins/hide-text.less";
-@import "mixins/opacity.less";
-@import "mixins/image.less";
-@import "mixins/labels.less";
-@import "mixins/reset-filter.less";
-@import "mixins/resize.less";
-@import "mixins/responsive-visibility.less";
-@import "mixins/size.less";
-@import "mixins/tab-focus.less";
-@import "mixins/reset-text.less";
-@import "mixins/text-emphasis.less";
-@import "mixins/text-overflow.less";
-@import "mixins/vendor-prefixes.less";
-
-// Components
-@import "mixins/alerts.less";
-@import "mixins/buttons.less";
-@import "mixins/panels.less";
-@import "mixins/pagination.less";
-@import "mixins/list-group.less";
-@import "mixins/nav-divider.less";
-@import "mixins/forms.less";
-@import "mixins/progress-bar.less";
-@import "mixins/table-row.less";
-
-// Skins
-@import "mixins/background-variant.less";
-@import "mixins/border-radius.less";
-@import "mixins/gradients.less";
-
-// Layout232
-@import "mixins/clearfix.less";
-@import "mixins/center-block.less";
-@import "mixins/nav-vertical-align.less";
-@import "mixins/grid-framework.less";
-@import "mixins/grid.less";
 @import "../../../common/app.utilities.less";
-@import "app/app.variables.less";
-@import "app/app.bootstrap.less";
-@import "app/app.main.less";
+@import "app.main.less";

talkview/Gulpfile.js

@@ -19,13 +19,13 @@ var paths = {
     frontend: {
         scripts: [
             '../common/*.js',
-            'src/js/**/*.js'   
+            'src/js/**/*.js'
         ],
-        styles: [            
-			'temp/css/*'    
+        styles: [
+            'temp/css/*'
         ],
         less: [
-            // '../common/*.less',
+            //'../common/*.less',
             'src/less/*.less'
         ],
         imgs: [
@@ -41,7 +41,7 @@ var distpath = '../dist/talkview';
 // console.log('Current directory: '+process.cwd());
 
 gulp.task('app-css', function() {
-    del([distpath + '/app-*.css'],{cwd:process.cwd(),force:true});
+    del([distpath + '/app-*.css'], { cwd: process.cwd(), force: true });
     return gulp.src(paths.frontend.less)
         .pipe(less())
         .pipe(concat('app.css'))
@@ -52,7 +52,7 @@ gulp.task('app-css', function() {
         .pipe(gulp.dest('temp/manifest'));
 });
 
-gulp.task('rev', ['app-css','js'], function() {    
+gulp.task('rev', ['app-css', 'js'], function() {
     return gulp.src(['temp/manifest/*.json', 'src/html/index.html'])
         .pipe(revCollector())
         .pipe(gulp.dest(distpath));
@@ -60,14 +60,14 @@ gulp.task('rev', ['app-css','js'], function() {
 
 gulp.task('template', function() {
     return gulp.src(paths.frontend.template)
-        .pipe(templateCache('templates.js', { module:'templatescache', standalone:true, root: 'templates/' }))
+        .pipe(templateCache('templates.js', { module: 'templatescache', standalone: true, root: 'templates/' }))
         .pipe(gulp.dest('src/js'));
 });
 
 gulp.task('js', ['template'], function() {
     // Cleanup old assets
-    del([distpath+ '/app-*.js'], {cwd:process.cwd(), force:true});
-    
+    del([distpath + '/app-*.js'], { cwd: process.cwd(), force: true });
+
     return gulp.src(paths.frontend.scripts)
         .pipe(concat('app.js'))
         // .pipe(minifyjs())
@@ -89,7 +89,7 @@ gulp.task('js', ['template'], function() {
 
 gulp.task('build', ['app-css', 'template', 'js', 'rev']);
 
-gulp.task('watch', function(){
+gulp.task('watch', function() {
     gulp.watch('src/less/**/*.less', ['app-css', 'rev']);
     gulp.watch('src/html/**/*.html', ['rev']);
     gulp.watch('src/templates/**/*.html', ['template', 'js', 'rev']);

talkview/src/less/app.less

@@ -1,3 +1,2 @@
-// Core variables and mixins
 @import "../../../common/app.utilities.less";
 @import "app.main.less";

talkview/src/less/app.main.less

@@ -471,9 +471,9 @@ body {
             font-size: 12px;
         }
         button {
-            height: 25px;
+            height: 24px;
             width: 70px;
-            padding: 0px;
+            padding: 2px 4px;
             margin: 20px 8px;
         }
     }
@@ -607,8 +607,6 @@ body {
             .form-control {
                 margin-top: 5px;
                 margin-left: -20px;
-                height: 25px;
-                font-size: 12px;
                 padding-left: 10px;
                 cursor: default;
             }
@@ -638,9 +636,9 @@ body {
         padding-right: 2px;
         button {
             float: left;
-            height: 25px;
+            height: 24px;
             width: 75px;
-            padding: 0px;
+            padding: 2px 4px;
             margin: 5px 10px;
             font-size: 12px;
             background: #5A98DE;
@@ -651,7 +649,7 @@ body {
         }
         >span {
             float: left;
-            margin-top: 9px;
+            margin-top: 6px;
             color: #007FE0;
             font-size: 12px;
         }
@@ -666,9 +664,6 @@ body {
                 background: #F5FAFE;
             }
             >input {
-                height: 25px;
-                padding: 2px;
-                font-size: 11px;
                 width: 101%;
             }
             .glyphicon-refresh {
@@ -758,7 +753,7 @@ body {
 }
 
 .historymsg {
-    width:800px;
+    width:100%;
     height: 100%;
     margin: 0px auto;
     background: #F5F5F5;
@@ -766,7 +761,7 @@ body {
     font-family: "微软雅黑","宋体";
     border-bottom: 1px solid #ddd;
     #head{
-        height: 45px;
+        height: 40px;
         .selectData {
             float: right;
             margin-top: 9px;
@@ -774,30 +769,28 @@ body {
             width: 200px;
             >span {
                 float: left;
-                margin-top: 7px;
-                font-size: 13px;
+                margin-top: 4px;
+                font-size: 12px;
             }
             >select {
                 float: right;
                 width: 140px;
-                height: 30px;
-                font-size: 12px;
             }
         }
         .input-group {
             float: right;
             margin-top: 9px;
             margin-right: 120px;
-            height: 30px;
+            height: 24px;
             width: 300px;
             .form-control {
-                height: 30px;
                 padding-left: 5px;
-                font-size: 12px;
             }
             .btn-default{
-                height: 30px;
+                padding: 2px 12px;
+                height: 24px;
                 width: 75px;
+                font-size: 12px;
                 text-align: left;
                 background: #eee;
                 &:hover,&:active,&:focus {
@@ -808,7 +801,7 @@ body {
             }
             .dropdown-toggle {
                 margin-left: -25px;
-                height: 28px;
+                height: 22px;
                 width: 10px;
                 border: none;
                 outline: none;
@@ -826,10 +819,10 @@ body {
             }
         }
         .glyphicon-refresh {
-            margin:12px -630px 0px 0px;
+            margin:8px -630px 0px 0px;
             float: right;
             font-size:12px;
-            height: 2em;
+            height: 24px;
             width: 30px;
             border-radius: 3px;
             color: white;
@@ -844,8 +837,8 @@ body {
     #leftList {
         background: #F5F5F5;
         float: left;
-        width: 200px;
-        height: 550px;
+        width: 220px;
+        height: 560px;
         border-right: 1px solid #ddd;
         font-size: 12px;
         font-family: "微软雅黑","宋体";
@@ -880,8 +873,8 @@ body {
                     i {
                         margin-top: 2px;
                         font-weight: normal;
-                        font-size: 10px;
-                        color: #666;
+                        font-size: 12px;
+                        color: #888;
                     }
                 }
                 .panel-collapse {
@@ -892,12 +885,12 @@ body {
                     }
                     ul {
                         list-style: none;
-                        margin: -15px 0px -11px -55px;
+                        margin: -15px 0px -11px -60px;
                         .activeBackground {
                             background: #ddd;
                         }
                         >li {
-                            width: 210px;
+                            width: 225px;
                             height: 25px;
                             font-family: "微软雅黑","宋体";
                             padding-top:3px;
@@ -941,9 +934,9 @@ body {
     }
     #media {
         overflow-y: auto;
-        margin-left: 200px;
-        height: 500px;
-        width: 600px;
+        margin-left: 220px;
+        margin-right: 2px;
+        height: 510px;
         padding-bottom: 10px;
         background: #FFF;
         border-bottom: 1px solid #eee;
@@ -952,12 +945,12 @@ body {
             padding-left: 11px;
             margin-top: 2px;
             margin-bottom: -8px;
+            margin-right: 5px;
         }
     }
     #paginationTab {
+        margin-left: 220px;
         height: 50px;
-        width: 600px;
-        margin-left: 200px;
         background: #FFF;
         text-align: right;
         >span {

talkview/src/templates/historyMsg.html

@@ -1,7 +1,7 @@
 <div class="historymsg">
     <div id="head">
         <div class="input-group">
-            <input type="text" class="form-control" aria-label="..." placeholder="请输入搜索关键字. . .">
+            <input type="text" class="form-control input-sm" aria-label="..." placeholder="请输入搜索关键字. . .">
             <div class="input-group-btn">
                 <button type="button" class="btn btn-default">查找</button>
                 <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -19,7 +19,7 @@
         </div>
         <div class="selectData">
             <span>搜索范围</span>
-            <select class="form-control" ng-change="onSelectedChange()" ng-model="selectName">
+            <select class="form-control input-sm" ng-change="onSelectedChange()" ng-model="selectName">
                 <option>全部</option>
                 <option>最近一周</option>
                 <option>最近一个月</option>
@@ -42,7 +42,7 @@
                         <ul>
                             <li class="li" ng-click="actived($event)">
                                 <label class="lf">
-                                    <img src="../img/自己头像.png"><span>郑连根</span>
+                                    <img src="../img/自己头像.png"><span>杭州测试王巧巧(ls_wqq)</span>
                                 </label>
                             </li>
                             <li class="li" ng-click="actived($event)">

talkview/src/templates/smsSend.html

@@ -1,7 +1,7 @@
 <div class="smsView">
     <div id="sms-set">
         <span id="dateInput">
-            <input type="text" disabled class="form-control" readonly="readonly" onClick="WdatePicker({onpicked: function(){$(this).trigger('change')},dateFmt:'yyyy/MM/dd HH:mm:ss',isShowClear:false,minDate:'%y/%M/%d 00:00:00',lang:'zh-cn'})" ng-model="selectDate"/>
+            <input type="text" disabled class="form-control input-sm" readonly="readonly" onClick="WdatePicker({onpicked: function(){$(this).trigger('change')},dateFmt:'yyyy/MM/dd HH:mm:ss',isShowClear:false,minDate:'%y/%M/%d 00:00:00',lang:'zh-cn'})" ng-model="selectDate"/>
             <span>
                 <i class="glyphicon glyphicon-calendar"></i>
             </span>
@@ -22,7 +22,7 @@
     <div id="sms-mob">
         <div class="input-group">
             <span class="input-group-addon" id="basic-addon3">手机号码</span>
-            <input type="text" class="form-control" id="basic-url" aria-describedby="basic-addon3" placeholder="请输入接收短信的手机号码，多个号码之间以逗号隔开. . ." ng-blur="mobReset()" ng-model="inputMob">
+            <input type="text" class="form-control input-sm" id="basic-url" aria-describedby="basic-addon3" placeholder="请输入接收短信的手机号码，多个号码之间以逗号隔开. . ." ng-blur="mobReset()" ng-model="inputMob">
             <span class="input-group-addon" ng-click="mobReset()" title="自动排序"><a class="glyphicon glyphicon-refresh"></a></span>
         </div>
     </div>