Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 16:14:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Replace Graphik with Fira Sans

Browse source
This commit is contained in:
Dale Glass 2022-08-07 14:01:42 +02:00
parent b10123400f
commit 1332d9d35e
30 changed files with 217 additions and 217 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml
View file

@ -143,7 +143,7 @@ Rectangle {
anchors.rightMargin: 26
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
text: "Stand out from the crowd!"
Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight
@ -154,7 +154,7 @@ Rectangle {
wrapMode: Text.Wrap
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Create your custom avatar."
Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight
@ -185,7 +185,7 @@ Rectangle {
fillMode: Image.PreserveAspectFit
}
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
text: "Scan for Mobile App"
Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight
@ -216,7 +216,7 @@ Rectangle {
anchors.right: parent.right
anchors.rightMargin: 24
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: yourAvatarsTitle
text: "Your Avatars"
anchors.top: parent.top
@ -225,7 +225,7 @@ Rectangle {
color: simplifiedUI.colors.text.white
size: 22
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: yourAvatarsSubtitle
text: "These are the avatars that you've created and uploaded via the Avatar Creator."
width: parent.width
@ -301,7 +301,7 @@ Rectangle {
}
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: errorText
text: ""
visible: text !== ""

2
interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml
View file

@ -75,7 +75,7 @@ Rectangle {
}
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: avatarName
text: root.itemName
anchors.left: itemPreviewImage.right

2
interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml
View file

@ -69,7 +69,7 @@ Item {
anchors.leftMargin: 21
anchors.verticalCenter: parent.verticalCenter
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: displayNameLabel
text: "Display Name"
color: simplifiedUI.colors.text.lightGrey

2
interface/resources/qml/hifi/simplifiedUI/helpApp/HelpApp.qml
View file

@ -110,7 +110,7 @@ Rectangle {
width: tabTitleText.paintedWidth + 32
height: parent.height
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: tabTitleText
color: simplifiedUI.colors.text.white
anchors.fill: parent

30
interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml
View file

@ -72,7 +72,7 @@ Flickable {
Layout.bottomMargin: 24
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
text: "About Your Configuration"
Layout.preferredWidth: parent.width
Layout.topMargin: 16
@ -83,7 +83,7 @@ Flickable {
wrapMode: Text.Wrap
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Use the button below to get a copy to share with us."
Layout.preferredWidth: parent.width
Layout.bottomMargin: 8
@ -93,7 +93,7 @@ Flickable {
wrapMode: Text.Wrap
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Version " + Window.checkVersion()
Layout.preferredWidth: parent.width
Layout.topMargin: 8
@ -104,7 +104,7 @@ Flickable {
wrapMode: Text.Wrap
}
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
text: "Platform Info"
Layout.preferredWidth: parent.width
Layout.topMargin: 8
@ -115,7 +115,7 @@ Flickable {
wrapMode: Text.Wrap
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "<b>Computer Vendor/Model:</b>"
Layout.preferredWidth: parent.width
height: paintedHeight
@ -138,7 +138,7 @@ Flickable {
}
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "<b>Profiled Platform Tier:</b> " + PlatformInfo.getTierProfiled()
Layout.preferredWidth: parent.width
height: paintedHeight
@ -147,7 +147,7 @@ Flickable {
wrapMode: Text.Wrap
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "<b>OS Type:</b> " + PlatformInfo.getOperatingSystemType()
Layout.preferredWidth: parent.width
height: paintedHeight
@ -156,7 +156,7 @@ Flickable {
wrapMode: Text.Wrap
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "<b>CPU:</b>"
Layout.preferredWidth: parent.width
height: paintedHeight
@ -175,7 +175,7 @@ Flickable {
}
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "<b># CPUs:</b> " + PlatformInfo.getNumCPUs()
Layout.preferredWidth: parent.width
height: paintedHeight
@ -184,7 +184,7 @@ Flickable {
wrapMode: Text.Wrap
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "<b># CPU Cores:</b> " + PlatformInfo.getNumLogicalCores()
Layout.preferredWidth: parent.width
height: paintedHeight
@ -193,7 +193,7 @@ Flickable {
wrapMode: Text.Wrap
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "<b>RAM:</b> " + PlatformInfo.getTotalSystemMemoryMB() + " MB"
Layout.preferredWidth: parent.width
height: paintedHeight
@ -202,7 +202,7 @@ Flickable {
wrapMode: Text.Wrap
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "<b>GPU:</b> "
Layout.preferredWidth: parent.width
height: paintedHeight
@ -221,7 +221,7 @@ Flickable {
}
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "<b>VR Hand Controllers:</b> " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None"))
Layout.preferredWidth: parent.width
height: paintedHeight
@ -251,7 +251,7 @@ Flickable {
}
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "<b>Audio Input:</b> " + audioInputDevices.selectedInputDeviceName
Layout.preferredWidth: parent.width
height: paintedHeight
@ -282,7 +282,7 @@ Flickable {
}
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "<b>Audio Output:</b> " + audioOutputDevices.selectedOutputDeviceName
Layout.preferredWidth: parent.width
height: paintedHeight

54
interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml
View file

@ -104,7 +104,7 @@ Item {
height: parent.height
spacing: controlsTableRoot.rowPadding
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: cameraText
text: "Camera"
width: paintedWidth
@ -115,7 +115,7 @@ Item {
color: simplifiedUI.colors.text.white
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Right-click and drag to look around"
width: parent.width - cameraText.width - parent.spacing - controlsTableRoot.rowPadding
height: parent.height
@ -147,7 +147,7 @@ Item {
width: controlsTableRoot.column1Width
height: parent.height
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "W / ↑"
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
@ -171,7 +171,7 @@ Item {
height: parent.height
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Walk Forward"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height
@ -201,7 +201,7 @@ Item {
width: controlsTableRoot.column1Width
height: parent.height
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "S / ↓"
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
@ -225,7 +225,7 @@ Item {
height: parent.height
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Walk Backward"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height
@ -255,7 +255,7 @@ Item {
width: controlsTableRoot.column1Width
height: parent.height
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "A / ←"
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
@ -279,7 +279,7 @@ Item {
height: parent.height
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Turn Left"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height
@ -309,7 +309,7 @@ Item {
width: controlsTableRoot.column1Width
height: parent.height
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "D / →"
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
@ -333,7 +333,7 @@ Item {
height: parent.height
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Turn Right"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height
@ -363,7 +363,7 @@ Item {
width: controlsTableRoot.column1Width
height: parent.height
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Q"
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
@ -387,7 +387,7 @@ Item {
height: parent.height
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Sidestep Left"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height
@ -417,7 +417,7 @@ Item {
width: controlsTableRoot.column1Width
height: parent.height
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "E"
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
@ -441,7 +441,7 @@ Item {
height: parent.height
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Sidestep Right"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height
@ -471,7 +471,7 @@ Item {
width: controlsTableRoot.column1Width
height: parent.height
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Shift"
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
@ -500,7 +500,7 @@ Item {
height: parent.height
spacing: controlsTableRoot.rowPadding
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: runText
text: "Hold + Direction to Run"
width: paintedWidth
@ -511,7 +511,7 @@ Item {
color: simplifiedUI.colors.text.white
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Example: Shift + W"
width: parent.width - runText.width - parent.spacing - controlsTableRoot.rowPadding
height: parent.height
@ -543,7 +543,7 @@ Item {
width: controlsTableRoot.column1Width
height: parent.height
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Space"
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
@ -572,7 +572,7 @@ Item {
height: parent.height
spacing: controlsTableRoot.rowPadding
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: jumpText
text: "Jump / Stand Up"
width: paintedWidth
@ -583,7 +583,7 @@ Item {
color: simplifiedUI.colors.text.white
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Stand Up only while seated"
width: parent.width - jumpText.width - parent.spacing - controlsTableRoot.rowPadding
height: parent.height
@ -615,7 +615,7 @@ Item {
width: controlsTableRoot.column1Width
height: parent.height
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "1"
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
@ -639,7 +639,7 @@ Item {
height: parent.height
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "1st Person View"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height
@ -669,7 +669,7 @@ Item {
width: controlsTableRoot.column1Width
height: parent.height
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "2"
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
@ -698,7 +698,7 @@ Item {
height: parent.height
spacing: controlsTableRoot.rowPadding
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: selfieText
text: "Selfie"
width: paintedWidth
@ -709,7 +709,7 @@ Item {
color: simplifiedUI.colors.text.white
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Look at self"
width: parent.width - selfieText.width - parent.spacing - controlsTableRoot.rowPadding
height: parent.height
@ -741,7 +741,7 @@ Item {
width: controlsTableRoot.column1Width
height: parent.height
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "3"
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
@ -765,7 +765,7 @@ Item {
height: parent.height
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "3rd Person View"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height

4
interface/resources/qml/hifi/simplifiedUI/helpApp/controls/HelpControls.qml
View file

@ -57,7 +57,7 @@ Flickable {
anchors.top: parent.top
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
text: "HQ Controls"
Layout.preferredWidth: parent.width
Layout.topMargin: 16
@ -66,7 +66,7 @@ Flickable {
color: simplifiedUI.colors.text.white
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "You can use the following controls to move your avatar around your HQ:"
Layout.preferredWidth: parent.width
wrapMode: Text.Wrap

8
interface/resources/qml/hifi/simplifiedUI/helpApp/faq/HelpFAQ.qml
View file

@ -51,7 +51,7 @@ Item {
anchors.top: parent.top
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
text: "FAQ"
Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight
@ -60,7 +60,7 @@ Item {
color: simplifiedUI.colors.text.white
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "You can find answers to all of our frequently asked questions by clicking the button below."
Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight
@ -82,7 +82,7 @@ Item {
}
}
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
text: "Having problems with your audio?"
Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight
@ -91,7 +91,7 @@ Item {
color: simplifiedUI.colors.text.white
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "Quickly check your audio configuration and make changes to resolve any audio input/output issues."
Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight

4
interface/resources/qml/hifi/simplifiedUI/helpApp/support/HelpSupport.qml
View file

@ -49,7 +49,7 @@ Item {
anchors.top: parent.top
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
text: "Support"
Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight
@ -58,7 +58,7 @@ Item {
color: simplifiedUI.colors.text.white
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "You can quickly get the support that you need by clicking the button below."
Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight

2
interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml
View file

@ -128,7 +128,7 @@ Rectangle {
width: tabTitleText.paintedWidth + 32
height: parent.height
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: tabTitleText
color: simplifiedUI.colors.text.white
anchors.fill: parent

8
interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
View file

@ -74,7 +74,7 @@ Flickable {
Layout.topMargin: 24
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: volumeControlsTitle
text: "Volume Controls"
Layout.preferredWidth: parent.width
@ -171,7 +171,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: micControlsTitle
text: "Default Mute Controls"
Layout.preferredWidth: parent.width
@ -241,7 +241,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: inputDeviceTitle
text: "Which input device?"
Layout.preferredWidth: parent.width
@ -336,7 +336,7 @@ Flickable {
Layout.bottomMargin: 24
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: outputDeviceTitle
text: "Which output device?"
Layout.preferredWidth: parent.width

4
interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml
View file

@ -65,7 +65,7 @@ Flickable {
Layout.bottomMargin: 24
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: uiControlsTitle
text: "User Interface"
Layout.preferredWidth: parent.width
@ -74,7 +74,7 @@ Flickable {
color: simplifiedUI.colors.text.white
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: uiControlsSubtitle
text: "You'll have to restart Interface after changing either of these settings. If you don't get any Toolbar apps back after restarting, run defaultScripts.js manually."
Layout.preferredWidth: parent.width

10
interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
View file

@ -69,7 +69,7 @@ Flickable {
Layout.topMargin: 24
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: avatarNameTagsTitle
text: "Avatar Name Tags"
Layout.preferredWidth: parent.width
@ -117,7 +117,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: emoteTitle
text: "Emote UI"
Layout.maximumWidth: parent.width
@ -160,7 +160,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: performanceTitle
text: "Graphics Settings"
Layout.preferredWidth: parent.width
@ -217,7 +217,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: cameraTitle
text: "Camera View"
Layout.preferredWidth: parent.width
@ -289,7 +289,7 @@ Flickable {
Layout.bottomMargin: 24
spacing: 0
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: logoutText
text: (AccountServices.username === "Unknown user" ? "Log In" : "Logout " + AccountServices.username)
wrapMode: Text.Wrap

10
interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
View file

@ -74,7 +74,7 @@ Flickable {
Layout.topMargin: 24
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: controlsTitle
text: "VR Movement Controls"
Layout.preferredWidth: parent.width
@ -159,7 +159,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
text: "VR Rotation Mode"
Layout.preferredWidth: parent.width
height: paintedHeight
@ -199,7 +199,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: micControlsTitle
text: "Default Mute Controls"
Layout.preferredWidth: parent.width
@ -242,7 +242,7 @@ Flickable {
Layout.preferredWidth: parent.width
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: inputDeviceTitle
text: "Which input device?"
Layout.preferredWidth: parent.width
@ -338,7 +338,7 @@ Flickable {
Layout.bottomMargin: 24
spacing: 0
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: outputDeviceTitle
text: "Which output device?"
Layout.preferredWidth: parent.width

4
interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml
View file

@ -96,9 +96,9 @@ Original.Button {
}
}
contentItem: HifiStylesUit.GraphikMedium {
contentItem: HifiStylesUit.FiraSansMedium {
id: buttonText
topPadding: -2 // Necessary for proper alignment using Graphik Medium
//topPadding: -2 // Necessary for proper alignment using Graphik Medium
wrapMode: Text.Wrap
color: enabled ? simplifiedUI.colors.controls.button.text.enabled : simplifiedUI.colors.controls.button.text.disabled
size: simplifiedUI.sizes.controls.button.textSize

2
interface/resources/qml/hifi/simplifiedUI/simplifiedControls/CheckBox.qml
View file

@ -77,7 +77,7 @@ Original.CheckBox {
id: checkBoxLabel
text: root.text
color: root.color
font.family: "Graphik"
font.family: "FiraSans"
font.pixelSize: 14
font.weight: Font.DemiBold
x: 2

4
interface/resources/qml/hifi/simplifiedUI/simplifiedControls/RadioButton.qml
View file

@ -88,7 +88,7 @@ RadioButton {
contentItem: Text {
id: radioButtonLabel
font.pixelSize: 14
font.family: "Graphik"
font.family: "FiraSans"
font.weight: Font.Normal
text: root.text
color: simplifiedUI.colors.text.white
@ -98,6 +98,6 @@ RadioButton {
enabled: root.enabled
verticalAlignment: Text.AlignVCenter
leftPadding: radioButtonIndicator.width + root.labelLeftMargin
topPadding: -3 // For perfect alignment when using Graphik
//topPadding: -3 // For perfect alignment when using Graphik
}
}

2
interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Slider.qml
View file

@ -33,7 +33,7 @@ Item {
property alias pressed: sliderControl.pressed
property real defaultValue: 0.0
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: sliderText
text: ""
anchors.right: sliderControl.left

4
interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Switch.qml
View file

@ -147,7 +147,7 @@ Item {
anchors.top: parent.top
anchors.bottom: parent.bottom
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: labelOff
text: ""
size: simplifiedUI.sizes.controls.simplifiedSwitch.labelTextSize
@ -195,7 +195,7 @@ Item {
anchors.top: parent.top
anchors.bottom: parent.bottom
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: labelOn
text: ""
size: simplifiedUI.sizes.controls.simplifiedSwitch.labelTextSize

2
interface/resources/qml/hifi/simplifiedUI/simplifiedControls/TextField.qml
View file

@ -28,7 +28,7 @@ TextField {
property bool blankPlaceholderTextOnFocus: true
color: simplifiedUI.colors.text.white
font.family: "Graphik Medium"
font.family: "FiraSans Medium"
font.pixelSize: 22
selectionColor: simplifiedUI.colors.text.white
selectedTextColor: simplifiedUI.colors.text.darkGrey

4
interface/resources/qml/stylesUit/GraphikMedium.qml
View file

@ -1,5 +1,5 @@
//
// GraphikMedium.qml
// FiraSansMedium.qml
//
// Created by Wayne Chen on 3 May 2019
// Copyright 2019 High Fidelity, Inc.
@ -16,6 +16,6 @@ Text {
font.pixelSize: size
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
font.family: "Graphik"
font.family: "FiraSans"
font.weight: Font.Medium
}

4
interface/resources/qml/stylesUit/GraphikRegular.qml
View file

@ -1,5 +1,5 @@
//
// GraphikRegular.qml
// FiraSansRegular.qml
//
// Created by Wayne Chen on 2 May 2019
// Copyright 2019 High Fidelity, Inc.
@ -16,5 +16,5 @@ Text {
font.pixelSize: size
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
font.family: "Graphik"
font.family: "FiraSans"
}

4
interface/resources/qml/stylesUit/GraphikSemiBold.qml
View file

@ -1,5 +1,5 @@
//
// GraphikSemiBold.qml
// FiraSansSemiBold.qml
//
// Created by Wayne Chen on 2 May 2019
// Copyright 2019 High Fidelity, Inc.
@ -16,6 +16,6 @@ Text {
font.pixelSize: size
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
font.family: "Graphik"
font.family: "FiraSans"
font.weight: Font.DemiBold
}

6
interface/src/Application.cpp
View file

@ -1096,9 +1096,9 @@ Application::Application(
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Bold.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-SemiBold.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Cairo-SemiBold.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-SemiBold.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Regular.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Medium.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-SemiBold.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-Regular.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-Medium.ttf");
_window->setWindowTitle("Overte");
Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us

4
launchers/win32/Launcher.rc
View file

@ -77,9 +77,9 @@ IDR_MAINFRAME ICON "res\\interface.ico"
// BINARY
//
IDR_FONT_REGULAR BINARY "res\\Graphikregular.ttf"
IDR_FONT_REGULAR BINARY "res\\FiraSansregular.ttf"
IDR_FONT_BOLD BINARY "res\\Graphikbold.ttf"
IDR_FONT_BOLD BINARY "res\\FiraSansbold.ttf"
/////////////////////////////////////////////////////////////////////////////

16
launchers/win32/LauncherDlg.cpp
View file

@ -36,8 +36,8 @@ static COLORREF COLOR_LIGHTER_GREY = RGB(230, 230, 230);
static COLORREF COLOR_LIGHT_GREY = RGB(200, 200, 200);
static COLORREF COLOR_BLUE = RGB(50, 160, 200);
static CString GRAPHIK_REGULAR = _T("Graphik-Regular");
static CString GRAPHIK_SEMIBOLD = _T("Graphik-Semibold");
static CString FIRASANS_REGULAR = _T("FiraSans-Regular");
static CString FIRASANS_SEMIBOLD = _T("FiraSans-SemiBold");
static CString TROUBLE_URL = _T("https://www.highfidelity.com/hq-support");
static CString TERMS_URL = _T("https://www.highfidelity.com/termsofservice");
@ -91,13 +91,13 @@ BOOL CLauncherDlg::OnInitDialog() {
SetIcon(m_hIcon, FALSE); // Set small icon
CFont editFont;
if (LauncherUtils::getFont(GRAPHIK_REGULAR, FIELDS_FONT_SIZE, true, editFont)) {
if (LauncherUtils::getFont(FIRASANS_REGULAR, FIELDS_FONT_SIZE, true, editFont)) {
m_orgname.SetFont(&editFont);
m_username.SetFont(&editFont);
m_password.SetFont(&editFont);
}
CFont buttonFont;
if (LauncherUtils::getFont(_T("Graphik-Bold"), BUTTON_FONT_SIZE, true, buttonFont)) {
if (LauncherUtils::getFont(_T("FiraSans-Bold"), BUTTON_FONT_SIZE, true, buttonFont)) {
m_btnNext.SetFont(&editFont);
}
@ -568,7 +568,7 @@ HBRUSH CLauncherDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
pDC->SetTextColor(textFormat.color);
pDC->SetBkMode(TRANSPARENT);
CFont textFont;
CString fontFamily = textFormat.isBold ? GRAPHIK_SEMIBOLD : GRAPHIK_REGULAR;
CString fontFamily = textFormat.isBold ? FIRASANS_SEMIBOLD : FIRASANS_REGULAR;
if (LauncherUtils::getFont(fontFamily, textFormat.size, textFormat.isBold, textFont)) {
pDC->SelectObject(&textFont);
}
@ -613,7 +613,7 @@ void CLauncherDlg::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct)
dc.SetTextColor(COLOR_WHITE);
CFont buttonFont;
if (LauncherUtils::getFont(GRAPHIK_SEMIBOLD, BUTTON_FONT_SIZE, true, buttonFont)) {
if (LauncherUtils::getFont(FIRASANS_SEMIBOLD, BUTTON_FONT_SIZE, true, buttonFont)) {
dc.SelectObject(buttonFont);
}
dc.DrawText(btnName, CRect(rect.left, rect.top + 4, rect.right, rect.bottom - 8), DT_CENTER | DT_VCENTER | DT_SINGLELINE);
@ -622,7 +622,7 @@ void CLauncherDlg::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct)
dc.FillSolidRect(rect, COLOR_BLACK);
dc.SetTextColor(COLOR_BLUE);
CFont buttonFont;
if (LauncherUtils::getFont(GRAPHIK_SEMIBOLD, TROUBLE_FONT_SIZE, true, buttonFont)) {
if (LauncherUtils::getFont(FIRASANS_SEMIBOLD, TROUBLE_FONT_SIZE, true, buttonFont)) {
dc.SelectObject(buttonFont);
}
dc.DrawText(_T("Having Trouble"), CRect(rect.left, rect.top, rect.right, rect.bottom), DT_CENTER | DT_VCENTER | DT_SINGLELINE);
@ -630,7 +630,7 @@ void CLauncherDlg::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct)
dc.FillSolidRect(rect, COLOR_BLACK);
dc.SetTextColor(COLOR_LIGHT_GREY);
CFont buttonFont;
if (LauncherUtils::getFont(GRAPHIK_SEMIBOLD, TERMS_FONT_SIZE, true, buttonFont)) {
if (LauncherUtils::getFont(FIRASANS_SEMIBOLD, TERMS_FONT_SIZE, true, buttonFont)) {
dc.SelectObject(buttonFont);
}
dc.DrawText(_T("Terms of Service"), CRect(rect.left, rect.top, rect.right, rect.bottom), DT_LEFT | DT_TOP | DT_SINGLELINE);

6
screenshare/src/styles.css
View file

@ -1,7 +1,7 @@
body {
background-color: black;
box-sizing: border-box;
font-family: "Graphik";
font-family: "FiraSans";
margin: 0px 22px 10px 22px;
}
@ -77,8 +77,8 @@ yes:hover + #yes_background {
}
@font-face {
font-family: "Graphik";
src: url("./resources/Graphik-Regular.ttf");
font-family: "FiraSans";
src: url("./resources/FiraSans-Regular.ttf");
}
#title {

14
scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml
View file

@ -117,7 +117,7 @@ Rectangle {
width: 50
height: width
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
text: "X"
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
@ -137,7 +137,7 @@ Rectangle {
}
}
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: popupHeader1
text: "Emoji Reactions"
anchors.top: parent.top
@ -154,7 +154,7 @@ Rectangle {
size: 22
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: popupText1
text: "Click an emoji and it will appear above your head!\nUse Emoji Reactions to express yourself without saying a word.\n\n" +
"Try using the search bar to search for an emoji directly. You can use your arrow keys to navigate the results."
@ -172,7 +172,7 @@ Rectangle {
size: 18
}
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: popupHeader2
text: "Attributions"
anchors.top: popupText1.bottom
@ -188,7 +188,7 @@ Rectangle {
size: 22
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
id: popupText2
textFormat: Text.RichText
text: "<style>a:link { color: #FFF; }</style>" +
@ -372,7 +372,7 @@ Rectangle {
width: 22
height: width
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
text: "?"
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
@ -459,7 +459,7 @@ Rectangle {
anchors.rightMargin: -grid.anchors.rightMargin + 2
}
HifiStylesUit.GraphikRegular {
HifiStylesUit.FiraSansRegular {
readonly property var cantFindEmojiList: ["😣", "😭", "😖", "😢", "🤔"]
onVisibleChanged: {
if (visible) {

2
scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
View file

@ -255,7 +255,7 @@ Rectangle {
opacity: 0.8
radius: 4
HifiStylesUit.GraphikSemiBold {
HifiStylesUit.FiraSansSemiBold {
id: toolTipText
anchors.left: parent.left
anchors.leftMargin: 2

14
tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
View file

@ -4,12 +4,12 @@
********************************************************************/
@font-face{
font-family: 'Graphik Semibold';
font-family: 'FiraSans Semibold';
src: url('../fonts/Graphik-SemiBold.otf') format('opentype');
}
@font-face{
font-family: 'Graphik Regular';
font-family: 'FiraSans Regular';
src: url('../fonts/Graphik-Regular.otf') format('opentype');
}
@ -34,7 +34,7 @@ html
body
{
font-family: 'Graphik Regular', 'Proxima Nova', arial, sans-serif;
font-family: 'FiraSans Regular', 'Proxima Nova', arial, sans-serif;
font-weight: 400;
color: #000000;
letter-spacing: 0.5px;
@ -59,7 +59,7 @@ section
********************************************************************/
h1, h2, h3, h4 {
font-family: "Graphik Semibold", Helvetica, sans-serif;
font-family: "FiraSans Semibold", Helvetica, sans-serif;
}
h1
@ -83,7 +83,7 @@ h3
h4
{
font-family: 'Graphik Regular';
font-family: 'FiraSans Regular';
font-size: 1.03rem;
}
@ -251,7 +251,7 @@ nav #nav-search {
}
nav h3 {
font-family: "Graphik Regular", sans-serif;
font-family: "FiraSans Regular", sans-serif;
font-size: 0.9rem;
color: #FFFFFF;
text-transform: uppercase;
@ -373,7 +373,7 @@ nav > h2 > a {
.search-input
{
font-family: 'Graphik Regular', sans-serif;
font-family: 'FiraSans Regular', sans-serif;
font-size: 90%;
border: 1px solid #ddd;
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.06);