summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Eduport.qrc1
-rw-r--r--Heebo/Heebo-Regular.ttfbin0 -> 33040 bytes
-rw-r--r--Home/Default.ui.qml55
-rw-r--r--Home/Default/Card.ui.qml (renamed from CardGrid.ui.qml)51
-rw-r--r--HomeDefault.qrc1
-rw-r--r--imports/Bootstrap/Bootstrap.qml7
-rw-r--r--imports/Eduport/Eduport.qml7
7 files changed, 80 insertions, 42 deletions
diff --git a/Eduport.qrc b/Eduport.qrc
index 8ec18ca..ed4bac4 100644
--- a/Eduport.qrc
+++ b/Eduport.qrc
@@ -2,6 +2,7 @@
<qresource prefix="qeduport">
<file>Heebo/Heebo-Bold.ttf</file>
<file>Heebo/Heebo-Medium.ttf</file>
+ <file>Heebo/Heebo-Regular.ttf</file>
<file>imports/Bootstrap/Bootstrap.qml</file>
<file>imports/Bootstrap/qmldir</file>
<file>imports/Eduport/Eduport.qml</file>
diff --git a/Heebo/Heebo-Regular.ttf b/Heebo/Heebo-Regular.ttf
new file mode 100644
index 0000000..d4ec6f9
--- /dev/null
+++ b/Heebo/Heebo-Regular.ttf
Binary files differ
diff --git a/Home/Default.ui.qml b/Home/Default.ui.qml
index aa2c283..5c57eae 100644
--- a/Home/Default.ui.qml
+++ b/Home/Default.ui.qml
@@ -251,12 +251,20 @@ Flickable {
leftMargin: 16
right: parent.right
rightMargin: 16
- verticalCenter: parent.verticalCenter
+ verticalCenter: parent
+ .verticalCenter
}
cellWidth: 142
cellHeight: 46
- implicitHeight: Math.ceil(count / Math.floor(count / (cellWidth * count / width))) * cellHeight
- model: ["Web Design", "Development", "Graphic Design", "Marketing", "Finance"]
+ implicitHeight: Math.ceil(count
+ / Math.floor(count
+ / (cellWidth
+ * count
+ / width)
+ )) * cellHeight
+ model: ["Web Design", "Development",
+ "Graphic Design", "Marketing",
+ "Finance"]
delegate: TabItem {}
}
}
@@ -266,13 +274,20 @@ Flickable {
property real preservedAspectHeight: width * 1.6
Layout.leftMargin: -12.8
Layout.rightMargin: -12.8
- Layout.preferredHeight: width < 576
- ? preservedAspectHeight * tabsContent.currentCount
- : width < 768
- ? preservedAspectHeight / 2 * Math.ceil(tabsContent.currentCount / 2)
- : width < 992
- ? preservedAspectHeight / 3 * Math.ceil(tabsContent.currentCount / 3)
- : preservedAspectHeight / 4 * Math.ceil(tabsContent.currentCount / 4)
+ Layout.preferredHeight: body.width < 576
+ ? preservedAspectHeight
+ * tabsContent.currentCount
+ : body.width < 768
+ ? preservedAspectHeight / 2
+ * Math.ceil(tabsContent.currentCount
+ / 2)
+ : body.width < 992
+ ? preservedAspectHeight / 3
+ * Math.ceil(tabsContent.currentCount
+ / 3)
+ : preservedAspectHeight / 4
+ * Math.ceil(tabsContent.currentCount
+ / 4)
Repeater {
id: tabsContent
@@ -351,20 +366,26 @@ Flickable {
GridView {
id: tabPane
interactive: false
- cellWidth: width < 576 ? width
- : width < 768 ? width / 2
- : width < 992 ? width / 3
+ cellWidth: body.width < 576
+ ? width
+ : body.width < 768
+ ? width / 2
+ : body.width < 992
+ ? width / 3
: width / 4
cellHeight: cellWidth
* 400 / 533 + 273.35
model: content
- delegate: CardGrid {
- width: tabPane.cellWidth
- height: tabPane.cellHeight
+ delegate: Default.Card {
+ width: tabPane
+ .cellWidth
+ height: tabPane
+ .cellHeight
imageSource: image
badgeText: level
badgeColor: levelColor
- badgeBackgroundColor: levelBackgroundColor
+ badgeBackgroundColor
+ : levelBackgroundColor
titleText: title
truncatedText: truncated
}
diff --git a/CardGrid.ui.qml b/Home/Default/Card.ui.qml
index a8bb78e..d10ebf1 100644
--- a/CardGrid.ui.qml
+++ b/Home/Default/Card.ui.qml
@@ -2,6 +2,8 @@ import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import QtGraphicalEffects 1.15
+import Bootstrap 5.3
+import Eduport 1.4
Item {
property string imageSource: "https://eduport.webestica.com/assets/images/courses/4by3/11.jpg"
@@ -17,11 +19,6 @@ Item {
property string titleText: "Build Responsive Websites with HTML"
property alias titleArea: titleArea
property string truncatedText: "Far advanced settling say finished raillery. Offered chiefly farther"
- property bool doesntEmbed: Qt.platform.os === "android"
- || Qt.platform.os === "linux"
- || Qt.platform.os === "osx"
- || Qt.platform.os === "unix"
- || Qt.platform.os === "windows"
DropShadow {
source: rectangle
@@ -86,11 +83,6 @@ Item {
Layout.fillWidth: true
Layout.bottomMargin: 8
- FontLoader {
- id: roboto
- source: doesntEmbed ? "" : "Roboto/Roboto-Regular.ttf"
- }
-
Label {
id: badge
anchors.left: parent.left
@@ -101,8 +93,10 @@ Item {
text: badgeText
color: badgeColor
font {
- family: doesntEmbed ? "Roboto" : roboto.name
- pixelSize: 13
+ family: Bootstrap.bodyFont
+ .family
+ pointSize: Bootstrap
+ .badgeFontSize
}
background: Rectangle {
color: badgeBackgroundColor
@@ -112,23 +106,19 @@ Item {
Image {
id: favorite
- source: "Font-Awesome/svgs/solid/heart.svg"
+ source: "../../Font-Awesome/svgs/solid/heart.svg"
sourceSize {
width: 15
height: 15
}
anchors {
right: parent.right
- verticalCenter: parent.verticalCenter
+ verticalCenter: parent
+ .verticalCenter
}
}
}
- FontLoader {
- id: heebo
- source: "Heebo/Heebo-Bold.ttf"
- }
-
Label {
id: title
text: titleText
@@ -137,7 +127,8 @@ Item {
Layout.fillWidth: true
Layout.bottomMargin: 8
font {
- family: heebo.name
+ family: Eduport.hFont.family
+ weight: Eduport.hFont.weight
pointSize: 20.1 + .00075 * parent.width
}
@@ -156,9 +147,9 @@ Item {
Layout.fillWidth: true
Layout.bottomMargin: 8
font {
- family: doesntEmbed ? "Roboto"
- : roboto.name
- pointSize: 14
+ family: Bootstrap.bodyFont.family
+ weight: Bootstrap.bodyFont.weight
+ pointSize: Bootstrap.bodyFont.pointSize
}
}
@@ -200,6 +191,13 @@ Item {
left: parent.left
bottom: parent.bottom
}
+ font {
+ family: Eduport.fwLightFont
+ .family
+ weight: Eduport.fwLightFont
+ .weight
+ pointSize: Eduport.h6FontSize
+ }
}
Label {
@@ -210,6 +208,13 @@ Item {
right: parent.right
bottom: parent.bottom
}
+ font {
+ family: Eduport.fwLightFont
+ .family
+ weight: Eduport.fwLightFont
+ .weight
+ pointSize: Eduport.h6FontSize
+ }
}
}
}
diff --git a/HomeDefault.qrc b/HomeDefault.qrc
index 68a2c0b..ab61f81 100644
--- a/HomeDefault.qrc
+++ b/HomeDefault.qrc
@@ -5,6 +5,7 @@
<file>Font-Awesome/svgs/solid/user-graduate.svg</file>
<file>Bootstrap/icons/patch-check-fill.svg</file>
<file>Home/Default/Counter.ui.qml</file>
+ <file>Home/Default/Card.ui.qml</file>
<file>Home/Default.ui.qml</file>
</qresource>
</RCC>
diff --git a/imports/Bootstrap/Bootstrap.qml b/imports/Bootstrap/Bootstrap.qml
index 3afa941..a7a2951 100644
--- a/imports/Bootstrap/Bootstrap.qml
+++ b/imports/Bootstrap/Bootstrap.qml
@@ -2,6 +2,8 @@ pragma Singleton
import QtQuick 2.15
QtObject {
+ readonly property real badgeFontSize: 13.6
+
readonly property color btnColor: "#ffffff"
readonly property color btnBg: "#066ac9"
readonly property color btnActiveBg: "#0555a1"
@@ -20,11 +22,12 @@ QtObject {
}
readonly property font bodyFont: Qt.font({
family: haveRoboto ? "Roboto" : regular.name,
+ weight: Font.Normal,
pointSize: 15
})
readonly property font btnFont: Qt.font({
family: haveRoboto ? "Roboto" : medium.name,
- pointSize: 15,
- weight: Font.Medium
+ weight: Font.Medium,
+ pointSize: 15
})
}
diff --git a/imports/Eduport/Eduport.qml b/imports/Eduport/Eduport.qml
index 106b1ab..e3b36dd 100644
--- a/imports/Eduport/Eduport.qml
+++ b/imports/Eduport/Eduport.qml
@@ -13,6 +13,9 @@ QtObject {
readonly property FontLoader medium: FontLoader {
source: "../../Heebo/Heebo-Medium.ttf"
}
+ readonly property FontLoader regular: FontLoader {
+ source: "../../Heebo/Heebo-Regular.ttf"
+ }
readonly property font hFont: Qt.font({
family: bold.name,
weight: Font.Bold
@@ -21,4 +24,8 @@ QtObject {
family: medium.name,
weight: Font.Medium
})
+ readonly property font fwLightFont: Qt.font({
+ family: regular.name,
+ weight: Font.Normal
+ })
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 03:40:26 +0000