3 files changed, 69 insertions, 79 deletions
diff --git a/imports/Bootstrap/Bootstrap.qml b/imports/Bootstrap/Bootstrap.qml
deleted file mode 100644
index 845e4f1..0000000
--- a/imports/Bootstrap/Bootstrap.qml
+++ /dev/null
@@ -1,56 +0,0 @@
-pragma Singleton
-import QtQuick 2.15
-
-QtObject {
-	readonly property color primary: "#066ac9"
-	readonly property real badgeFontSize: 13.6
-
-	readonly property real btnPaddingX: 16
-	readonly property real btnPaddingY: 8
-	readonly property font btnFont: Qt.font({
-		family: haveRoboto ? "Roboto" : medium.name,
-		weight: Font.Medium,
-		pointSize: 15
-	})
-	readonly property color btnColor: "#ffffff"
-	readonly property color btnBg: "transparent"
-	readonly property real btnBorderWidth: 1
-	readonly property color btnBorderColor: btnBg
-	readonly property real btnBorderRadius: 5.2
-	readonly property real btnLgFontSize: 16
-	readonly property real btnLgBorderRadius: 8
-	readonly property color btnPrimaryBg: primary
-	readonly property color btnPrimaryBorderColor: primary
-	readonly property color btnPrimaryActiveBg: "#0555a1"
-	readonly property color btnPrimaryActiveBorderColor: "#055097"
-	readonly property color btnPrimaryDisabledBg: "#a6066ac9"
-	readonly property color btnPrimaryDisabledBorderColor: btnPrimaryDisabledBg
-	readonly property color btnSuccessBg: "#0cbc87"
-	readonly property color btnSuccessBorderColor: btnSuccessBg
-	readonly property color btnSuccessActiveBg: "#0a966c"
-	readonly property color btnSuccessActiveBorderColor: "#098d65"
-	readonly property color btnSuccessDisabledBg: "#a60cbc87"
-	readonly property color btnSuccessDisabledBorderColor: btnSuccessDisabledBg
-
-	readonly property real navPillsBorderRadius: btnBorderRadius
-	readonly property color navPillsLinkActiveColor: btnColor
-	readonly property color navPillsLinkActiveBg: primary
-
-	readonly property font bodyFont: Qt.font({
-		family: haveRoboto ? "Roboto" : regular.name,
-		weight: Font.Normal,
-		pointSize: 15
-	})
-
-	readonly property bool haveRoboto: Qt.platform.os === "android"
-					|| Qt.platform.os === "linux"
-					|| Qt.platform.os === "osx"
-					|| Qt.platform.os === "unix"
-					|| Qt.platform.os === "windows"
-	readonly property FontLoader medium: FontLoader {
-		source: haveRoboto ? "" : "../../Roboto/Roboto-Medium.ttf"
-	}
-	readonly property FontLoader regular: FontLoader {
-		source: haveRoboto ? "" : "../../Roboto/Roboto-Regular.ttf"
-	}
-}
diff --git a/imports/Bootstrap/qmldir b/imports/Bootstrap/qmldir
deleted file mode 100644
index 53e8824..0000000
--- a/imports/Bootstrap/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-module Bootstrap
-singleton Bootstrap 5.3 Bootstrap.qml
diff --git a/imports/Eduport/Eduport.qml b/imports/Eduport/Eduport.qml
index db2a6fa..63cc239 100644
--- a/imports/Eduport/Eduport.qml
+++ b/imports/Eduport/Eduport.qml
@@ -7,38 +7,86 @@ QtObject {
 	readonly property real h6FontSize: 15
 	readonly property real formTextFontSize: 14
 
-	readonly property bool haveRoboto: Qt.platform.os === "android"
-					|| Qt.platform.os === "linux"
-					|| Qt.platform.os === "osx"
-					|| Qt.platform.os === "unix"
-					|| Qt.platform.os === "windows"
-	readonly property FontLoader roboto: FontLoader {
-		source: haveRoboto ? "" : "../../Roboto/Roboto-Bold.ttf"
-	}
-	readonly property FontLoader bold: FontLoader {
-		source: "../../Heebo/Heebo-Bold.ttf"
-	}
-	readonly property FontLoader medium: FontLoader {
-		source: "../../Heebo/Heebo-Medium.ttf"
-	}
-	readonly property FontLoader regular: FontLoader {
-		source: "../../Heebo/Heebo-Regular.ttf"
-	}
+	readonly property real navPillsBorderRadius: bsBtnBorderRadius
+	readonly property color navPillsLinkActiveColor: bsBtnColor
+	readonly property color navPillsLinkActiveBg: bsPrimary
+
 	readonly property font baseFont: Qt.font({
-		family: haveRoboto ? "Roboto" : roboto.name,
+		family: haveRoboto ? "Roboto" : robotoBold.name,
 		weight: Font.Bold
 	})
+	readonly property font bodyFont: Qt.font({
+		family: haveRoboto ? "Roboto" : robotRegular.name,
+		weight: Font.Normal,
+		pointSize: 15
+	})
 	readonly property font hxFont: Qt.font({
-		family: bold.name,
+		family: heeboBold.name,
 		weight: Font.Bold,
 		pointSize: h6FontSize
 	})
 	readonly property font fwNormalFont: Qt.font({
-		family: medium.name,
+		family: heeboMedium.name,
 		weight: Font.Medium
 	})
 	readonly property font fwLightFont: Qt.font({
-		family: regular.name,
+		family: heeboRegular.name,
 		weight: Font.Normal
 	})
+
+	readonly property color bsPrimary: "#066ac9"
+	readonly property real bsBadgeFontSize: 13.6
+
+	readonly property real bsBtnPaddingX: 16
+	readonly property real bsBtnPaddingY: 8
+	readonly property font bsBtnFont: Qt.font({
+		family: haveRoboto ? "Roboto" : robotoMedium.name,
+		weight: Font.Medium,
+		pointSize: 15
+	})
+	readonly property color bsBtnColor: "#ffffff"
+	readonly property color bsBtnBg: "transparent"
+	readonly property real bsBtnBorderWidth: 1
+	readonly property color bsBtnBorderColor: bsBtnBg
+	readonly property real bsBtnBorderRadius: 5.2
+	readonly property real bsBtnLgFontSize: 16
+	readonly property real bsBtnLgBorderRadius: 8
+	readonly property color bsBtnPrimaryBg: bsPrimary
+	readonly property color bsBtnPrimaryBorderColor: bsPrimary
+	readonly property color bsBtnPrimaryActiveBg: "#0555a1"
+	readonly property color bsBtnPrimaryActiveBorderColor: "#055097"
+	readonly property color bsBtnPrimaryDisabledBg: "#a6066ac9"
+	readonly property color bsBtnPrimaryDisabledBorderColor:
+							bsBtnPrimaryDisabledBg
+	readonly property color bsBtnSuccessBg: "#0cbc87"
+	readonly property color bsBtnSuccessBorderColor: bsBtnSuccessBg
+	readonly property color bsBtnSuccessActiveBg: "#0a966c"
+	readonly property color bsBtnSuccessActiveBorderColor: "#098d65"
+	readonly property color bsBtnSuccessDisabledBg: "#a60cbc87"
+	readonly property color bsBtnSuccessDisabledBorderColor:
+							bsBtnSuccessDisabledBg
+
+	readonly property bool haveRoboto: Qt.platform.os === "android"
+					|| Qt.platform.os === "linux"
+					|| Qt.platform.os === "osx"
+					|| Qt.platform.os === "unix"
+					|| Qt.platform.os === "windows"
+	readonly property FontLoader robotoBold: FontLoader {
+		source: haveRoboto ? "" : "../../Roboto/Roboto-Bold.ttf"
+	}
+	readonly property FontLoader robotoMedium: FontLoader {
+		source: haveRoboto ? "" : "../../Roboto/Roboto-Medium.ttf"
+	}
+	readonly property FontLoader robotoRegular: FontLoader {
+		source: haveRoboto ? "" : "../../Roboto/Roboto-Regular.ttf"
+	}
+	readonly property FontLoader heeboBold: FontLoader {
+		source: "../../Heebo/Heebo-Bold.ttf"
+	}
+	readonly property FontLoader heeboMedium: FontLoader {
+		source: "../../Heebo/Heebo-Medium.ttf"
+	}
+	readonly property FontLoader heeboRegular: FontLoader {
+		source: "../../Heebo/Heebo-Regular.ttf"
+	}
 }