diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index d658e5d8ce..9c220b740e 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -414,7 +414,7 @@ "name": "group_permissions", "type": "table", "caption": "Permissions for Users in Groups", - "help": "For groups that are supplied through OAuth, you will need to denote them by putting an \"@\" symbol in front of each item. e.g. \"@silver\"", + "help": "For groups that are provided from WordPress you need to denote them by putting an \"@\" symbol in front of each item, e.g., \"@silver\"". "categorize_by_key": "permissions_id", "can_add_new_categories": true, "can_add_new_rows": false, @@ -543,7 +543,7 @@ "name": "group_forbiddens", "type": "table", "caption": "Permissions Denied to Users in Groups", - "help": "For groups that are supplied through OAuth, you will need to denote them by putting an \"@\" symbol in front of each item. e.g. \"@silver\"", + "help": "For groups that are provided from WordPress you need to denote them by putting an \"@\" symbol in front of each item, e.g., \"@silver\"". "categorize_by_key": "permissions_id", "can_add_new_categories": true, "can_add_new_rows": false, diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index bba46e78c5..04e980f0bb 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -189,7 +189,7 @@ Item { anchors { top: parent.top left: parent.left - right: parent.right; + right: parent.right topMargin: 1.5 * hifi.dimensions.contentSpacing.y // horizontalCenter: mainContainer.horizontalCenter } @@ -595,7 +595,7 @@ Item { leftMargin: hifi.dimensions.contentSpacing.x } - text: "Sign Up" + text: "Sign Up" linkColor: hifi.colors.blueAccent onLinkActivated: { diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index f40082c1e7..64cdf98239 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -10,7 +10,7 @@ // // For happ(ier) development of QML, use these two things: -// This forces QML files to be pulled from the source as you edit it: HIFI_USE_SOURCE_TREE_RESOURCES=1 +// This forces QML files to be pulled from the source as you edit it: set environment variable HIFI_USE_SOURCE_TREE_RESOURCES=1 // Use this to live reload: DependencyManager::get()->clearCache(); #include "Menu.h"