From 7a5ffd40f289d2be1930ec9260558fdc0a483b3c Mon Sep 17 00:00:00 2001 From: dpizetta Date: Mon, 17 Jun 2019 16:46:31 -0300 Subject: [PATCH] Fix #181 toolbutton sizes, lint scss, add spacing on toolbar items fix #183 --- qdarkstyle/qss/_styles.scss | 50 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/qdarkstyle/qss/_styles.scss b/qdarkstyle/qss/_styles.scss index 59bb827f..502775af 100644 --- a/qdarkstyle/qss/_styles.scss +++ b/qdarkstyle/qss/_styles.scss @@ -719,6 +719,7 @@ QToolBar { border-bottom: $BORDER_DARK; padding: 2px; font-weight: bold; + spacing: 2px; QToolButton { background-color: $COLOR_BACKGROUND_NORMAL; @@ -883,7 +884,7 @@ QTextBrowser { } &:hover, - &: !hover, + &:!hover, &::selected, &::pressed { border: $BORDER_NORMAL; @@ -907,7 +908,7 @@ QGraphicsView { } &:hover, - &: !hover, + &:!hover, &::selected, &::pressed { border: $BORDER_NORMAL; @@ -1058,6 +1059,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbutton --------------------------------------------------------------------------- */ QToolButton { background-color: transparent; + border: 1px solid transparent; border-radius: $SIZE_BORDER_RADIUS; margin: 0px; padding: 2px; @@ -1079,10 +1081,6 @@ QToolButton { &:disabled { border: none; - - &:hover { - border: $BORDER_NORMAL; - } } &:hover { @@ -1481,47 +1479,47 @@ QTabBar { } /* !selected and disabled ----------------------------------------- */ - &:top: !selected:disabled { + &:top:!selected:disabled { border-bottom: 3px solid $COLOR_BACKGROUND_DARK; color: $COLOR_FOREGROUND_DARK; background-color: $COLOR_BACKGROUND_DARK; } - &:bottom: !selected:disabled { + &:bottom:!selected:disabled { border-top: 3px solid $COLOR_BACKGROUND_DARK; color: $COLOR_FOREGROUND_DARK; background-color: $COLOR_BACKGROUND_DARK; } - &:left: !selected:disabled { + &:left:!selected:disabled { border-right: 3px solid $COLOR_BACKGROUND_DARK; color: $COLOR_FOREGROUND_DARK; background-color: $COLOR_BACKGROUND_DARK; } - &:right: !selected:disabled { + &:right:!selected:disabled { border-left: 3px solid $COLOR_BACKGROUND_DARK; color: $COLOR_FOREGROUND_DARK; background-color: $COLOR_BACKGROUND_DARK; } /* selected ------------------------------------------------------- */ - &:top: !selected { + &:top:!selected { border-bottom: 2px solid $COLOR_BACKGROUND_DARK; margin-top: 2px; } - &:bottom: !selected { + &:bottom:!selected { border-top: 2px solid $COLOR_BACKGROUND_DARK; margin-bottom: 3px; } - &:left: !selected { + &:left:!selected { border-left: 2px solid $COLOR_BACKGROUND_DARK; margin-right: 2px; } - &:right: !selected { + &:right:!selected { border-right: 2px solid $COLOR_BACKGROUND_DARK; margin-left: 2px; } @@ -1547,7 +1545,7 @@ QTabBar { border-top-right-radius: 3px; } - &: !selected:hover { + &:!selected:hover { border: $BORDER_SELECTION_LIGHT; border-bottom: 3px solid $COLOR_SELECTION_LIGHT; padding: 0px; @@ -1575,7 +1573,7 @@ QTabBar { border-bottom-right-radius: 3px; } - &: !selected:hover { + &:!selected:hover { border: $BORDER_SELECTION_LIGHT; border-top: 3px solid $COLOR_SELECTION_LIGHT; padding: 0px; @@ -1601,7 +1599,7 @@ QTabBar { border-right: 3px solid $COLOR_SELECTION_NORMAL; } - &: !selected:hover { + &:!selected:hover { border: $BORDER_SELECTION_LIGHT; border-right: 3px solid $COLOR_SELECTION_LIGHT; padding: 0px; @@ -1627,7 +1625,7 @@ QTabBar { } - &: !selected:hover { + &:!selected:hover { border: $BORDER_SELECTION_LIGHT; border-left: 3px solid $COLOR_SELECTION_LIGHT; padding: 0px; @@ -1734,7 +1732,7 @@ QTreeView { background: url($PATH_RESOURCES + '/rc/transparent.png'); } - &:has-siblings: !adjoins-item { + &:has-siblings:!adjoins-item { border-image: url($PATH_RESOURCES + '/rc/branch_line.png') 0; } @@ -1742,28 +1740,28 @@ QTreeView { border-image: url($PATH_RESOURCES + '/rc/branch_more.png') 0; } - &: !has-children: !has-siblings:adjoins-item { + &:!has-children:!has-siblings:adjoins-item { border-image: url($PATH_RESOURCES + '/rc/branch_end.png') 0; } - &:has-children: !has-siblings:closed, + &:has-children:!has-siblings:closed, &:closed:has-children:has-siblings { border-image: none; image: url($PATH_RESOURCES + '/rc/branch_closed.png'); } - &:open:has-children: !has-siblings, + &:open:has-children:!has-siblings, &:open:has-children:has-siblings { border-image: none; image: url($PATH_RESOURCES + '/rc/branch_open.png'); } - &:has-children: !has-siblings:closed:hover, + &:has-children:!has-siblings:closed:hover, &:closed:has-children:has-siblings:hover { image: url($PATH_RESOURCES + '/rc/branch_closed_focus.png'); } - &:open:has-children: !has-siblings:hover, + &:open:has-children:!has-siblings:hover, &:open:has-children:has-siblings:hover { image: url($PATH_RESOURCES + '/rc/branch_open_focus.png'); } @@ -1850,7 +1848,7 @@ QColumnView { } } - &: !selected { + &:!selected { &:hover { outline: 0; @@ -1984,7 +1982,7 @@ QToolBox { } } - &: !selected { + &:!selected { background-color: $COLOR_BACKGROUND_NORMAL; border-bottom: 2px solid $COLOR_BACKGROUND_NORMAL;