diff options
| -rw-r--r-- | Bootstrap/icons/moon-stars.svg | 4 | ||||
| -rw-r--r-- | Bootstrap/icons/sun.svg | 3 | ||||
| -rw-r--r-- | Eduport.qrc | 14 | ||||
| -rw-r--r-- | Header.ui.qml | 50 |
4 files changed, 59 insertions, 12 deletions
diff --git a/Bootstrap/icons/moon-stars.svg b/Bootstrap/icons/moon-stars.svg new file mode 100644 index 0000000..b25ef86 --- /dev/null +++ b/Bootstrap/icons/moon-stars.svg @@ -0,0 +1,4 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-moon-stars" viewBox="0 0 16 16"> + <path d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278zM4.858 1.311A7.269 7.269 0 0 0 1.025 7.71c0 4.02 3.279 7.276 7.319 7.276a7.316 7.316 0 0 0 5.205-2.162c-.337.042-.68.063-1.029.063-4.61 0-8.343-3.714-8.343-8.29 0-1.167.242-2.278.681-3.286z"/> + <path d="M10.794 3.148a.217.217 0 0 1 .412 0l.387 1.162c.173.518.579.924 1.097 1.097l1.162.387a.217.217 0 0 1 0 .412l-1.162.387a1.734 1.734 0 0 0-1.097 1.097l-.387 1.162a.217.217 0 0 1-.412 0l-.387-1.162A1.734 1.734 0 0 0 9.31 6.593l-1.162-.387a.217.217 0 0 1 0-.412l1.162-.387a1.734 1.734 0 0 0 1.097-1.097l.387-1.162zM13.863.099a.145.145 0 0 1 .274 0l.258.774c.115.346.386.617.732.732l.774.258a.145.145 0 0 1 0 .274l-.774.258a1.156 1.156 0 0 0-.732.732l-.258.774a.145.145 0 0 1-.274 0l-.258-.774a1.156 1.156 0 0 0-.732-.732l-.774-.258a.145.145 0 0 1 0-.274l.774-.258c.346-.115.617-.386.732-.732L13.863.1z"/> +</svg>
\ No newline at end of file diff --git a/Bootstrap/icons/sun.svg b/Bootstrap/icons/sun.svg new file mode 100644 index 0000000..c311208 --- /dev/null +++ b/Bootstrap/icons/sun.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-sun" viewBox="0 0 16 16"> + <path d="M8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0 1a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z"/> +</svg>
\ No newline at end of file diff --git a/Eduport.qrc b/Eduport.qrc index 3c9a27d..c4ed534 100644 --- a/Eduport.qrc +++ b/Eduport.qrc @@ -5,6 +5,14 @@ <file>Heebo/Heebo-Regular.ttf</file> <file>imports/Eduport/Eduport.qml</file> <file>imports/Eduport/qmldir</file> + <file>Bootstrap/icons/sun.svg</file> + <file>Bootstrap/icons/moon-stars.svg</file> + <file>Button/Sm.ui.qml</file> + <file>Button/Btn.ui.qml</file> + <file>Button/Primary.ui.qml</file> + <file>Button/Success.ui.qml</file> + <file>Button/NavLink.ui.qml</file> + <file>Button/NavLink/TabsLine.ui.qml</file> <file>DropShadow/Box.ui.qml</file> <file>Label/Body.ui.qml</file> <file>Label/FwLight.ui.qml</file> @@ -16,12 +24,6 @@ <file>Label/H1.ui.qml</file> <file>Label/Display6.ui.qml</file> <file>TextField/Input.ui.qml</file> - <file>Button/Btn.ui.qml</file> - <file>Button/Primary.ui.qml</file> - <file>Button/Success.ui.qml</file> - <file>Button/Sm.ui.qml</file> - <file>Button/NavLink.ui.qml</file> - <file>Button/NavLink/TabsLine.ui.qml</file> <file>Header.ui.qml</file> </qresource> </RCC> diff --git a/Header.ui.qml b/Header.ui.qml index 85fb1c4..bd36d9f 100644 --- a/Header.ui.qml +++ b/Header.ui.qml @@ -201,28 +201,66 @@ ToolBar { Btn.Sm { id: light + display: + AbstractButton. + TextBesideIcon + icon { + source: + "Bootstrap/icons/sun.svg" + width: + 16 + height: + 16 + color: + checked + ? + Eduport + .bsGray800 + : + Eduport + .bsBtnColor + } text: qsTr("Light") - Layout - .fillWidth: - true checked: Eduport .mode == Eduport .Mode.Light enabled: !checked + Layout + .fillWidth: + true } Btn.Sm { id: dark + display: + AbstractButton. + TextBesideIcon + icon { + source: + "Bootstrap/icons/moon-stars.svg" + width: + 16 + height: + 16 + color: + checked + ? + Eduport + .bsGray800 + : + Eduport + .bsBtnColor + } text: qsTr("Dark") - Layout - .fillWidth: - true checked: Eduport .mode == Eduport .Mode.Dark enabled: !checked + Layout + .fillWidth: + true } } } |
