diff --git a/interface/resources/qml/controls-uit/Label.qml b/interface/resources/qml/controls-uit/Label.qml index f4015edd62..d9d33c1bfa 100644 --- a/interface/resources/qml/controls-uit/Label.qml +++ b/interface/resources/qml/controls-uit/Label.qml @@ -12,7 +12,7 @@ import QtQuick 2.5 import "../styles-uit" -RalewaySemibold { +RalewaySemiBold { property int colorScheme: hifi.colorSchemes.light size: hifi.fontSizes.inputLabel diff --git a/interface/resources/qml/controls-uit/TextEdit.qml b/interface/resources/qml/controls-uit/TextEdit.qml index 5edc65a6e5..5ee9ce94ba 100644 --- a/interface/resources/qml/controls-uit/TextEdit.qml +++ b/interface/resources/qml/controls-uit/TextEdit.qml @@ -17,8 +17,8 @@ TextEdit { property real size: 32 - FontLoader { id: ralewaySemibold; source: "../../fonts/Raleway-Semibold.ttf"; } - font.family: ralewaySemibold.name + FontLoader { id: ralewaySemiBold; source: "../../fonts/Raleway-SemiBold.ttf"; } + font.family: ralewaySemiBold.name font.pointSize: size verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft diff --git a/interface/resources/qml/dialogs/MessageDialog.qml b/interface/resources/qml/dialogs/MessageDialog.qml index 26ed406b02..e7e630c1ff 100644 --- a/interface/resources/qml/dialogs/MessageDialog.qml +++ b/interface/resources/qml/dialogs/MessageDialog.qml @@ -98,7 +98,7 @@ ModalWindow { } } - RalewaySemibold { + RalewaySemiBold { id: mainTextContainer onHeightChanged: d.resize(); onWidthChanged: d.resize(); wrapMode: Text.WordWrap @@ -114,7 +114,7 @@ ModalWindow { lineHeightMode: Text.ProportionalHeight } - RalewaySemibold { + RalewaySemiBold { id: informativeTextContainer onHeightChanged: d.resize(); onWidthChanged: d.resize(); wrapMode: Text.WordWrap diff --git a/interface/resources/qml/styles-uit/RalewaySemiBold-temp.qml b/interface/resources/qml/styles-uit/RalewaySemiBold.qml similarity index 76% rename from interface/resources/qml/styles-uit/RalewaySemiBold-temp.qml rename to interface/resources/qml/styles-uit/RalewaySemiBold.qml index 3648e6bab9..3c36a872a4 100644 --- a/interface/resources/qml/styles-uit/RalewaySemiBold-temp.qml +++ b/interface/resources/qml/styles-uit/RalewaySemiBold.qml @@ -1,5 +1,5 @@ // -// RalewaySemibold.qml +// RalewaySemiBold.qml // // Created by David Rowe on 12 Feb 2016 // Copyright 2016 High Fidelity, Inc. @@ -14,10 +14,10 @@ import QtQuick.Controls.Styles 1.4 Text { id: root - FontLoader { id: ralewaySemibold; source: "../../fonts/Raleway-Semibold.ttf"; } + FontLoader { id: ralewaySemiBold; source: "../../fonts/Raleway-SemiBold.ttf"; } property real size: 32 font.pixelSize: size verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft - font.family: ralewaySemibold.name + font.family: ralewaySemiBold.name }