Use font instead of png for logo

Author: ahornace

dev/img_combine.sh

@@ -494,23 +494,13 @@ a.xsr    { /* subroutine */         color: #00f; font-weight: bold;
     text-align: center;
 }
 
-#fti { /* servedby.png */
-    display: inline-block;
-    width: 208px;
-    height: 45px;
-    vertical-align: middle;
-    background-image: url(./img/combined.png);
-    background-repeat: no-repeat;
-    background-position: -171px 0;
-}
 #rssi { /* rss.png */
     display: inline-block;
     width: 80px;
     height: 15px;
     vertical-align: middle;
-    background-image: url(./img/combined.png);
+    background-image: url(./img/rss.png);
     background-repeat: no-repeat;
-    background-position: -379px 0;
 }
 /* ############### end of footer ############## */
 

opengrok-web/src/main/webapp/default/font/SunSansRegular.woff2

@@ -287,9 +287,8 @@ html.diff #whole_header {
     width: 171px;
     height: 40px;
     float: left;
-    background-image: url(./img/combined.png);
+    background-image: url(./img/Logo.png);
     background-repeat: no-repeat;
-    background-position: 0 0;
     margin: 0 0 0.5ex 0;
 }
 
@@ -1072,23 +1071,43 @@ a.scope            { /* scope              */ color: steelblue; font-weight: bol
     text-align: center;
 }
 
-#fti { /* servedby.png */
-    display: inline-block;
-    width: 208px;
-    height: 45px;
+@font-face {
+    font-family: SunSans;
+    src: url('./font/SunSansRegular.woff2');
+}
+
+.link-no-decoration {
+    text-decoration: none !important;
+}
+
+.logo {
+    font-family: SunSans, sans-serif;
+    font-size: 1.6153846153846154em;
     vertical-align: middle;
-    background-image: url(./img/combined.png);
-    background-repeat: no-repeat;
-    background-position: -171px 0;
 }
+
+.logo-gray-color {
+    color: #656664;
+}
+
+.logo-blue-color {
+    color: #4783A3;
+}
+
+#served-by {
+    color: #B8BAB7;
+    font-family: SunSans, sans-serif;
+    font-size: 1.1538461538461537em;
+    vertical-align: middle;
+}
+
 #rssi { /* rss.png */
     display: inline-block;
     width: 80px;
     height: 15px;
     vertical-align: middle;
-    background-image: url(./img/combined.png);
+    background-image: url(./img/rss.png);
     background-repeat: no-repeat;
-    background-position: -379px 0;
 }
 /* ############### end of footer ############## */
 

opengrok-web/src/main/webapp/default/img/combined.png

@@ -42,10 +42,12 @@ org.opengrok.indexer.web.Prefix"
 
         %>
     <div id="footer">
-<p><a href="https://oracle.github.io/opengrok/"
- title="Served by OpenGrok (<%= Info.getVersion() %> - <%= Info.getShortRevision() %>)"><span id="fti"></span></a></p>
+<p><a href="https://oracle.github.io/opengrok/" class="link-no-decoration"
+      title="Served by OpenGrok (<%= Info.getVersion() %> - <%= Info.getShortRevision() %>)">
+    <span id="served-by">served&nbsp;by&nbsp;</span><span class="logo logo-gray-color">{</span><span class="logo logo-blue-color">Open</span><span class="logo logo-gray-color">Grok</span>
+</a></p>
 <% if(dateForLastIndexRun != null) { %>
-<p>Last Index update <%= dateForLastIndexRun %></p>
+<p>Last Index Update: <%= dateForLastIndexRun %></p>
 <%}%>
     <%= cfg.getEnv().getIncludeFiles().getFooterIncludeFileContent(false) %>
     <%

opengrok-web/src/main/webapp/default/print-1.0.0.css renamed to opengrok-web/src/main/webapp/default/print-1.0.1.css

@@ -18,7 +18,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 
 CDDL HEADER END
 
-Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright 2011 Jens Elkner.
 Portions Copyright (c) 2017-2018, 2020, Chris Fraire <[email protected]>.
 Portions Copyright (c) 2020, Aleksandr Kirillov <[email protected]>.
@@ -45,8 +45,8 @@ org.opengrok.web.Scripts"
     PageConfig cfg = PageConfig.get(request);
     String styleDir = cfg.getCssDir();
     String ctxPath = request.getContextPath();
-    String dstyle = styleDir + '/' + "style-1.0.0.min.css";
-    String pstyle = styleDir + '/' + "print-1.0.0.min.css";
+    String dstyle = styleDir + '/' + "style-1.0.1.min.css";
+    String pstyle = styleDir + '/' + "print-1.0.1.min.css";
     String mstyle = styleDir + '/' + "mandoc-1.0.0.min.css";
 %><!DOCTYPE html>
 <html lang="en"