Merge branch 'master' of https://github.com/H5xxx/mocar

H5xxx · Sep 14, 2014 · ec2dd47 · ec2dd47
2 parents 886ef7f + 99e165b
commit ec2dd47
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/css/base.css b/css/base.css
@@ -292,9 +292,9 @@ select {
 }
 .footer .site-icons {
     float: right;
-    width: 40px;
-    height: 40px;
-    margin-top: -20px;
+    width: 56px;
+    height: 56px;
+    margin-top: -25px;
     margin-right: 25px;
 }
 .icon-seperator {
@@ -370,6 +370,7 @@ select {
 .justify-content {
     display: table-cell;
     vertical-align: middle;
+    color: #60C900;
 }
 
 /*loading*/

diff --git a/css/service.css b/css/service.css
@@ -104,7 +104,7 @@ img {
     overflow: hidden;
 }
 .header .j-nav:nth-child(2) {
-    white-space:nowrap;
+    white-space: nowrap;
     text-overflow: ellipsis;
     max-width: 167px;
 }
@@ -131,6 +131,10 @@ img {
     height: 45px;
     line-height: 45px;
     border-bottom: 1px solid #aaa;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 280px;
+    overflow: hidden;
 }
 /*.model-item {
     float: left;

diff --git a/html/index.html b/html/index.html
@@ -447,7 +447,7 @@
             "mock": "lib/mock.js"
         }
     })
-    seajs.use('mockAjax', function() {});
+    // seajs.use('mockAjax', function() {});
 
     seajs.use("page/index");
     </script>