Merge pull request #196 from kibbon/Back-end

Back end
buaase · Jan 9, 2016 · 91b7023 · 91b7023
2 parents abc4b5c + 391dc7b
commit 91b7023
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 24 deletions.
diff --git a/SE_PhysExpeRepo/public/css/bootstrap.css b/SE_PhysExpeRepo/public/css/bootstrap.css
diff --git a/SE_PhysExpeRepo/resources/views/auth/register.blade.php b/SE_PhysExpeRepo/resources/views/auth/register.blade.php
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="./css/mystyle.css">
 </head>
 
-
 <body onload="check()">
 
     <div class="modal fade" id="mymodal-signin">

diff --git a/SE_PhysExpeRepo/resources/views/report/index.blade.php b/SE_PhysExpeRepo/resources/views/report/index.blade.php
@@ -1965,7 +1965,7 @@
 					</a>
 					<ul class="dropdown-menu">
 						<li><a href="{{URL::route('report')}}"><span class="glyphicon glyphicon-flag"></span>&nbsp实验报告中心</a></li>
-						<li><a href="{{URL::route('tools')}}"><span class="glyphicon glyphicon-wrench"></span>&nbsp 实用小工具</a></li>
+						<li><a href="{{URL::route('tools')}}"><span class="glyphicon glyphicon-pencil"></span>&nbsp 实用小工具</a></li>
 						<li class="disabled"><a>其他功能</a></li>
 					</ul>
 				</li>

diff --git a/SE_PhysExpeRepo/resources/views/tools/index.blade.php b/SE_PhysExpeRepo/resources/views/tools/index.blade.php
@@ -440,13 +440,8 @@
 					<a href="##" data-toggle="dropdown" class="dropdown-toggle">服务<span class="caret"></span>
 					</a>
 					<ul class="dropdown-menu">
-<<<<<<< HEAD
 						<li><a data-toggle="modal" href="{{URL::route('report')}"><span class="glyphicon glyphicon-flag"></span>&nbsp 实验报告中心</a></li>
-						<li><a data-toggle="modal" href="{{URL::route('tools')}"><span class="glyphicon glyphicon-wrench"></span>&nbsp 实用小工具</a></li>
-=======
-						<li><a data-toggle="modal" href="{{URL::route('report')}}"><span class="glyphicon glyphicon-flag"></span>&nbsp 实验报告中心</a></li>
-						<li><a data-toggle="modal" href="{{URL::route('tools')}}"><span class="glyphicon glyphicon-wrench"></span>&nbsp 实用小工具</a></li>
->>>>>>> buaase/Back-end
+						<li><a data-toggle="modal" href="{{URL::route('tools')}"><span class="glyphicon glyphicon-pencil"></span>&nbsp 实用小工具</a></li>
 						<li class="disabled"><a>其他功能</a></li>
 					</ul>
 				</li>

diff --git a/wecenter/static/css/default/common.css b/wecenter/static/css/default/common.css
@@ -1,17 +1,4 @@
 @charset "UTF-8";
-@font-face {
-    font-family: 'montserrat';
-    src: url('../../fonts/montserrat-regular-webfont.eot');
-    src: local('montserrat-Regular'),
-         local('montserrat'),
-         url('../../fonts/montserrat-regular-webfont.eot?#iefix') format('embedded-opentype'),
-         url('../../fonts/montserrat-regular-webfont.woff2') format('woff2'),
-         url('../../fonts/montserrat-regular-webfont.woff') format('woff'),
-         url('../../fonts/montserrat-regular-webfont.ttf') format('truetype'),
-         url('../../fonts/montserrat-regular-webfont.svg#montserrat') format('svg');
-    font-weight: 400;
-    font-style: normal;
-}
 /* 重载bootstrap部分 */
 em{font-style: normal;}
 input[type="radio"], input[type="checkbox"]{margin:0;}

diff --git a/wecenter/static/css/icon.css b/wecenter/static/css/icon.css
@@ -8,7 +8,19 @@
 	font-weight: normal;
 	font-style: normal;
 }
-
+@font-face {
+    font-family: 'montserrat';
+    src: url('../fonts/montserrat-regular-webfont.eot');
+    src: local('montserrat-Regular'),
+         local('montserrat'),
+         url('../fonts/montserrat-regular-webfont.eot?#iefix') format('embedded-opentype'),
+         url('../fonts/montserrat-regular-webfont.woff2') format('woff2'),
+         url('../fonts/montserrat-regular-webfont.woff') format('woff'),
+         url('../fonts/montserrat-regular-webfont.ttf') format('truetype'),
+         url('../fonts/montserrat-regular-webfont.svg#montserrat') format('svg');
+    font-weight: 400;
+    font-style: normal;
+}
 [class^="icon-"], [class*=" icon-"] {
 	font-family: 'icomoon';
 	speak: none;
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
         <link rel="stylesheet" href="./css/mystyle.css">
     </head>
     <body onload="check()">
         <div class="modal fade" id="mymodal-signin">
@@ Expand Down @@