Merge branch 'master' into develop

8 years ago · 6a29d6e942
parent 67f45c6c2e a50b6c9b99
commit 6a29d6e942
3 changed files with 5 additions and 5 deletions
--- a/package.json
+++ b/package.json
@ -1,8 +1,8 @@
 {
  "name": "nodebb-theme-persona",
-  "version": "4.1.95",
+  "version": "4.2.1",
  "nbbpm": {
-    "compatibility": "^0.8.2 || ^0.9.0 || ^1.0.0"
+    "compatibility": "^1.4.4"
  },
  "description": "Persona theme for NodeBB",
  "main": "theme.less",
--- a/templates/header.tpl
+++ b/templates/header.tpl
@ -3,7 +3,7 @@
 <head>
 	<title>{browserTitle}</title>
 	<!-- BEGIN metaTags -->{function.buildMetaTag}<!-- END metaTags -->
-	<link rel="stylesheet" type="text/css" href="{relative_path}/stylesheet.css?{config.cache-buster}" />
+	<link rel="stylesheet" type="text/css" href="{relative_path}/assets/stylesheet.css?{config.cache-buster}" />
 	<!-- IF bootswatchCSS --><link id="bootswatchCSS" href="{bootswatchCSS}" rel="stylesheet" media="screen"><!-- ENDIF bootswatchCSS -->
 	<!-- BEGIN linkTags -->{function.buildLinkTag}<!-- END linkTags -->

@ -23,7 +23,7 @@
 		};
 	</script>

-	<script src="{relative_path}/nodebb.min.js?{config.cache-buster}"></script>
+	<script src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>

 	<!-- BEGIN scripts -->
 	<script type="text/javascript" src="{scripts.src}"></script>
--- a/templates/search.tpl
+++ b/templates/search.tpl
@ -97,7 +97,7 @@
 							<div class="row">
 								<div class="col-md-6">
 									<select id="post-sort-by" class="form-control">
-										<option value=""></option>
+										<option value="relevance">[[search:relevance]]</option>
 										<option value="timestamp">[[search:post-time]]</option>
 										<option value="teaser.timestamp">[[search:last-reply-time]]</option>
 										<option value="topic.title">[[search:topic-title]]</option>