Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-02 03:28:28 -04:00
Code Packages Releases Activity

theme: large consolidation of colors into Theme.qml, add

Browse Source 
surfaceContainerLow/Lowest
This commit is contained in:
bbedward
2026-06-29 15:50:42 -04:00
parent 50570023ff
commit 894efa58a3
182 changed files with 886 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Modules/Notepad/Notepad.qml
+1 -1
View File
@@ -700,7 +700,7 @@ Item {
width: Math.max(80, discardText.contentWidth + Theme.spacingM * 2)
height: 36
radius: Theme.cornerRadius
color: discardArea.containsMouse ? Theme.surfaceTextHover : "transparent"
color: discardArea.containsMouse ? Theme.surfaceTextHover : Theme.withAlpha(Theme.surfaceTextHover, 0)
border.color: Theme.surfaceVariantAlpha
border.width: 1
quickshell/Modules/Notepad/NotepadSettings.qml
+9 -9
View File
@@ -67,7 +67,7 @@ Item {
anchors.fill: parent
visible: root.isVisible
z: 50
color: Qt.rgba(Theme.surface.r, Theme.surface.g, Theme.surface.b, 0.85)
color: Theme.withAlpha(Theme.surface, 0.85)
WheelHandler {
// Hold scroll so the editor beneath doesn't move while settings are open.
@@ -90,8 +90,8 @@ Item {
width: Math.min(360, root.width - Theme.spacingL * 2)
height: Math.min(settingsColumn.implicitHeight + Theme.spacingXL * 2, root.height - Theme.spacingL * 2)
radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, Theme.notepadTransparency)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
color: Theme.withAlpha(Theme.surfaceContainer, Theme.notepadTransparency)
border.color: Theme.outlineMedium
border.width: 1
z: 100
@@ -139,7 +139,7 @@ Item {
Rectangle {
width: parent.width
height: 1
color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
color: Theme.outlineHeavy
}
DankToggle {
@@ -297,7 +297,7 @@ Item {
iconName: "remove"
iconSize: Theme.iconSizeSmall
enabled: SettingsData.notepadFontSize > 8
backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5)
backgroundColor: Theme.withAlpha(Theme.surfaceVariant, 0.5)
iconColor: Theme.surfaceText
onClicked: {
var newSize = Math.max(8, SettingsData.notepadFontSize - 1);
@@ -309,8 +309,8 @@ Item {
width: 60
height: 32
radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
color: Theme.withAlpha(Theme.surfaceVariant, 0.3)
border.color: Theme.outlineHeavy
border.width: 1
StyledText {
@@ -327,7 +327,7 @@ Item {
iconName: "add"
iconSize: Theme.iconSizeSmall
enabled: SettingsData.notepadFontSize < 48
backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5)
backgroundColor: Theme.withAlpha(Theme.surfaceVariant, 0.5)
iconColor: Theme.surfaceText
onClicked: {
var newSize = Math.min(48, SettingsData.notepadFontSize + 1);
@@ -494,7 +494,7 @@ Item {
width: parent.width
implicitHeight: shortcutsHeader.height + (root.shortcutsExpanded ? shortcutsColumn.implicitHeight + Theme.spacingM : 0)
radius: Theme.cornerRadius
color: root.shortcutsExpanded ? Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95) : "transparent"
color: root.shortcutsExpanded ? Theme.withAlpha(Theme.surfaceContainer, 0.95) : Theme.withAlpha(Theme.surfaceContainer, 0)
border.color: root.shortcutsExpanded ? Theme.primary : Theme.outlineMedium
border.width: root.shortcutsExpanded ? 2 : 1
quickshell/Modules/Notepad/NotepadTextEditor.qml
+6 -6
View File
@@ -449,7 +449,7 @@ Column {
Layout.alignment: Qt.AlignVCenter
text: I18n.tr("Find in note...")
font: searchField.font
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
color: Theme.surfaceTextSecondary
visible: searchField.text.length === 0 && !searchField.activeFocus
Layout.leftMargin: -(searchField.width - 20) // Position over the input field
}
@@ -499,7 +499,7 @@ Column {
StyledRect {
width: parent.width
height: parent.height - bottomControls.height - Theme.spacingM - (searchVisible ? searchBar.height + Theme.spacingM : 0)
color: Qt.rgba(Theme.surface.r, Theme.surface.g, Theme.surface.b, Theme.notepadTransparency)
color: Theme.withAlpha(Theme.surface, Theme.notepadTransparency)
border.color: Theme.outlineMedium
border.width: 1
radius: Theme.cornerRadius
@@ -568,7 +568,7 @@ Column {
text: index + 1
font.family: textArea.font.family
font.pixelSize: textArea.font.pixelSize
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.4)
color: Theme.onSurface_38
horizontalAlignment: Text.AlignRight
}
}
@@ -578,7 +578,7 @@ Column {
TextArea.flickable: TextArea {
id: textArea
placeholderText: ""
placeholderTextColor: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
placeholderTextColor: Theme.surfaceTextSecondary
font.family: SettingsData.notepadUseMonospace ? SettingsData.monoFontFamily : (SettingsData.notepadFontFamily || SettingsData.fontFamily)
font.pixelSize: SettingsData.notepadFontSize * SettingsData.fontScale
font.letterSpacing: 0
@@ -714,7 +714,7 @@ Column {
StyledText {
id: placeholderOverlay
text: I18n.tr("Start typing your notes here...")
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
color: Theme.surfaceTextSecondary
font.family: textArea.font.family
font.pixelSize: textArea.font.pixelSize
visible: textArea.text.length === 0
@@ -750,7 +750,7 @@ Column {
anchors.left: parent.left
anchors.right: parent.right
height: 36
color: Qt.rgba(Theme.surface.r, Theme.surface.g, Theme.surface.b, Theme.notepadTransparency)
color: Theme.withAlpha(Theme.surface, Theme.notepadTransparency)
z: 2
Row {