diff options
Diffstat (limited to 'Button')
| -rw-r--r-- | Button/Btn.ui.qml | 6 | ||||
| -rw-r--r-- | Button/Light.ui.qml | 6 | ||||
| -rw-r--r-- | Button/NavLink.ui.qml | 6 | ||||
| -rw-r--r-- | Button/NavLink/TabsLine.ui.qml | 6 | ||||
| -rw-r--r-- | Button/Outline/Primary.ui.qml | 6 | ||||
| -rw-r--r-- | Button/Primary.ui.qml | 6 | ||||
| -rw-r--r-- | Button/Sm.ui.qml | 23 | ||||
| -rw-r--r-- | Button/Success.ui.qml | 6 |
8 files changed, 33 insertions, 32 deletions
diff --git a/Button/Btn.ui.qml b/Button/Btn.ui.qml index e672537..a7c2d2c 100644 --- a/Button/Btn.ui.qml +++ b/Button/Btn.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport Button { property color bsBtnColor: Eduport.bsBtnColor diff --git a/Button/Light.ui.qml b/Button/Light.ui.qml index 38bbe14..fde47c8 100644 --- a/Button/Light.ui.qml +++ b/Button/Light.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport Btn { bsBtnColor: Eduport.bsGray900 diff --git a/Button/NavLink.ui.qml b/Button/NavLink.ui.qml index dac7d30..0e8a1e0 100644 --- a/Button/NavLink.ui.qml +++ b/Button/NavLink.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport Btn { id: button diff --git a/Button/NavLink/TabsLine.ui.qml b/Button/NavLink/TabsLine.ui.qml index 527f9f2..9c6d1b8 100644 --- a/Button/NavLink/TabsLine.ui.qml +++ b/Button/NavLink/TabsLine.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport import ".." NavLink { diff --git a/Button/Outline/Primary.ui.qml b/Button/Outline/Primary.ui.qml index 7755890..49509de 100644 --- a/Button/Outline/Primary.ui.qml +++ b/Button/Outline/Primary.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport import ".." Btn { diff --git a/Button/Primary.ui.qml b/Button/Primary.ui.qml index 1e1aae6..aee9660 100644 --- a/Button/Primary.ui.qml +++ b/Button/Primary.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport Btn { bsBtnColor: Eduport.bsBtnPrimaryColor diff --git a/Button/Sm.ui.qml b/Button/Sm.ui.qml index 24aefc2..06b60e9 100644 --- a/Button/Sm.ui.qml +++ b/Button/Sm.ui.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtGraphicalEffects 1.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Effects +import Eduport Button { id: button @@ -22,12 +22,13 @@ Button { width: button.icon.width height: button.icon.height } - - ColorOverlay { - color: checked - ? Eduport.bsGray800 : Eduport.bsBtnColor - source: parent - anchors.fill: parent + layer { + enabled:true + effect: MultiEffect { + brightness: 1.0 + colorization: 1.0 + colorizationColor: checked ? Eduport.bsGray800 : Eduport.bsBtnColor + } } } diff --git a/Button/Success.ui.qml b/Button/Success.ui.qml index 9a1286d..778792d 100644 --- a/Button/Success.ui.qml +++ b/Button/Success.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport Btn { bsBtnColor: Eduport.bsBtnSuccessColor |