logo合并

assets/views/partials/top-navbar.html

@@ -43,7 +43,7 @@
     <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard">
         <!-- <img ng-src="/logo_large.png" style="width:160px;height:35px" alt="{{app.name}}" /> -->
         <!-- <span class="padding-left-10 padding-right-5"><img ng-src="/line.png"  alt="{{app.name}}" /></span> -->
-        <img ng-src="assets/images/logo3.png" style="width:40px;height: 40px;" alt="{{app.name}}"
+        <img ng-src="assets/images/login/logo.png" style="width:40px;height: 40px;" alt="{{app.name}}"
             class="jry_img_right" />{{app.author}} </a>
 </div>
 <!-- end: NAVBAR HEADER -->

index.html

@@ -19,7 +19,7 @@
     <!-- <link href="http://fonts.googleapis.com/css?family=Lato:300,400,400italic,600,700|Raleway:300,400,500,600,700|Crete+Round:400italic" rel="stylesheet" type="text/css" /> -->
     <!-- Bootstrap -->
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
-    <link rel="icon" type="image/png" sizes="32x32" href="assets/images/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="assets/images/login/logo.png">
     <!-- Font Awesome -->
     <link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.min.css">
     <link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.min.css">