Skip to content

Commit

Permalink
rebase on to current master
Browse files Browse the repository at this point in the history
  • Loading branch information
CorvetteCole committed Apr 26, 2021
1 parent 3cee2dc commit 86b6ea9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 16 deletions.
21 changes: 5 additions & 16 deletions src/prefs.ui
Original file line number Diff line number Diff line change
Expand Up @@ -224,17 +224,6 @@
</layout>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="can_focus">0</property>
<property name="orientation">vertical</property>
<layout>
<property name="column">0</property>
<property name="row">12</property>
<property name="column-span">2</property>
</layout>
</object>
</child>

<!--! MISC !-->

Expand All @@ -244,7 +233,7 @@
<property name="orientation">vertical</property>
<layout>
<property name="column">0</property>
<property name="row">11</property>
<property name="row">12</property>
<property name="column-span">2</property>
</layout>
</object>
Expand All @@ -258,7 +247,7 @@
<property name="justify">center</property>
<layout>
<property name="column">0</property>
<property name="row">12</property>
<property name="row">13</property>
</layout>
</object>
</child>
Expand All @@ -272,7 +261,7 @@
<signal name="value-changed" handler="dash_opacity_changed" swapped="no" />
<layout>
<property name="column">1</property>
<property name="row">12</property>
<property name="row">13</property>
</layout>
</object>
</child>
Expand All @@ -285,7 +274,7 @@
<property name="justify">center</property>
<layout>
<property name="column">0</property>
<property name="row">13</property>
<property name="row">14</property>
</layout>
</object>
</child>
Expand All @@ -296,7 +285,7 @@
<signal name="toggled" handler="static_blur_toogled" swapped="no" />
<layout>
<property name="column">1</property>
<property name="row">13</property>
<property name="row">15</property>
</layout>
</object>
</child>
Expand Down
Binary file modified src/schemas/gschemas.compiled
Binary file not shown.

0 comments on commit 86b6ea9

Please sign in to comment.