群组界面

common/app.bootstrap.less

@@ -7,6 +7,10 @@
       font-size: 12px;
       padding: 2px 4px;
       height: 24px;
+      &:focus {
+        border: 1px solid #5bc0de;
+        outline: none;
+      }
     }
 }
 
@@ -56,3 +60,20 @@
     }
   }
 }
+
+/*&.btn {
+  &.btn-primary,
+  &.btn-success {
+    &:hover,&:focus {
+          outline: none;
+          background: #5bc0de;
+          border: #5bc0de;
+      }
+      &:active, .open>.dropdown-toggle.btn-primary{
+          border: none;
+          outline: none;
+          background-color: #439BB2;
+          border-color: #439BB2;
+      }
+  }
+}*/

common/app.variables.less

@@ -14,7 +14,7 @@
 @gray-light:             lighten(@gray-base, 46.7%); // #777
 @gray-lighter:           lighten(@gray-base, 93.5%); // #eee
 
-@brand-primary:         #5A98DE; // #337ab7
+@brand-primary:         #5bc0de; // #337ab7
 @brand-success:         #5cb85c;
 @brand-info:            #5bc0de;
 @brand-warning:         #f0ad4e;

talkview/src/js/controller/groupsinfoController.js

@@ -2,7 +2,7 @@
 
 angular.module('appMessage').controller('GroupsinfoController', ['$scope', function($scope) {
     //lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', '_Register', '', $scope);
-
+    $scope.searchClass = "允许任何人加入该群";
     $scope.actived = function($event) {
         var activeClick = $($event.target);
         console.log(activeClick);

talkview/src/less/app.main.less

@@ -76,7 +76,7 @@
         font-size: 11px;
         margin-top: 2px;
         margin-left: 5px;
-        color: #007FFF;
+        color: #439BB2;
         >span {
             font-size: 12px;
             margin-top: 2px;
@@ -646,20 +646,22 @@ body {
             >span {
                 padding-right: 2px;
             }
-            &:hover,&:active {
-                border: none;
+            &:hover,&:focus {
                 outline: none;
-                background: #439BB2;
+                background: #5bc0de;
+                border: #5bc0de;
             }
-            &:focus {
+            &:active, .open>.dropdown-toggle.btn-primary{
                 border: none;
-                outline: 1px solid #3E97EB;
+                outline: none;
+                background-color: #439BB2;
+                border-color: #439BB2;
             }
         }
         >span {
             float: left;
             margin-top: 6px;
-            color: #007FE0;
+            color: #439BB2;
             font-size: 12px;
         }
     }
@@ -676,7 +678,7 @@ body {
                 width: 101%;
             }
             .glyphicon-refresh {
-                color: green;
+                color: #439BB2;
                 float: right;
                 text-decoration:none;
                 margin-top: 0px;
@@ -726,10 +728,16 @@ body {
                 text-align: left;
                 background: #5bc0de;
                 border: #5bc0de;
-                &:active,&:focus {
-                    border: none;
-                    outline: 1px solid #3E97EB;
+                &:hover,&:focus {
+                    outline: none;
                     background: #5bc0de;
+                    border: #5bc0de;
+                }
+                &:active, .open>.dropdown-toggle.btn-success {
+                    border: none;
+                    outline: none;
+                    background-color: #439BB2;
+                    border-color: #439BB2;
                 }
             }
             .dropdown-toggle {
@@ -790,6 +798,8 @@ body {
                 width: 140px;
                 >option {
                     margin-top: 5px;
+                    border: none;
+                    outline: 1px solid #5bc0de;
                 }
             }
         }
@@ -1020,6 +1030,22 @@ body {
         >ul {
             margin: 8px;
         }
+        .pagination-sm {
+            li >a {
+                color: #439BB2;
+            }
+            li.active >a {
+                color: #FFF;
+                border: 1px solid #5bc0de;
+                background: #5bc0de;
+            }
+            li.disabled >a{
+                color: #888;
+                &:focus{
+                    outline: none;
+                }
+            }
+        }
     }
 }
 
@@ -1030,7 +1056,7 @@ body {
     background: #FFF;
     #tablist {
         margin: auto;
-        width: 450px;
+        width: 440px;
         height: 55px;
         .nav {
             padding-top: 20px;
@@ -1041,12 +1067,13 @@ body {
             margin: 5px auto;
             #form1 {
                 background: #FFF;/* Opera 11.1 - 12.0 */
+                white-space: nowrap; /* 自适应宽度,不换行*/
                 overflow: hidden;
                 #icoImg {
                     float: left;
                     width: 80px;
                     height: 80px;
-                    margin: 10px 0px 10px 30px;
+                    margin: 10px 0px 10px 25px;
                     border-radius: 100%;
                     border:2px solid #ccc;
                     background: #96CEDF;
@@ -1071,57 +1098,140 @@ body {
                     text-align: left;
                     font-family: "微软雅黑","宋体";
                     background: #FFF;
-                    color: #666;
+                    color: #888;
                     font-size: 12px;
-                    white-space: nowrap; /* 自适应宽度,不换行*/
                     >input {
                         margin-left: 7px;
                         border: none;
                         outline: none;
-                        color: #444;
+                        color: #666;
                         background: #FFF;
-                        width: 88%;
+                        width: 80%;
                         white-space: nowrap;
                         overflow: hidden;
                         text-overflow: ellipsis;
                     }
                 }
+                #groupClass {
+                    margin: 45px 5px 30px 20px;
+                    color: #666;
+                    font-size: 16px;
+                    font-weight: 500;
+                    font-family: "微软雅黑","宋体";
+                    >span {
+                        float: left;
+                        margin-left: 10px;
+                        margin-right: 15px;
+                    }
+                    .input-sm {
+                        cursor: default;
+                        width: 180px;
+                        font-weight: 500;
+                        font-family: "微软雅黑","宋体";
+                    }
+                }
                 #groupIntroduction {
-                    height: 100px;
-                    margin: 70px 5px 0px 30px;
-                    color: #444;
+                    height: 110px;
+                    margin: 0px 5px 0px 20px;
+                    color: #666;
                     font-size: 16px;
                     font-weight: 500;
                     font-family: "微软雅黑","宋体";
                     >span {
                         float: left;
-                        margin: 5px
+                        margin-left: 10px;
                     }
                 }
                 #groupNotice {
-                    height: 100px;
-                    margin: 0px 5px 0px 30px;
-                    color: #444;
+                    height: 110px;
+                    margin: 10px 5px 0px 20px;
+                    color: #666;
                     font-size: 16px;
                     font-weight: 500;
                     font-family: "微软雅黑","宋体";
                     >span {
                         float: left;
-                        margin: 5px
+                        margin-left: 10px;
                     }
                 }
                 .text-message {
+                    white-space: normal;
+                    overflow-y: auto; 
+                    height: 100px;
                     width: 330px;
                     float: left;
                     padding: 5px;
+                    color: #444;
                     font-size: 12px;
                     font-weight: 500;
                     font-family: "微软雅黑","宋体";
                 }
             }
+            #form3 {
+                >div {
+                    margin: 30px 40px 20px 40px;
+                    line-height: normal;
+                    white-space: nowrap; /* 自适应宽度,不换行*/
+                    overflow: hidden;
+                    font-family: "微软雅黑","宋体";
+                    font-size: 12px;
+                }
+                >div>span {
+                    margin: 50px auto;
+                    color: #666;
+                    font-size: 14px;
+                    font-weight: 500;
+                }
+                .input-sm {
+                    width: 270px;
+                    float: right;
+                    margin-right: 80px;
+                    font-weight: 500;
+                    font-family: "微软雅黑","宋体";
+                }
+                .text-message {
+                    white-space: normal;
+                    overflow-y: auto; 
+                    width: 300px;
+                    height: 80px;
+                    float: right;
+                    margin-right: 50px;
+                    margin-top: 3px;
+                    padding: 2px 5px;
+                    color: #444;
+                    border: 1px solid #eee;
+                    font-weight: 500;
+                    &:focus {
+                        outline: none;
+                        border: 1px solid #5bc0de;
+                    }
+                }
+                .button-bottom{
+                    float: right;
+                    margin: 25px 90px 10px 10px;
+                    .btn-primary{
+                        line-height: normal;
+                        height: 24px;
+                        width: 75px;
+                        margin-left: 10px;
+                        padding: 2px 4px;
+                        font-size: 12px;
+                        background: #5bc0de;
+                        border: #5bc0de;
+                        &:hover,&:focus {
+                            outline: none;
+                            background: #5bc0de;
+                            border: #5bc0de;
+                        }
+                        &:active, .open>.dropdown-toggle.btn-primary{
+                            border: none;
+                            outline: none;
+                            background-color: #439BB2;
+                            border-color: #439BB2;
+                        }
+                    }
+                }
+            }
         }
     }
-    #set {
-        
-    }
 }

talkview/src/templates/historyMsg.html

@@ -43,27 +43,27 @@
                         <ul>
                             <li class="Li" ng-click="actived($event)">
                                 <label class="lf">
-                                    <img src="../img/自己头像.png"><span>杭州测试王巧巧(ls_wqq)</span>
+                                    <img src="../img/自己头像1.png"><span>杭州测试王巧巧(ls_wqq)</span>
                                 </label>
                             </li>
                             <li class="Li" ng-click="actived($event)">
                                 <label class="lf">
-                                    <img src="../img/自己头像.png"><span>郑连根</span>
+                                    <img src="../img/自己头像1.png"><span>郑连根</span>
                                 </label>
                             </li>
                             <li class="Li" ng-click="actived($event)">
                                 <label class="lf">
-                                    <img src="../img/自己头像.png"><span>郑连根</span>
+                                    <img src="../img/自己头像1.png"><span>郑连根</span>
                                 </label>
                             </li>
                             <li class="Li" ng-click="actived($event)">
                                 <label class="lf">
-                                    <img src="../img/自己头像.png"><span>郑连根</span>
+                                    <img src="../img/自己头像1.png"><span>郑连根</span>
                                 </label>
                             </li>
                             <li class="Li" ng-click="actived($event)">
                                 <label class="lf">
-                                    <img src="../img/自己头像.png"><span>郑连根</span>
+                                    <img src="../img/自己头像1.png"><span>郑连根</span>
                                 </label>
                             </li>
                         </ul>
@@ -82,27 +82,27 @@
                         <ul>
                             <li class="Li" ng-click="actived($event)">
                                 <label class="lf">
-                                    <img src="../img/自己头像.png"><span>郑连根</span>
+                                    <img src="../img/自己头像1.png"><span>郑连根</span>
                                 </label>
                             </li>
                             <li class="Li" ng-click="actived($event)">
                                 <label class="lf">
-                                    <img src="../img/自己头像.png"><span>郑连根</span>
+                                    <img src="../img/自己头像1.png"><span>郑连根</span>
                                 </label>
                             </li>
                             <li class="Li" ng-click="actived($event)">
                                 <label class="lf">
-                                    <img src="../img/自己头像.png"><span>郑连根</span>
+                                    <img src="../img/自己头像1.png"><span>郑连根</span>
                                 </label>
                             </li>
                             <li class="Li" ng-click="actived($event)">
                                 <label class="lf">
-                                    <img src="../img/自己头像.png"><span>郑连根</span>
+                                    <img src="../img/自己头像1.png"><span>郑连根</span>
                                 </label>
                             </li>
                             <li class="Li" ng-click="actived($event)">
                                 <label class="lf">
-                                    <img src="../img/自己头像.png"><span>郑连根</span>
+                                    <img src="../img/自己头像1.png"><span>郑连根</span>
                                 </label>
                             </li>
                         </ul>
@@ -197,7 +197,7 @@
                 <div class="well m-l-xs m-t-xs fit-content">
                     <span class="text-message">
                         <a href="#" class="thumbnail">
-                            <img style="max-width:300px;max-height:250px;" src="../img/自己头像.png" alt="通用的占位符缩略图">
+                            <img style="max-width:300px;max-height:250px;" src="../img/自己头像1.png" alt="通用的占位符缩略图">
                         </a>
 					</span>
                 </div>