- commit
- 663c16a8b1c4ee2e478a71d910c982ec16cb02b0
- parent
- 2748802e33dd0b0aae09a451714af29cb7f92064
- Author
- Tobias Bengfort <tobias.bengfort@posteo.de>
- Date
- 2023-05-13 06:43
merge styles for progressbar and scale
Diffstat
| M | gtk-3.0/shared.css | 1 | - |
| D | gtk-3.0/widgets/progress_bar.css | 34 | ---------------------------------- |
| M | gtk-3.0/widgets/scale.css | 42 | +++++++++++++++++++++++++++--------------- |
3 files changed, 27 insertions, 50 deletions
diff --git a/gtk-3.0/shared.css b/gtk-3.0/shared.css
@@ -85,7 +85,6 @@ button:focus {
85 85 @import url("widgets/notebook.css");
86 86 @import url("widgets/pane-separator.css");
87 87 @import url("widgets/popover.css");
88 -1 @import url("widgets/progress_bar.css");
89 88 @import url("widgets/scale.css");
90 89 @import url("widgets/scrollbar.css");
91 90 @import url("widgets/spinner.css");
diff --git a/gtk-3.0/widgets/progress_bar.css b/gtk-3.0/widgets/progress_bar.css
@@ -1,34 +0,0 @@1 -1 progressbar trough,2 -1 treeview .trough,3 -1 treeview .trough:selected,4 -1 levelbar trough {5 -1 border-width: 1px;6 -1 background-color: @base_color;7 -1 color: @text_color;8 -1 }9 -110 -1 progressbar progress,11 -1 progressbar progress:disabled,12 -1 treeview .progressbar,13 -1 treeview .progressbar:disabled,14 -1 levelbar block.filled {15 -1 background: @selected_bg_color;16 -1 color: @selected_fg_color;17 -1 }18 -119 -1 entry progress {20 -1 border-bottom: 2px solid @selected_bg_color;21 -1 }22 -123 -1 levelbar:not(.vertical) block {24 -1 min-height: 0.5em;25 -1 }26 -1 levelbar.vertical block {27 -1 min-width: 0.5em;28 -1 }29 -1 levelbar.discrete:not(.vertical) block:not(:first-child) {30 -1 border-left-width: 1px;31 -1 }32 -1 levelbar.discrete.vertical block:not(:first-child) {33 -1 border-top-width: 1px;34 -1 }
diff --git a/gtk-3.0/widgets/scale.css b/gtk-3.0/widgets/scale.css
@@ -1,20 +1,36 @@1 -1 scale:not(.vertical) {2 -1 padding: 8px 0;3 -1 }4 -1 scale.vertical {5 -1 padding: 0 8px;6 -1 }7 -18 -1-1 1 progressbar trough, -1 2 treeview .trough, -1 3 levelbar trough, 9 4 scale trough { 10 5 border-width: 1px;11 -1 background: @base_color;-1 6 background-color: @base_color; -1 7 min-height: 0.5em; -1 8 min-width: 0.5em; 12 9 } 13 10 -1 11 progressbar progress, -1 12 treeview .progressbar, -1 13 levelbar block.filled, 14 14 scale highlight { 15 15 background: @selected_bg_color;16 -1 min-width: 6px;17 -1 min-height: 6px;-1 16 } -1 17 -1 18 entry progress { -1 19 border-bottom: 2px solid @selected_bg_color; -1 20 } -1 21 -1 22 levelbar.discrete:not(.vertical) block:not(:first-child) { -1 23 border-left-width: 1px; -1 24 } -1 25 levelbar.discrete.vertical block:not(:first-child) { -1 26 border-top-width: 1px; -1 27 } -1 28 -1 29 scale:not(.vertical) { -1 30 padding: 8px 0; -1 31 } -1 32 scale.vertical { -1 33 padding: 0 8px; 18 34 } 19 35 20 36 scale slider { @@ -25,10 +41,6 @@ scale slider { 25 41 margin: -6px; 26 42 } 27 4328 -1 scale slider:disabled {29 -1 background: @bg_color;30 -1 }31 -132 44 scale mark { 33 45 margin-top: 2px; 34 46 min-height: 5px;