Updates for latest NodeBB version

pichalite · May 27, 2019 · 16eb74b · 16eb74b
1 parent 8a5dd15
commit 16eb74b
Show file tree

Hide file tree

Showing 52 changed files with 1,335 additions and 1,268 deletions.
diff --git a/less/buttons.less b/less/buttons.less
@@ -6,7 +6,6 @@
     -webkit-transition-duration: 300ms;
     transition-duration: 300ms;
     border: 0;
-    text-transform: uppercase;
     border-radius: 2px;
 
     &:not(.btn-link):not(.btn-float):not(.command-edit):not(.command-delete):not(.selectpicker) {

diff --git a/less/menu.less b/less/menu.less
@@ -332,6 +332,12 @@
 			}
 		}
 	}
+
+	li {
+		.btn-link {
+			color: @body-color;
+		}
+	}
 }
 
 [component="user/logout"] {

diff --git a/less/sidebar.less b/less/sidebar.less
@@ -31,6 +31,7 @@
 	background: @sidebar-bg-color;
 	box-shadow: 0 0 10px rgba(51, 51, 51, .38);
 	top: 65px;
+	left: 0;
 	height: ~"calc(100% - 5px)";
 	-webkit-transform: translate3d(-250px,0,0);
 	transform: translate3d(-250px,0,0);

diff --git a/less/skins.less b/less/skins.less
@@ -86,6 +86,11 @@ body {
         #user-control-list {
         	li>a {
         		color: @body-color-dark;
+			}
+			li {
+				.btn-link {
+					color: @body-color-dark;
+				}
         	}
         }
 

diff --git a/less/style.less b/less/style.less
@@ -112,4 +112,10 @@ body #content {
 
 .bootbox {
 	z-index: 100001;
+}
+
+[component="category/dropdown"] {
+	.fa-stack {
+		font-size: 65%;
+	}
 }
diff --git a/lib/theme.js b/lib/theme.js
@@ -34,7 +34,7 @@ theme.getConfig = function (config, callback) {
 		config.selectedSkin = themeMaterialSkin || settings.skinOption || 'default';
 		config.bootswatchSkin = 'default';
 
-		callback(false, config);
+		callback(null, config);
 	});
 };
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "nodebb-theme-material",
   "version": "2.12.6",
   "nbbpm": {
-    "compatibility": "^1.11.0"
+    "compatibility": "^1.12.0"
   },
   "description": "Material Design theme for NodeBB",
   "main": "theme.less",

diff --git a/templates/account/consent.tpl b/templates/account/consent.tpl
@@ -11,7 +11,6 @@
 		</div>
 	</div>
 
-
 	<div class="row">
 		<div class="col-sm-6">
 			<!-- IF gdpr_consent -->

diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
@@ -90,8 +90,8 @@
 						</div>
 
 						<div class="form-group fg-line">
-			            	<div class="select">
-				            	<label for="grouptitle">[[user:grouptitle]]</label>
+			        <div class="select">
+				        <label for="grouptitle">[[user:grouptitle]]</label>
 								<select class="form-control" id="groupTitle" data-property="groupTitle" <!-- IF allowMultipleBadges --> multiple<!-- ENDIF allowMutlipleBadges -->>
 									<option value="">[[user:no-group-title]]</option>
 									<!-- BEGIN groups -->

diff --git a/templates/account/edit/email.tpl b/templates/account/edit/email.tpl
@@ -28,7 +28,7 @@
 
 					<br/>
 					<div class="form-actions">
-						<a id="submitBtn" href="#" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_email]]</a>
+						<button id="submitBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_email]]</button>
 					</div>
 				</form>
 			</div>

diff --git a/templates/account/edit/password.tpl b/templates/account/edit/password.tpl
@@ -38,7 +38,7 @@
 					</div>
 					<br/>
 					<div class="form-actions">
-						<a id="changePasswordBtn" href="#" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_password]]</a>
+						<button id="changePasswordBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_password]]</button>
 					</div>
 				</form>
 			</div>

diff --git a/templates/account/edit/username.tpl b/templates/account/edit/username.tpl
@@ -28,7 +28,7 @@
 
 					<br/>
 					<div class="form-actions">
-						<a id="submitBtn" href="#" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_username]]</a>
+						<button id="submitBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_username]]</button>
 					</div>
 				</form>
 			</div>

diff --git a/templates/account/info.tpl b/templates/account/info.tpl
@@ -7,11 +7,11 @@
 	<div class="row">
 		<div class="col-xs-12">
 			<div class="card">
-	        	<div class="card-header ch-alt">
-	        		[[global:sessions]]
-	        	</div>
-	        	<div class="card-body card-padding">
-	        		<ul class="list-group" component="user/sessions">
+				<div class="card-header ch-alt">
+					[[global:sessions]]
+				</div>
+				<div class="card-body card-padding">
+					<ul class="list-group" component="user/sessions">
 						<!-- BEGIN sessions -->
 						<li class="list-group-item" data-uuid="{../uuid}">
 							<div class="pull-right">
@@ -31,8 +31,8 @@
 						</li>
 						<!-- END sessions -->
 					</ul>
-	        	</div>
-	        </div>
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- ENDIF sessions.length -->
@@ -118,6 +118,13 @@
 						<!-- BEGIN history.bans -->
 						<li>
 							<p>
+								<a href="{config.relative_path}/user/{history.bans.user.userslug}">
+									<!-- IF history.bans.user.picture -->
+									<img title="{history.bans.user.username}" class="avatar avatar-sm avatar-rounded" src="{history.bans.user.picture}" />
+									<!-- ELSE -->
+									<span title="{history.bans.user.username}" class="avatar avatar-sm avatar-rounded user-icon" style="background-color: {history.bans.user.icon:bgColor};">{history.bans.user.icon:text}</span>
+									<!-- ENDIF history.bans.user.picture -->
+								</a>
 								<span class="timestamp timeago" title="{../timestampISO}"></span> &mdash; {../timestampReadable}<br />
 								<!-- IF ../until -->
 								<span class="expiry">[[user:info.banned-until, {../untilReadable}]]</span><br />

diff --git a/templates/account/sessions.tpl b/templates/account/sessions.tpl
@@ -0,0 +1,36 @@
+<!-- IMPORT partials/breadcrumbs.tpl -->
+
+<div class="account">
+	<!-- IMPORT partials/account/header.tpl -->
+
+	<!-- IF sessions.length -->
+	<div class="card">
+    <div class="card-header ch-alt">
+	    [[global:sessions]]
+	  </div>
+    <div class="card-body card-padding">
+      <p>[[user:sessions.description]]</p>
+      <ul class="list-group" component="user/sessions">
+        <!-- BEGIN sessions -->
+        <li class="list-group-item" data-uuid="{../uuid}">
+          <div class="pull-right">
+						<!-- IF isSelfOrAdminOrGlobalModerator -->
+						<!-- IF !../current -->
+						<button class="btn btn-xs btn-default" type="button" data-action="revokeSession">Revoke Session</button>
+						<!-- ENDIF !../current -->
+						<!-- ENDIF isSelfOrAdminOrGlobalModerator -->
+						{function.userAgentIcons}
+						<i class="fa fa-circle text-<!-- IF ../current -->success<!-- ELSE -->muted<!-- ENDIF ../current -->"></i>
+					</div>
+					{../browser} {../version} on {../platform}<br />
+					<small class="timeago text-muted" title="{../datetimeISO}"></small>
+					<ul>
+						<li><strong>[[global:ip_address]]</strong>: {../ip}</li>
+					</ul>
+        </li>
+        <!-- END sessions -->
+      </ul>
+    </div>
+	</div>
+	<!-- ENDIF sessions.length -->
+</div>