You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/12/19 02:52:52 UTC
svn commit: r1646610 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/example/ solr/example/example-DIH/solr/db/conf/velocity/
solr/example/example-DIH/solr/db/conf/xslt/
solr/example/example-DIH/solr/mail/conf/velocity/
solr/example/example-DIH/solr...
Author: sarowe
Date: Fri Dec 19 01:52:51 2014
New Revision: 1646610
URL: http://svn.apache.org/r1646610
Log:
SOLR-6058: Include the new Solr logo and favicon in Solritas (/browse UI) as well as in generated per-release Solr documentation; switch all favicon links' Content-Type: 'image/ico'->'image/x-icon' (merged trunk r1646609)
Added:
lucene/dev/branches/branch_5x/solr/site/html/solr.svg
- copied unchanged from r1646609, lucene/dev/trunk/solr/site/html/solr.svg
Removed:
lucene/dev/branches/branch_5x/solr/site/html/solr.png
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/example/ (props changed)
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/head.vm
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/header.vm
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/main.css
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/head.vm
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/header.vm
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/main.css
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/head.vm
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/header.vm
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/main.css
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/head.vm
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/header.vm
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/main.css
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl
lucene/dev/branches/branch_5x/solr/server/ (props changed)
lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm
lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm
lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/main.css
lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl
lucene/dev/branches/branch_5x/solr/site/ (props changed)
lucene/dev/branches/branch_5x/solr/site/xsl/index.xsl
lucene/dev/branches/branch_5x/solr/webapp/ (props changed)
lucene/dev/branches/branch_5x/solr/webapp/web/admin.html
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/head.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/head.vm?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/head.vm (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/head.vm Fri Dec 19 01:52:51 2014
@@ -9,6 +9,8 @@
<script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
<link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
<link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
+ <link rel="icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
+ <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
<script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/header.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/header.vm?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/header.vm (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/header.vm Fri Dec 19 01:52:51 2014
@@ -3,5 +3,5 @@
*#
<div id="head">
- <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.png" id="logo"/></a></span>
+ <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.svg" id="logo"/></a></span>
</div>
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/main.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/main.css?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/main.css (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/velocity/main.css Fri Dec 19 01:52:51 2014
@@ -160,7 +160,8 @@ a {
}
#logo {
- margin: 10px;
+ width: 115px;
+ margin: 0px 0px 20px 12px;
border-style: none;
}
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl Fri Dec 19 01:52:51 2014
@@ -39,8 +39,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<link rel="stylesheet" type="text/css" href="solr-admin.css"/>
- <link rel="icon" href="favicon.ico" type="image/ico"/>
- <link rel="shortcut icon" href="favicon.ico" type="image/ico"/>
+ <link rel="icon" href="favicon.ico" type="image/x-icon"/>
+ <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
<title>
<xsl:value-of select="$title"/>
</title>
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/head.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/head.vm?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/head.vm (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/head.vm Fri Dec 19 01:52:51 2014
@@ -9,6 +9,8 @@
<script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
<link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
<link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
+ <link rel="icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
+ <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
<script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/header.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/header.vm?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/header.vm (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/header.vm Fri Dec 19 01:52:51 2014
@@ -3,5 +3,5 @@
*#
<div id="head">
- <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.png" id="logo"/></a></span>
+ <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.svg" id="logo"/></a></span>
</div>
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/main.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/main.css?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/main.css (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/velocity/main.css Fri Dec 19 01:52:51 2014
@@ -160,7 +160,8 @@ a {
}
#logo {
- margin: 10px;
+ width: 115px;
+ margin: 0px 0px 20px 12px;
border-style: none;
}
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl Fri Dec 19 01:52:51 2014
@@ -39,8 +39,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<link rel="stylesheet" type="text/css" href="solr-admin.css"/>
- <link rel="icon" href="favicon.ico" type="image/ico"/>
- <link rel="shortcut icon" href="favicon.ico" type="image/ico"/>
+ <link rel="icon" href="favicon.ico" type="image/x-icon"/>
+ <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
<title>
<xsl:value-of select="$title"/>
</title>
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/head.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/head.vm?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/head.vm (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/head.vm Fri Dec 19 01:52:51 2014
@@ -9,6 +9,8 @@
<script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
<link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
<link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
+ <link rel="icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
+ <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
<script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/header.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/header.vm?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/header.vm (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/header.vm Fri Dec 19 01:52:51 2014
@@ -3,5 +3,5 @@
*#
<div id="head">
- <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.png" id="logo"/></a></span>
+ <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.svg" id="logo"/></a></span>
</div>
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/main.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/main.css?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/main.css (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/velocity/main.css Fri Dec 19 01:52:51 2014
@@ -160,7 +160,8 @@ a {
}
#logo {
- margin: 10px;
+ width: 115px;
+ margin: 0px 0px 20px 12px;
border-style: none;
}
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl Fri Dec 19 01:52:51 2014
@@ -39,8 +39,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<link rel="stylesheet" type="text/css" href="solr-admin.css"/>
- <link rel="icon" href="favicon.ico" type="image/ico"/>
- <link rel="shortcut icon" href="favicon.ico" type="image/ico"/>
+ <link rel="icon" href="favicon.ico" type="image/x-icon"/>
+ <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
<title>
<xsl:value-of select="$title"/>
</title>
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/head.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/head.vm?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/head.vm (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/head.vm Fri Dec 19 01:52:51 2014
@@ -9,6 +9,8 @@
<script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
<link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
<link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
+ <link rel="icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
+ <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
<script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/header.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/header.vm?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/header.vm (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/header.vm Fri Dec 19 01:52:51 2014
@@ -3,5 +3,5 @@
*#
<div id="head">
- <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.png" id="logo"/></a></span>
+ <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.svg" id="logo"/></a></span>
</div>
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/main.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/main.css?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/main.css (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/velocity/main.css Fri Dec 19 01:52:51 2014
@@ -160,7 +160,8 @@ a {
}
#logo {
- margin: 10px;
+ width: 115px;
+ margin: 0px 0px 20px 12px;
border-style: none;
}
Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl Fri Dec 19 01:52:51 2014
@@ -39,8 +39,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<link rel="stylesheet" type="text/css" href="solr-admin.css"/>
- <link rel="icon" href="favicon.ico" type="image/ico"/>
- <link rel="shortcut icon" href="favicon.ico" type="image/ico"/>
+ <link rel="icon" href="favicon.ico" type="image/x-icon"/>
+ <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
<title>
<xsl:value-of select="$title"/>
</title>
Modified: lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm (original)
+++ lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm Fri Dec 19 01:52:51 2014
@@ -9,6 +9,8 @@
<script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
<link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
<link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
+ <link rel="icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
+ <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
<script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>
Modified: lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm (original)
+++ lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm Fri Dec 19 01:52:51 2014
@@ -3,5 +3,5 @@
*#
<div id="head">
- <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.png" id="logo"/></a></span>
+ <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.svg" id="logo"/></a></span>
</div>
Modified: lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/main.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/main.css?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/main.css (original)
+++ lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/main.css Fri Dec 19 01:52:51 2014
@@ -160,7 +160,8 @@ a {
}
#logo {
- margin: 10px;
+ width: 115px;
+ margin: 0px 0px 20px 12px;
border-style: none;
}
Modified: lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl (original)
+++ lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl Fri Dec 19 01:52:51 2014
@@ -39,8 +39,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<link rel="stylesheet" type="text/css" href="solr-admin.css"/>
- <link rel="icon" href="favicon.ico" type="image/ico"/>
- <link rel="shortcut icon" href="favicon.ico" type="image/ico"/>
+ <link rel="icon" href="favicon.ico" type="image/x-icon"/>
+ <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
<title>
<xsl:value-of select="$title"/>
</title>
Modified: lucene/dev/branches/branch_5x/solr/site/xsl/index.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/site/xsl/index.xsl?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/site/xsl/index.xsl (original)
+++ lucene/dev/branches/branch_5x/solr/site/xsl/index.xsl Fri Dec 19 01:52:51 2014
@@ -34,13 +34,15 @@
<html>
<head>
<title><xsl:text>Apache Solr </xsl:text><xsl:value-of select="$version"/><xsl:text> Documentation</xsl:text></title>
+ <link rel="icon" type="image/x-icon" href="/solr/assets/images/favicon.ico"/>
+ <link rel="shortcut icon" type="image/x-icon" href="/solr/assets/images/favicon.ico"/>
</head>
<body>
<div>
<a href="http://lucene.apache.org/solr/">
- <img src="solr.png" title="Apache Solr Logo" alt="Solr" border="0"/>
+ <img src="solr.svg" style="width:210px; margin:22px 0px 7px 20px; border:none;" title="Apache Solr Logo" alt="Solr" />
</a>
- <div style="z-index:100;position:absolute;top:25px;left:252px">
+ <div style="z-index:100;position:absolute;top:25px;left:226px">
<span style="font-size: x-small">TM</span>
</div>
</div>
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/admin.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/admin.html?rev=1646610&r1=1646609&r2=1646610&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/admin.html (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/admin.html Fri Dec 19 01:52:51 2014
@@ -22,7 +22,8 @@ limitations under the License.
<title>Solr Admin</title>
- <link rel="icon" type="image/ico" href="img/favicon.ico?_=${version}">
+ <link rel="icon" type="image/x-icon" href="img/favicon.ico?_=${version}">
+ <link rel="shortcut icon" type="image/x-icon" href="img/favicon.ico?_=${version}">
<link rel="stylesheet" type="text/css" href="css/styles/common.css?_=${version}">
<link rel="stylesheet" type="text/css" href="css/styles/analysis.css?_=${version}">