diff options
| -rw-r--r-- | Button/Outline/Primary.ui.qml | 16 | ||||
| -rw-r--r-- | Course/Detail/Classic/Content/Sidebar/Video.ui.qml | 26 | ||||
| -rw-r--r-- | Eduport.qrc | 1 |
3 files changed, 19 insertions, 24 deletions
diff --git a/Button/Outline/Primary.ui.qml b/Button/Outline/Primary.ui.qml new file mode 100644 index 0000000..7755890 --- /dev/null +++ b/Button/Outline/Primary.ui.qml @@ -0,0 +1,16 @@ +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import Eduport 1.4 +import ".." + +Btn { + bsBtnColor: Eduport.bsBtnOutlinePrimaryColor + bsBtnBg: Eduport.bsBtnOutlinePrimaryBg + bsBtnBorderColor: Eduport.bsBtnOutlinePrimaryBorderColor + bsBtnActiveColor: Eduport.bsBtnOutlinePrimaryActiveColor + bsBtnActiveBg: Eduport.bsBtnOutlinePrimaryActiveBg + bsBtnActiveBorderColor: Eduport.bsBtnOutlinePrimaryActiveBorderColor + bsBtnDisabledColor: Eduport.bsBtnOutlinePrimaryDisabledColor + bsBtnDisabledBg: Eduport.bsBtnOutlinePrimaryDisabledBg + bsBtnDisabledBorderColor: Eduport.bsBtnOutlinePrimaryDisabledBorderColor +} diff --git a/Course/Detail/Classic/Content/Sidebar/Video.ui.qml b/Course/Detail/Classic/Content/Sidebar/Video.ui.qml index b0b4974..8b261a8 100644 --- a/Course/Detail/Classic/Content/Sidebar/Video.ui.qml +++ b/Course/Detail/Classic/Content/Sidebar/Video.ui.qml @@ -6,6 +6,7 @@ import QtMultimedia 5.15 import Eduport 1.4 import "../../../../../Label" as Lbl import "../../../../../Button" as Btn +import "../../../../../Button/Outline" as BtnOutline ColumnLayout { property alias image: image @@ -126,32 +127,9 @@ ColumnLayout { Layout.fillWidth: true spacing: 16 - Button { + BtnOutline.Primary { id: trial - horizontalPadding: 16 - verticalPadding: 8 text: qsTr("Free trial") - font: Eduport.bsBtnFont - contentItem: Text { - horizontalAlignment - : Text - .AlignHCenter - text: trial.text - font: trial.font - color: trial.down - ? "#ffffff" - : "#066ac9" - } - background: Rectangle { - radius: 5.2 - color: trial.down - ? "#066ac9" - : "#ffffff" - border { - color: "#066ac9" - width: 1 - } - } } Btn.Success { diff --git a/Eduport.qrc b/Eduport.qrc index 5a6e7fd..61278a6 100644 --- a/Eduport.qrc +++ b/Eduport.qrc @@ -14,6 +14,7 @@ <file>Button/Sm.ui.qml</file> <file>Button/Btn.ui.qml</file> <file>Button/Primary.ui.qml</file> + <file>Button/Outline/Primary.ui.qml</file> <file>Button/Success.ui.qml</file> <file>Button/NavLink.ui.qml</file> <file>Button/NavLink/TabsLine.ui.qml</file> |