diff --git a/interface/resources/qml/controls-uit/CheckBox.qml b/interface/resources/qml/controls-uit/CheckBox.qml
index bb138e07c6..916a7d4889 100644
--- a/interface/resources/qml/controls-uit/CheckBox.qml
+++ b/interface/resources/qml/controls-uit/CheckBox.qml
@@ -68,9 +68,9 @@ Original.CheckBox {
height: checkSize
radius: checkRadius
anchors.centerIn: parent
- color: isRedCheck ? "#FF0000" : hifi.colors.checkboxChecked
+ color: isRedCheck ? hifi.colors.checkboxCheckedRed : hifi.colors.checkboxChecked
border.width: 2
- border.color: isRedCheck? "#D00000" : hifi.colors.checkboxCheckedBorder
+ border.color: isRedCheck? hifi.colors.checkboxCheckedBorderRed : hifi.colors.checkboxCheckedBorder
visible: checked && !pressed || !checked && pressed
}
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 807a315693..a332712ce3 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -612,7 +612,7 @@ Rectangle {
"Bold names in the list are avatar display names.
" +
"Purple borders around profile pictures are connections.
" +
"Green borders around profile pictures are friends.
" +
- "In some situations, you can also see others' usernames.
" +
+ "Others can find you and see your username according to your availability settings.
" +
"If you can see someone's username, you can GoTo them by selecting them in the PAL, then clicking their name.
" +
"
If someone's display name isn't set, a unique session display name is assigned to them.
" +
"
Administrators of this domain can also see the username or machine ID associated with each avatar present.");
@@ -961,11 +961,11 @@ Rectangle {
size: hifi.fontSizes.tabularData;
// Anchors
anchors.top: myCard.top;
- anchors.horizontalCenter: parent.horizontalCenter;
+ anchors.left: parent.left;
// Style
color: hifi.colors.baseGrayHighlight;
// Alignment
- horizontalAlignment: Text.AlignHCenter;
+ horizontalAlignment: Text.AlignLeft;
verticalAlignment: Text.AlignTop;
}
Rectangle {
@@ -1000,9 +1000,9 @@ Rectangle {
popupComboDialog("Set your availability:",
availabilityComboBox.availabilityStrings,
["Your username will be visible in everyone's 'Nearby' list.\nAnyone will be able to jump to your location from within the 'Nearby' list.",
- "You will be visible in the 'People' list only for those with whom you are connected or friends.\nThey will be able to jump to your location if the domain allows.",
- "You will be visible in the 'People' list only for those with whom you are friends.\nThey will be able to jump to your location if the domain allows.",
- "You will not be visible in the 'People' list of any other users. Only domain admins will be able to see your username in the 'Nearby' list."],
+ "You will be visible in the 'Connections' list only for those with whom you are connected or friends.\nThey will be able to jump to your location if the domain allows.",
+ "You will be visible in the 'Connections' list only for those with whom you are friends.\nThey will be able to jump to your location if the domain allows.",
+ "You will not be visible in the 'Connections' list of any other users. Only domain admins will be able to see your username in the 'Nearby' list."],
["all", "connections", "friends", "none"]);
}
onEntered: availabilityComboBox.color = hifi.colors.lightGrayText;
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
index a9d5a0ed2f..386af206e1 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -70,6 +70,9 @@ Item {
readonly property color indigoAccent: "#9495FF"
readonly property color magentaHighlight: "#EF93D1"
readonly property color magentaAccent: "#A2277C"
+ readonly property color checkboxCheckedRed: "#FF0000"
+ readonly property color checkboxCheckedBorderRed: "#D00000"
+
// Semitransparent
readonly property color darkGray30: "#4d121212"
readonly property color darkGray0: "#00121212"