Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup after rebase

Browse source
This commit is contained in:
Zach Fox 2017-01-13 13:15:01 -08:00
parent a9226e303c
commit a69a10b8e4
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/controls-uit/CheckBox.qml
View file

@ -16,7 +16,6 @@ import "../styles-uit"
Original.CheckBox { Original.CheckBox {
id: checkBox id: checkBox
HifiConstants { id: hifi }
property int colorScheme: hifi.colorSchemes.light property int colorScheme: hifi.colorSchemes.light
readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light

6
interface/resources/qml/hifi/LetterboxMessage.qml
View file

@ -15,7 +15,7 @@ import "../styles-uit"
Item { Item {
property alias text: popupText.text property alias text: popupText.text
property real radius: hifi.dimensions.borderRadius property real popupRadius: hifi.dimensions.borderRadius
visible: false visible: false
id: letterbox id: letterbox
anchors.fill: parent anchors.fill: parent
@ -23,13 +23,13 @@ Item {
anchors.fill: parent anchors.fill: parent
color: "black" color: "black"
opacity: 0.5 opacity: 0.5
radius: radius radius: popupRadius
} }
Rectangle { Rectangle {
width: Math.max(parent.width * 0.75, 400) width: Math.max(parent.width * 0.75, 400)
height: popupText.contentHeight*1.5 height: popupText.contentHeight*1.5
anchors.centerIn: parent anchors.centerIn: parent
radius: radius radius: popupRadius
color: "white" color: "white"
FiraSansSemiBold { FiraSansSemiBold {
id: popupText id: popupText

8
interface/resources/qml/hifi/NameCard.qml
View file

@ -9,7 +9,6 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
@ -136,9 +135,10 @@ Row {
start: Qt.point(0, 0) start: Qt.point(0, 0)
end: Qt.point(parent.width, 0) end: Qt.point(parent.width, 0)
gradient: Gradient { gradient: Gradient {
GradientStop { position: 0.05; color: "#00CFEF" } GradientStop { position: 0.0; color: "#2c8e72" }
GradientStop { position: 0.5; color: "#9450A5" } GradientStop { position: 0.9; color: "#1fc6a6" }
GradientStop { position: 0.95; color: "#EA4C5F" } GradientStop { position: 0.91; color: "#ea4c5f" }
GradientStop { position: 1.0; color: "#ea4c5f" }
} }
} }
} }

1
interface/resources/qml/hifi/Pal.qml
View file

@ -451,6 +451,7 @@ Rectangle {
if (selected) { if (selected) {
table.selection.clear(); // for now, no multi-select table.selection.clear(); // for now, no multi-select
table.selection.select(userIndex); table.selection.select(userIndex);
table.positionViewAtRow(userIndex, ListView.Visible);
} else { } else {
table.selection.deselect(userIndex); table.selection.deselect(userIndex);
} }