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

Merge pull request #7284 from ctrlaltdavid/fix-raleway-semibold

Browse source 
Fix case of RalewaySemiBold font name
This commit is contained in:
Chris Collins 2016-03-08 21:24:15 -08:00
commit d1401796d8
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/controls-uit/Label.qml
View file

@ -12,7 +12,7 @@ import QtQuick 2.5
import "../styles-uit"
RalewaySemibold {
RalewaySemiBold {
property int colorScheme: hifi.colorSchemes.light
size: hifi.fontSizes.inputLabel

4
interface/resources/qml/controls-uit/TextEdit.qml
View file

@ -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

4
interface/resources/qml/dialogs/MessageDialog.qml
View file

@ -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

6
interface/resources/qml/styles-uit/RalewaySemibold.qml → interface/resources/qml/styles-uit/RalewaySemiBold.qml
View file

@ -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
}