Skip to content

Commit 26c4eb7

Browse files
committed
Merge branch 'master' into gwl/add-support-for-slide-on-overflow
2 parents 06cb3d7 + 1c50d51 commit 26c4eb7

124 files changed

Lines changed: 9439 additions & 6714 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/stale.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Stale Issues
2+
3+
on:
4+
schedule:
5+
# Run weekly on Sunday at 2:00 AM UTC
6+
- cron: '0 2 * * 0'
7+
workflow_dispatch:
8+
inputs:
9+
days-before-stale:
10+
description: 'Days of inactivity before marking stale (4y, 3y, 2y, 1y, 180d, 90d)'
11+
required: false
12+
default: '730'
13+
type: choice
14+
options:
15+
- '1460'
16+
- '1095'
17+
- '730'
18+
- '365'
19+
- '180'
20+
- '90'
21+
days-before-close:
22+
description: 'Days after stale label before closing'
23+
required: false
24+
default: '30'
25+
type: choice
26+
options:
27+
- '30'
28+
- '14'
29+
- '7'
30+
dry-run:
31+
description: 'Dry run - log actions without making changes'
32+
required: false
33+
default: false
34+
type: boolean
35+
36+
permissions:
37+
actions: write
38+
issues: write
39+
40+
jobs:
41+
stale:
42+
uses: linuxmint/github-actions/.github/workflows/stale-issues.yml@master
43+
with:
44+
days-before-stale: ${{ fromJSON(inputs.days-before-stale || '730') }}
45+
days-before-close: ${{ fromJSON(inputs.days-before-close || '30') }}
46+
dry-run: ${{ inputs.dry-run || false }}

data/org.cinnamon.gschema.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,15 @@
611611
<default>""</default>
612612
<summary>Stores the position of the hoverclick window so it can be restored there later - format is x::y</summary>
613613
</key>
614+
<key name="remember-mount-password" type="b">
615+
<default>false</default>
616+
<summary>Whether to remember password for mounting encrypted or remote filesystems</summary>
617+
<description>
618+
When an encrypted device or remote filesystem is mounted, a password
619+
dialog may include a "Remember Password" checkbox. This key stores the
620+
default state of that checkbox.
621+
</description>
622+
</key>
614623
</schema>
615624

616625
<schema id="org.cinnamon.theme" path="/org/cinnamon/theme/"

data/theme/cinnamon-sass/_common.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ stage {
6262
icon-size: 16px;
6363
color: $fg_color;
6464
}
65+
66+
-st-progress-color: $accent_bg_color;
6567
}
6668

6769
// buttons in dialogs

data/theme/cinnamon-sass/widgets/_applets.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ $applet_padding: 6px;
127127
width: 16px;
128128
height: 16px;
129129

130-
StIcon { icon-size: 1.2 em;}
130+
StIcon { icon-size: 1.2em;}
131131
}
132132
}
133133

data/theme/cinnamon-sass/widgets/_dialogs.scss

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,16 @@
4141
.dialog-list-box {
4242
spacing: 1em;
4343

44+
border-radius: $base_border_radius;
45+
4446
.dialog-list-item {
4547
spacing: 1em;
48+
border-radius: $base_border_radius;
49+
padding: $base_padding $base_padding * 2;
50+
transition-duration: 100ms;
51+
52+
&:hover { background-color: $light_bg_color; }
53+
&:selected { background-color: $accent_bg_color; }
4654

4755
.dialog-list-item-title { font-weight: bold; }
4856
.dialog-list-item-description {
@@ -194,3 +202,66 @@
194202
}
195203
}
196204
}
205+
206+
// Shared grouped-list style for autorun and processes dialogs
207+
%grouped-dialog-list {
208+
.dialog-list-box {
209+
background-color: lighten($bg_color, 5%);
210+
spacing: 0;
211+
212+
.dialog-list-item {
213+
border-radius: 0;
214+
215+
&:first-child {
216+
border-radius: $base_border_radius $base_border_radius 0 0;
217+
}
218+
219+
&:last-child {
220+
border-radius: 0 0 $base_border_radius $base_border_radius;
221+
}
222+
}
223+
}
224+
}
225+
226+
.processes-dialog {
227+
.dialog-content-box {
228+
.dialog-list {
229+
@extend %grouped-dialog-list;
230+
}
231+
}
232+
}
233+
234+
.autorun-dialog {
235+
min-width: 30em;
236+
237+
.dialog-content-box {
238+
margin-top: $base_margin;
239+
margin-bottom: $base_margin * 3;
240+
spacing: $base_margin * 3;
241+
max-width: 28em;
242+
243+
.dialog-list {
244+
@extend %grouped-dialog-list;
245+
}
246+
247+
.autorun-dialog-heading {
248+
@extend %title_2;
249+
text-align: center;
250+
}
251+
252+
.autorun-dialog-subheading {
253+
@extend %title_4;
254+
text-align: center;
255+
}
256+
257+
.autorun-dialog-description {
258+
}
259+
}
260+
}
261+
262+
// Popup dialog (non-modal, draggable)
263+
.popup-dialog {
264+
.dialog {
265+
box-shadow: 0 -1px $accent_bg_color;
266+
}
267+
}

data/theme/cinnamon-sass/widgets/_menus.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ $menuitem_border_radius: $base_border_radius * 1;
5252
icon-size: $scalable_icon_size;
5353
}
5454

55+
.popup-inhibitor-menu-item .popup-menu-icon {
56+
icon-size: to_em(24px);
57+
}
58+
5559
// popup submenus
5660
.popup-sub-menu {
5761
border-radius: $base_border_radius + 1;
@@ -137,6 +141,11 @@ $menuitem_border_radius: $base_border_radius * 1;
137141
}
138142
}
139143

144+
// printer applet menu item table
145+
.popup-printer-menu-item {
146+
spacing-columns: 8px;
147+
}
148+
140149
// Used in window quick list and power applet
141150
.popup-subtitle-menu-item { font-weight: normal; }
142151

0 commit comments

Comments
 (0)