Merge branch 'master' of https://github.com/NodeBB/nodebb-theme-persona

less/bootstrap/dropdowns.less

@@ -165,7 +165,7 @@
   right: 0;
   bottom: 0;
   top: 0;
-  z-index: (@zindex-dropdown - 10);
+  z-index: @zindex-dropdown;
 }
 
 // Right aligned dropdowns

less/modules/alerts.less

@@ -7,14 +7,21 @@
 	bottom: 0px;
 
 	.alert {
-		&::before {
+		overflow: hidden;
 		position: relative;
-			top: -15px;
-			left: -15px;
+
+		&::before {
+			transition: inherit;
 			display: block;
-			height: 2px;
+			position: absolute;
+			z-index: 0;
+
+			opacity: 0.1;
+			top: 0;
+			left: 0;
+			bottom: 0;
 			width: 0;
-			transition: inherit;
+			height: 100%;
 		}
 
 		&.alert-info::before {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "11.0.10",
+  "version": "11.0.14",
   "nbbpm": {
     "compatibility": "^1.17.0"
   },

templates/account/edit.tpl

@@ -117,9 +117,9 @@
 					{{{each sso}}}
 					<div class="list-group-item">
 						<!-- IF ../deauthUrl -->
-						<a class="btn btn-default btn-xs pull-right" href="{../deauthUrl}">[[user:sso.dissociate]]</a>
+						<a data-component="{../component}" class="btn btn-default btn-xs pull-right" href="{../deauthUrl}">[[user:sso.dissociate]]</a>
 						<!-- END -->
-						<a href="{../url}" target="<!-- IF ../associated -->_blank<!-- ELSE -->_top<!-- ENDIF ../associated -->">
+						<a data-component="{../component}" href="{../url}" target="<!-- IF ../associated -->_blank<!-- ELSE -->_top<!-- ENDIF ../associated -->">
 							<!-- IF ../icon --><i class="fa {../icon}"></i><!-- ENDIF ../icon -->
 							<!-- IF ../associated -->[[user:sso.associated]]<!-- ELSE -->[[user:sso.not-associated]]<!-- ENDIF ../associated -->
 							{../name}

templates/partials/modals/upload_file_modal.tpl

@@ -36,7 +36,7 @@
 					<div id="alert-error" class="alert alert-danger hide"></div>
 				</div>
 				<div class="modal-footer">
-					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
+					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">[[global:close]]</button>
 					<button id="fileUploadSubmitBtn" class="btn btn-primary">{button}</button>
 				</div>
 			</div>

templates/partials/modals/upload_picture_from_url_modal.tpl

@@ -9,7 +9,7 @@
 					<input id="uploadFromUrl" class="form-control" type="text"/>
 				</div>
 				<div class="modal-footer">
-					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
+					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">[[global:close]]</button>
 					<button class="btn btn-primary upload-btn">[[user:upload_picture]]</button>
 				</div>
 			</div>