Browse Source

样式微调

zhuth 7 years ago
parent
commit
9a9acace7b

+ 2 - 2
frontend/saas-web/app/view/home/Home.js

@@ -34,7 +34,7 @@ Ext.define('saas.view.home.Home', {
     }, {
         xtype: 'panel',
         style: {
-            background: '#EEF4F9',
+            background: '#f4f4f4',
         },
 
         latyout: 'responsivecolumn',
@@ -56,7 +56,7 @@ Ext.define('saas.view.home.Home', {
         xtype: 'panel',
         latyout: 'responsivecolumn',
         style: {
-            background: '#EEF4F9',
+            background: '#f4f4f4',
         },
         defaults: {
             margin: '0 16 0 0',

+ 2 - 2
frontend/saas-web/app/view/home/Home.scss

@@ -92,11 +92,11 @@ $unaudit-purc-container-color: dynamic(#e91e63);
 }
 
 .x-home-panel {
-    background: #EEF4F9;
+    background: $panel-body-background;
 
     &> .x-autocontainer-outerCt {
         display: block;
-        background: #EEF4F9;
+        background: $panel-body-background;
 
         &> .x-autocontainer-innerCt {
             display: block;

+ 8 - 5
frontend/saas-web/app/view/main/Main.js

@@ -59,15 +59,17 @@ Ext.define('saas.view.main.Main', {
                 '->',
                 {
                     iconCls:'icon-usoftchina',
+                    text: '优软云',
                     ui: 'header',
                     tooltip: '优软云',
-                    handler:function(){
-					    window.open('http://www.usoftchina.com','_blank');
-                    }
+                    // handler:function(){
+					//     window.open('http://www.usoftchina.com','_blank');
+                    // }
                 },
                 {
                     margin:'0 3 0 6',
-                    iconCls:'x-fa fa-share-square',
+                    // iconCls:'x-fa fa-share-square',
+                    iconCls:'x-sa sa-invite',
                     cls:'sa-nav-button',
                     ui: 'header',
                     tooltip: '邀请同事',
@@ -129,7 +131,8 @@ Ext.define('saas.view.main.Main', {
                     },
                     style:{
                         cursor:'default',
-                        textAlign:'center'
+                        textAlign:'center',
+                        color: '#9A9A9A',
                     },
                     listeners:{
                         afterrender:function(b){

+ 11 - 1
frontend/saas-web/app/view/main/Main.scss

@@ -7,7 +7,7 @@ $font-weight-bold: dynamic(500);
 $accordion-header-background-color: dynamic($lightest-color);
 $accordion-header-color: dynamic(#333);
 
-$panel-body-background: dynamic(#EEF4F9) !default;
+$panel-body-background: dynamic(#f4f4f4) !default;
 
 $treelist-nav-ui: (
         padding: 0 10px,
@@ -116,6 +116,16 @@ $treelist-nav-ui: (
         background: url(../../../../resources/images/default/user-profile-default.png) 0 0 no-repeat;
         background-position: center;
     }
+
+    .x-btn,.x-btn-over,.x-btn-pressed{
+        .x-btn-wrap{
+          .x-btn-button{
+            .x-btn-inner{
+              color:#34BAF6 !important;
+            }
+          }
+        }
+      }
 }
 .x-btn.header-right-profile-image.x-btn-menu-active.x-btn-header-small,
 .x-btn.header-right-profile-image.x-btn-pressed.x-btn-header-small {

BIN
frontend/saas-web/packages/font-saas/resources/fonts/iconfont.eot


File diff suppressed because it is too large
+ 0 - 0
frontend/saas-web/packages/font-saas/resources/fonts/iconfont.js


+ 3 - 0
frontend/saas-web/packages/font-saas/resources/fonts/iconfont.svg

@@ -26,6 +26,9 @@ Created by iconfont
     <glyph glyph-name="bar" unicode="&#59412;" d="M1024-67.76470600000005l0-60.235294-1024 0 0 60.235294 1024 0zM120.470588 293.647059l120.470588 0 0-301.176471 60.235294 0 0 361.411765-240.941176 0 0-361.411765 60.235294 0 0 301.176471zM421.647059 474.352941l120.470588 0 0-481.882353 60.235294 0 0 542.117647-240.941176 0 0-542.117647 60.235294 0 0 481.882353zM722.823529 715.294118l120.470588 0 0-722.823529 60.235294 0 0 783.058824-240.941176 0 0-783.058824 60.235294 0 0 722.823529z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="invite" unicode="&#59416;" d="M724.89984 293.34528c12.04224-9.56928 31.30368-4.7872 40.9344 9.5744 4.8128 7.18336 4.8128 14.3616 4.8128 21.53984-2.41152 7.17824-7.22432 14.3616-12.04224 19.14368-16.85504 9.5744-33.71008 21.53984-52.97152 28.71808 24.07936 23.936 43.3408 50.25792 55.37792 81.37728 14.4384 33.50016 21.67296 69.4016 21.67296 107.69408 0 148.3776-120.3968 268.04736-269.68576 268.04736S245.71904 707.38432 245.71904 559.00672c0-71.79776 28.89728-138.81344 79.4624-189.07648-156.50816-71.79264-257.6384-227.35872-257.6384-399.67744 0-16.75264 12.03712-28.71808 28.89216-28.71808s28.89216 11.96544 28.89216 28.71808c0 160.34816 101.12512 303.94368 250.4192 358.9888 84.28032-50.24768 192.63488-47.86688 274.49856 0 26.496-9.56416 52.98688-21.53472 74.65472-35.89632z m-211.8912 57.44128c-115.57888 0-209.48992 93.34272-209.48992 208.22016 0 114.87232 93.90592 208.20992 209.48992 208.20992 115.584 0 209.48992-93.3376 209.48992-208.20992 0-28.71808-4.8128-57.4464-16.85504-83.7632-9.63072-23.936-26.49088-45.47584-45.75744-64.61952-38.51776-38.2976-91.49952-59.83744-146.87744-59.83744z m411.71968-221.95712h-95.1296v95.13472a31.70816 31.70816 0 1 1-63.41632 0v-95.13472h-95.13472a31.70816 31.70816 0 0 1 0-63.42144h95.13472v-95.1296a31.71328 31.71328 0 1 1 63.41632 0v95.1296h95.1296a31.70816 31.70816 0 1 1 0 63.42144z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="tuichu" unicode="&#59409;" d="M509-64H163.5c-54.8 0-99.5 44.6-99.5 99.5v696c0 54.8 44.6 99.5 99.5 99.5H511c16.6 0 30-13.4 30-30s-13.4-30-30-30H163.5c-21.8 0-39.5-17.7-39.5-39.5v-696.1c0-21.8 17.7-39.5 39.5-39.5H509c16.6 0 30-13.4 30-30S525.6-64 509-64zM898 354H414c-16.6 0-30 13.4-30 30s13.4 30 30 30h484c16.6 0 30-13.4 30-30s-13.4-30-30-30zM703.7 150.5c-7.7 0-15.4 2.9-21.2 8.8-11.7 11.7-11.7 30.7 0 42.4L864.8 384 682.5 566.3c-11.7 11.7-11.7 30.7 0 42.4s30.7 11.7 42.4 0l203.5-203.5c11.7-11.7 11.7-30.7 0-42.4L724.9 159.29999999999995c-5.9-5.9-13.5-8.8-21.2-8.8z"  horiz-adv-x="1024" />
 
     

BIN
frontend/saas-web/packages/font-saas/resources/fonts/iconfont.ttf


BIN
frontend/saas-web/packages/font-saas/resources/fonts/iconfont.woff


+ 3 - 0
frontend/saas-web/packages/font-saas/sass/etc/icons.scss

@@ -1,7 +1,10 @@
+
 .sa-home:before { content: "\e817"; }
 
 .sa-bar:before { content: "\e814"; }
 
+.sa-invite:before { content: "\e818"; }
+
 .sa-tuichu:before { content: "\e811"; }
 
 .sa-feedback:before { content: "\e810"; }

File diff suppressed because it is too large
+ 0 - 0
frontend/saas-web/packages/font-saas/sass/src/all.scss


Some files were not shown because too many files changed in this diff