Updates for latest NodeBB version

Author: pichalite

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) {

less/menu.less

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

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);

less/skins.less

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

less/style.less

@@ -112,4 +112,10 @@ body #content {
 
 .bootbox {
 	z-index: 100001;
+}
+
+[component="category/dropdown"] {
+	.fa-stack {
+		font-size: 65%;
+	}
 }

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);
 	});
 };
 

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",

templates/account/consent.tpl

@@ -11,7 +11,6 @@
 		</div>
 	</div>
 
-
 	<div class="row">
 		<div class="col-sm-6">
 			<!-- IF gdpr_consent -->

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 -->

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>