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

Fixup merge - whoops

Browse source
This commit is contained in:
Zach Fox 2017-06-22 10:27:28 -07:00
parent af3c249ae5
commit a4a4ba817f
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/styles-uit/HifiConstants.qml
View file

@ -50,7 +50,7 @@ Item {
id: colors id: colors
// Base colors // Base colors
readonly property color baseGray: "#404040" readonly property color baseGray: "#393939"
readonly property color darkGray: "#121212" readonly property color darkGray: "#121212"
readonly property color baseGrayShadow: "#252525" readonly property color baseGrayShadow: "#252525"
readonly property color baseGrayHighlight: "#575757" readonly property color baseGrayHighlight: "#575757"

1
scripts/defaultScripts.js
View file

@ -25,6 +25,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
"system/tablet-goto.js", "system/tablet-goto.js",
"system/marketplaces/marketplaces.js", "system/marketplaces/marketplaces.js",
"system/edit.js", "system/edit.js",
"system/spectatorCamera.js",
"system/notifications.js", "system/notifications.js",
"system/dialTone.js", "system/dialTone.js",
"system/firstPersonHMD.js", "system/firstPersonHMD.js",