Merge branch 'feature/Redmine-16525-Cosmetic_Changes'

# Conflicts: # Swift.API/Swift.API.csproj # Swift.web/Swift.web.csproj
1 year ago · d767ae5511
13 changed files with 78 additions and 36 deletions
--- a/Swift.DAL/Swift.DAL.csproj
+++ b/Swift.DAL/Swift.DAL.csproj
@ -148,8 +148,9 @@
    <Reference Include="Microsoft.SqlServer.WmiEnum, Version=15.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.SqlServer.SqlManagementObjects.150.18178.0\lib\net45\Microsoft.SqlServer.WmiEnum.dll</HintPath>
    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core">
--- a/Swift.web/Admin/Default.aspx
+++ b/Swift.web/Admin/Default.aspx
@ -16,12 +16,21 @@
    <link href="../ui/css/menu.css" type="text/css" rel="stylesheet" />
    <link href="../ui/css/style.css" type="text/css" rel="stylesheet" />
    <link href="../ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+
    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
    <!--[if lt IE 9]>
        <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
+        
+    <style type="text/css">
+        .auto-style1 {
+            width: 123%;
+            height: 79px;
+        }
+    </style>
+        
 </head>
 <body>
    <div onkeypress="return checkSubmit(event)">
@ -60,6 +69,9 @@
                                    </div>
                                </form>
                            </div>
+                            <div class="login-logos">
+                                <img src="../Images/logo-1.png" class="auto-style1" />
+                            </div>
                            <div class="login-logo">
                                <i class="fa fa-user" aria-hidden="true"></i>
                            </div>
@ -71,15 +83,26 @@
    </div>

    <!-- jQuery -->
+
    <script src="/ui/js/jquery.min.js" type="text/javascript"></script>
    <script src="/ui/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
    <script src="/js/functions.js" type="text/javascript"></script>
+    <script src="Bootstrap/js/jquery.backstretch.min.js" type="text/javascript"></script>
+

    <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery-form-validator/2.2.8/jquery.form-validator.min.js" type="text/javascript"></script>

    <script type="text/javascript">
-        
-        function checkSubmit(e) {
+        $(".login-bg").backstretch([
+            "../images/1b.png",
+
+        ], { duration: 4000, fade: 750 });
+    </script>
+
+    <script type="text/javascript">
+
+            
+ipt>      function checkSubmit(e) {
            if (e && e.keyCode == 13) {
                // document.forms[0].submit();
                document.getElementById("<%=btnLogin.ClientID%>").click();
--- a/Swift.web/DashboardV2/Dashboard.aspx
+++ b/Swift.web/DashboardV2/Dashboard.aspx
@ -145,7 +145,7 @@
                        <span class="icon-bar"></span>
                    </button>
                    <a class="navbar-brand" href="#">
-                        <img src="../ui/images/jme.png" /></a>
+                        <img src="../Images/ime-london-logo.png" style="margin-top: 8px;" /></a>
                </div>
                <div id="navbar" class="navbar-collapse collapse">
                    <ul class="nav navbar-nav navbar-right navbar-top-drops">
@ -253,7 +253,6 @@
                            <span class="icon-bar"></span>
                            <span class="icon-bar"></span>
                        </button>
-                    </div>
                    <div id="menu" runat="server">
                        <div id="navbar-main" class="menu navbar-collapse collapse">
                            <ul class="nav navbar-nav">
@ -339,6 +338,7 @@
                        </div>
                        <!--/.nav-collapse -->
                    </div>
+                    </div>
                </div>
                <!--/.container-fluid -->
            </nav>
--- a/Swift.web/Default.aspx
+++ b/Swift.web/Default.aspx
@ -16,8 +16,10 @@
    <meta name="theme-color" content="#fffff">

    <title>JME Japan</title>
+    <link href="ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
    <link href="ui/index/css/custom.css" rel="stylesheet" media="screen">
    <link href="ui/index/index/custom.css" rel="stylesheet" />
+
    <!--<link href="ui/bootstrap/css/custom-media.css" rel="stylesheet" media="screen">-->
    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@ -25,6 +27,8 @@
      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
+
+
 </head>
 <body>
    <header>
@ -38,10 +42,12 @@
                    <span class="icon-bar"></span>
                    <span class="icon-bar"></span>
                   </button>
-                   <a class="navbar-brand alightgp" href="/" title="Swifttech"><img src="Images/jme.png" /></a>
+                   <a class="navbar-brand alightgp" href="/" title="Swifttech">
+                       <img src="Images/ime-london-logo.png" />
+                       </a>
                       
                   <a class="navbar-brand alightgp right" href="/SendMoney" title="Agent Login" >
-                       <h1> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                       <h1>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                       <span class="btn-danger ">Send Transaction Click Here ....</span>
                       </h1>
                   </a>
@ -77,13 +83,14 @@
                <div class="container">
                  <div class="col-md-7 col-sm-12 dest-detail wow fadeInLeft" data-wow-duration="3s">
                    <div class="titles">
-                      <h1>About JME Remittance</h1> 
+                      <h1>ABOUT IME LONDON</h1> 
                    </div>
-                    <p>JME Remittance offers a wide range of custom IT enabled services. We have outstanding experience in delivering custom database development, desktop, distributed and networked application design as well as development of various web components and projects</p>
+                    <p>IME London offers online remittance solutions. We have outstanding experience in delivering custom database development, desktop, distributed and networked application design as well as development of various web components and projects</p>
                   
                  </div>
                  <div class="col-md-5 hidden-xs  wow fadeInRight" data-wow-duration="3s">
                    <span><img src="ui/index/images/slider1.png" alt="" class="img-responsive"></span>
+                      <%--<span><img src="Images/background.png" alt="" class="img-responsive"/></span>--%>
                  </div>
                </div>
            </div>
--- a/Swift.web/Images/1b.png
+++ b/Swift.web/Images/1b.png
--- a/Swift.web/Images/Demologo-1.png
+++ b/Swift.web/Images/Demologo-1.png
--- a/Swift.web/Images/IME_londonred-coin-curve.png
+++ b/Swift.web/Images/IME_londonred-coin-curve.png
--- a/Swift.web/Images/NEWred-sqr.png
+++ b/Swift.web/Images/NEWred-sqr.png
--- a/Swift.web/Images/ime-london-logo.png
+++ b/Swift.web/Images/ime-london-logo.png
--- a/Swift.web/Images/logo-1.png
+++ b/Swift.web/Images/logo-1.png
--- a/Swift.web/ui/css/menu.css
+++ b/Swift.web/ui/css/menu.css
@ -557,12 +557,12 @@ body.body-small.mini-navbar #wrapper {
      background-color: rgba(0,0,0,0.2);
      color:#eee;
    }
-.navbar-default{
-    border-top: 0 solid #b50000;
-    border-left:0;
-    border-bottom:0;
-    border-right:0;
-    background-color: #b50000;
+.navbar-default {
+    border-top: 0 solid #ed174f;
+    border-left: 0;
+    border-bottom: 0;
+    border-right: 0;
+    background-color: #ed174f;
    border-radius: 0px;
    -webkit-border-radius: 0px;
 }
@ -575,16 +575,16 @@ body.body-small.mini-navbar #wrapper {
    color: #fff;
    background-color: rgba(0,0,0,0.1);
 }
-.navbar-default .dropdown-menu{
-    background: #b50000;
-    color:#fff;
-    padding: 0px;
-    min-width: 190px;
-    box-shadow: 5px 5px rgba(102,102,102,0.1);
-    border:0px;
-    border-radius: 0px;
-    -webkit-border-radius: 0px;
-}
+    .navbar-default .dropdown-menu {
+        background: #ed174f;
+        color: #fff;
+        padding: 0px;
+        min-width: 190px;
+        box-shadow: 5px 5px rgba(102,102,102,0.1);
+        border: 0px;
+        border-radius: 0px;
+        -webkit-border-radius: 0px;
+    }
 .navbar-default .dropdown-menu>li>a{
    color:#fff;
    padding: 8px 20px;
--- a/Swift.web/ui/css/style.css
+++ b/Swift.web/ui/css/style.css
@ -47,7 +47,7 @@ body.bg-light {
 a {
    transition: all 0.3s ease-in-out;
    text-decoration: none;
-    color: #ed1c24;
+    color: #ed174f;
 }

    a:hover, a:focus, button, button:focus {
@ -285,7 +285,7 @@ p {
 -----------*/
 .banner-section {
    position: relative;
-    background: #0073AB;
+    background: #262262;
    overflow: hidden;
 }

@ -669,9 +669,9 @@ p {
    -moz-border-left-colors: none;
    -moz-border-right-colors: none;
    -moz-border-top-colors: none;
-    background-color: #ed1c24;
+    background-color: #262262;
    color: #fff;
-    border-color: #ed1c24 #ed1c24 transparent;
+    border-color: #262262 transparent;
    border-radius: 5px 5px 0 0;
    border-style: solid;
    border-width: 1px;
@ -1035,9 +1035,20 @@ p {
    margin: 90px auto;
    position: relative;
 }
+.login-logos {
+    position: absolute;
+    left: -2%;
+    top: -1%;
+    width: 78px;
+}
+
+    .login-logos img {
+        width: 156%;
+        height: 118px;
+    }

 .login-logo {
-    background: #333 none repeat scroll 0 0;
+    background: #ed174f none repeat scroll 0 0;
    border-radius: 100%;
    height: 50px;
    position: absolute;
@ -1054,7 +1065,7 @@ p {
    }

 .login-head {
-    background: #EC1C24;
+    background: #ed174f;
    position: relative;
    padding-top: 45px;
    padding-bottom: 15px;
@ -1103,7 +1114,7 @@ p {
    }

    .login-body .btn-default {
-        background: #ED1C24;
+        background: #262262;
        border: 0 none;
        border-radius: 20px;
        color: #fff;
@ -1358,8 +1369,8 @@ ul.wysihtml5-toolbar a.btn.wysihtml5-command-active {
 }

 .btn-primary {
-    background-color: #ed1c24 !important;
-    border-color: #ed1c24 !important;
+    background-color: #262262 !important;
+    border-color: #262262 !important;
 }

    .btn-primary:hover {
--- a/Swift.web/ui/index/css/custom.css
+++ b/Swift.web/ui/index/css/custom.css
@ -29,7 +29,7 @@ p {
 -----------*/
 .banner-section{
  position:relative;    
-  background:#0073AB;
+  background:#262262;
  overflow: hidden;

 }