Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/deliveryManagementApplication/slickDM.scss =================================================================== diff -u -r24862 -r24879 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/deliveryManagementApplication/slickDM.scss (.../slickDM.scss) (revision 24862) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/deliveryManagementApplication/slickDM.scss (.../slickDM.scss) (revision 24879) @@ -9,9 +9,16 @@ /*bootstrap contain的覆盖*/ /*模态框标题字体色*/ $modalTitleFontColor:#ffffff; +/*公共按钮背景*/ +$commonButtonBack:url(/dx-disinfectsystem/img/newButton.png) repeat; +/*sprite图地址,输入框背景*/ +$inputGroupBack:url(/dx-disinfectsystem/img/inputGroupBack.png) no-repeat; +/*公共按钮样式*/ +.dx-btn-primary { + background: $commonButtonBack; +} body{margin: 0 0;padding: 0 0;} - .mainNav{ height: 28px; display:none; @@ -31,8 +38,8 @@ width: 100%; background: $mainHeadColor; border-bottom: 2px solid #efefef; - padding: 10px 20px 45px 0; - //margin-top: 10px; + padding: 10px 20px 45px 10px; + margin-bottom: 10px; &-button{ width: 50px; height: 30px; @@ -79,6 +86,9 @@ &-search{ display: inline-block; float:right; + background: $inputGroupBack; + background-position: 198px 7px; + padding-right: 25px; } } .btn{ @@ -131,7 +141,7 @@ width: 915px; } &-title{ - background-color: #73B043; + background-color: $funColor; font-weight: bold; padding:5px 5px; border-top-left-radius: 6px; @@ -147,8 +157,8 @@ } } -.mainFont{ - color: #73B043; +.ui-widget-content .mainFont{ + color: $funColor; font-weight: bold; &:hover{ text-decoration: none; @@ -177,6 +187,7 @@ width: 220px; list-style: none; padding: 0; + vertical-align: top; display: inline-block; li{ height: 30px; @@ -208,7 +219,7 @@ font-size: 17px; border-top-left-radius: 6px; border-top-right-radius: 6px; - background: rgb(115, 176, 67); + background: $funColor; padding: 6px; margin-bottom: 10px; } @@ -223,7 +234,7 @@ font-size: 17px; border-top-left-radius: 6px; border-top-right-radius: 6px; - background: rgb(115, 176, 67); + background: $funColor; padding: 6px; margin-bottom: 10px; } @@ -238,7 +249,7 @@ font-size: 17px; border-top-left-radius: 6px; border-top-right-radius: 6px; - background: rgb(115, 176, 67); + background: $funColor; padding: 6px; margin-bottom: 10px; } Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/deliveryManagementApplication/slickDM.css.map =================================================================== diff -u -r24862 -r24879 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/deliveryManagementApplication/slickDM.css.map (.../slickDM.css.map) (revision 24862) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/deliveryManagementApplication/slickDM.css.map (.../slickDM.css.map) (revision 24879) @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "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", +"mappings": "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", "sources": ["slickDM.scss"], "names": [], "file": "slickDM.css" Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/deliveryManagementApplication/slickDM.css =================================================================== diff -u -r24862 -r24879 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/deliveryManagementApplication/slickDM.css (.../slickDM.css) (revision 24862) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/deliveryManagementApplication/slickDM.css (.../slickDM.css) (revision 24879) @@ -5,6 +5,12 @@ /*页面主表导航栏背景色*/ /*bootstrap contain的覆盖*/ /*模态框标题字体色*/ +/*公共按钮背景*/ +/*sprite图地址,输入框背景*/ +/*公共按钮样式*/ +.dx-btn-primary { + background: url(/dx-disinfectsystem/img/newButton.png) repeat; } + body { margin: 0 0; padding: 0 0; } @@ -27,7 +33,8 @@ width: 100%; background: #ffffff; border-bottom: 2px solid #efefef; - padding: 10px 20px 45px 0; } + padding: 10px 20px 45px 10px; + margin-bottom: 10px; } .mainNav-shop-button { width: 50px; height: 30px; @@ -55,7 +62,10 @@ display: inline-block; } .mainNav-shop-search { display: inline-block; - float: right; } + float: right; + background: url(/dx-disinfectsystem/img/inputGroupBack.png) no-repeat; + background-position: 198px 7px; + padding-right: 25px; } .mainNav .btn { background: #C6E3CA; border: rgba(0, 0, 0, 0); } @@ -84,7 +94,7 @@ .allmodal .modal-dialog { width: 915px; } .allmodal .modal-title { - background-color: #73B043; + background-color: #31b546; font-weight: bold; padding: 5px 5px; border-top-left-radius: 6px; @@ -96,10 +106,10 @@ border-top-left-radius: 6px; border-top-right-radius: 6px; } -.mainFont { - color: #73B043; +.ui-widget-content .mainFont { + color: #31b546; font-weight: bold; } - .mainFont:hover { + .ui-widget-content .mainFont:hover { text-decoration: none; } .tips { @@ -122,6 +132,7 @@ width: 220px; list-style: none; padding: 0; + vertical-align: top; display: inline-block; } .deliveryInfo-left-ul ul li { height: 30px; @@ -144,7 +155,7 @@ font-size: 17px; border-top-left-radius: 6px; border-top-right-radius: 6px; - background: #73b043; + background: #31b546; padding: 6px; margin-bottom: 10px; } .deliveryInfo-left-bottom { @@ -154,7 +165,7 @@ font-size: 17px; border-top-left-radius: 6px; border-top-right-radius: 6px; - background: #73b043; + background: #31b546; padding: 6px; margin-bottom: 10px; } .deliveryInfo-right-top-table { @@ -165,7 +176,7 @@ font-size: 17px; border-top-left-radius: 6px; border-top-right-radius: 6px; - background: #73b043; + background: #31b546; padding: 6px; margin-bottom: 10px; } .deliveryInfo-right-bottom-table {