Skip to content

Commit

Permalink
Style updates (#780)
Browse files Browse the repository at this point in the history
* Style updates

Use system accent color instead of a custome one
Slide months right/left instead up/down

* Cleanup

---------

Co-authored-by: Leo <lenemter@gmail.com>
Co-authored-by: Marius Meisenzahl <meisenzahl@users.noreply.github.com>
Co-authored-by: Ryan Kornheisl <ryan@skarva.tech>
  • Loading branch information
4 people authored Jul 20, 2023
1 parent 0c8a5ee commit 50aefad
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 9 deletions.
1 change: 0 additions & 1 deletion data/io.elementary.calendar.gresource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<file alias="calendar-go-today.svg" compressed="true" preprocess="xml-stripblanks">calendar-go-today.svg</file>
<file alias="location-marker.svg" compressed="true" preprocess="xml-stripblanks">LocationMarker.svg</file>
<file alias="AgendaEventRow.css" compressed="true">style/AgendaEventRow.css</file>
<file alias="Application.css" compressed="true">style/Application.css</file>
<file alias="Grid.css" compressed="true">style/Grid.css</file>
<file alias="Header.css" compressed="true">style/Header.css</file>
<file alias="WeekLabels.css" compressed="true">style/WeekLabels.css</file>
Expand Down
2 changes: 0 additions & 2 deletions data/style/Application.css

This file was deleted.

4 changes: 0 additions & 4 deletions src/Application.vala
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@ namespace Maya {
GLib.Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
GLib.Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
GLib.Intl.textdomain (GETTEXT_PACKAGE);

var provider = new Gtk.CssProvider ();
provider.load_from_resource ("/io/elementary/calendar/Application.css");
Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
}

protected override void activate () {
Expand Down
4 changes: 2 additions & 2 deletions src/Grid/CalendarView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@ public class Maya.View.CalendarView : Gtk.Grid {

if (previous_first != null) {
if (previous_first.compare (days_grid.grid_range.first_dt) == -1) {
stack.transition_type = Gtk.StackTransitionType.SLIDE_UP;
stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT;
} else {
stack.transition_type = Gtk.StackTransitionType.SLIDE_DOWN;
stack.transition_type = Gtk.StackTransitionType.SLIDE_RIGHT;
}
}

Expand Down

0 comments on commit 50aefad

Please sign in to comment.