Skip to content

Commit b256042

Browse files
authored
Merge branch 'main' into rename-deprecated
2 parents 0a1a396 + 464c6a8 commit b256042

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
name: CI
44

55
on:
6-
push:
7-
branches:
8-
- main
6+
pull_request:
7+
types:
8+
- opened
9+
- reopened
10+
- synchronize
911

1012
jobs:
1113
flatpak:
@@ -56,4 +58,4 @@ jobs:
5658
uses: actions/checkout@v4
5759

5860
- name: Lint
59-
run: io.elementary.vala-lint -d .
61+
run: io.elementary.vala-lint -d .

data/Application.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ button.pathbar {
1313
}
1414

1515
.linked .combo {
16-
padding: 2.5px 3px;
16+
margin: 1px 0;
1717
}
1818

1919
.transition {
@@ -23,4 +23,4 @@ button.pathbar {
2323
.drop-target:drop(active) {
2424
border-radius: 6px;
2525
background: alpha(@color_primary, 0.15);
26-
}
26+
}

src/Frontend/MainWindow.vala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,10 @@ class Taxi.MainWindow : Gtk.ApplicationWindow {
7272
var popover = new OperationsPopover ();
7373

7474
var operations_button = new Gtk.MenuButton () {
75-
popover = popover,
76-
valign = CENTER,
77-
child = spinner
75+
child = spinner,
76+
has_frame = false,
77+
popover = popover
7878
};
79-
operations_button.add_css_class (Granite.STYLE_CLASS_FLAT);
8079

8180
spinner_revealer = new Gtk.Revealer () {
8281
transition_type = Gtk.RevealerTransitionType.SLIDE_RIGHT,

0 commit comments

Comments
 (0)