Skip to content

Commit d81bbfe

Browse files
author
Lains
committed
* - start work on libadwaita recent button changes, small UI changes
1 parent a4b6539 commit d81bbfe

File tree

9 files changed

+57
-82
lines changed

9 files changed

+57
-82
lines changed

‎data/app.css‎

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,36 @@
44

55
.flat-button {
66
background: none;
7-
margin: 0;
87
font-weight: 400;
98
}
109

11-
.flat-button:hover,
12-
.flat-button:checked {
10+
.flat-button:hover {
1311
background: alpha(@theme_fg_color, 0.1);
1412
}
1513

16-
.flat-button:active,
17-
.flat-button:checked:active {
14+
.flat-button:active {
1815
background: alpha(@theme_fg_color, 0.2);
1916
}
2017

2118
.rename-button .toggle {
22-
border-radius: 5px;
2319
background: none;
20+
font-weight: 400;
2421
}
2522

26-
.rename-button .toggle:hover,
27-
.rename-button .toggle:checked {
23+
.rename-button .toggle:hover {
2824
background: alpha(@theme_fg_color, 0.1);
2925
}
3026

31-
.rename-button .toggle:active,
32-
.rename-button .toggle:checked:active {
27+
.rename-button .toggle:active {
3328
background: alpha(@theme_fg_color, 0.2);
3429
}
3530

3631
.circular {
37-
border: 1px solid alpha(@theme_fg_color, 0.2);
32+
box-shadow: inset 0 0 3px 0 alpha(@theme_fg_color, 0.4);
3833
}
3934

4035
.circular:hover {
41-
border: 1px solid @theme_selected_bg_color;
42-
box-shadow: inset 0 0 2px 0 alpha(@theme_fg_color, 0.5);
36+
box-shadow: inset 0 0 3px 0 alpha(@theme_fg_color, 0.8);
4337
}
4438

4539
.notejot-stitle,
@@ -102,29 +96,26 @@
10296
transition: 100ms ease-in-out;
10397
}
10498

105-
.notejot-sbar:backdrop {
106-
opacity: 0.66;
99+
.notejot-sbar {
100+
background: @theme_bg_color;
107101
}
108102

109103
.empty-state {
110104
background-color: @theme_bg_color;
111105
}
112106

113-
.empty-state:backdrop {
114-
background: @theme_base_color;
115-
}
116-
117107
.notejot-view {
118108
background: @theme_bg_color;
119109
}
120110

121-
.notejot-view:backdrop {
122-
background: @theme_base_color;
111+
.notejot-searchbar {
112+
background: alpha(@theme_fg_color, 0.05);
113+
border-bottom: 1px solid @borders;
123114
}
124115

125-
.notejot-searchbar {
126-
background: alpha(@theme_fg_color, 0.1);
127-
transition: 100ms ease-in-out;
116+
.notejot-searchbar entry {
117+
border: 1px solid @borders;
118+
border-radius: 9999px;
128119
}
129120

130121
.dark {

‎data/icons/scalable/add-note-symbolic.svg‎

Lines changed: 19 additions & 19 deletions
Loading

‎data/shot.png‎

-65.7 KB
Loading

‎data/ui/formatbar.ui‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
</child>
2525
<child>
2626
<object class="GtkSeparator">
27-
<property name="can-focus">0</property>
27+
<style>
28+
<class name="spacer"/>
29+
</style>
2830
</object>
2931
</child>
3032
<child>
@@ -77,7 +79,9 @@
7779
</child>
7880
<child>
7981
<object class="GtkSeparator">
80-
<property name="can-focus">0</property>
82+
<style>
83+
<class name="spacer"/>
84+
</style>
8185
</object>
8286
</child>
8387
<child>

‎data/ui/header_button.ui‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
<child>
66
<object class="GtkMenuButton" id="menu">
77
<property name="label" bind-source="NotejotWidgetsHeaderBarButton" bind-property="title" bind-flags="sync-create"/>
8-
<property name="visible">1</property>
98
<property name="direction">up</property>
10-
<property name="hexpand">0</property>
119
<style>
12-
<class name="title"/>
1310
<class name="rename-button"/>
1411
</style>
1512
</object>

‎data/ui/main_window.ui‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<property name="action-name">win.action_new_note</property>
3838
<style>
3939
<class name="image-button"/>
40-
<class name="header-button"/>
4140
</style>
4241
</object>
4342
</child>
@@ -47,7 +46,6 @@
4746
<property name="icon-name">open-menu-symbolic</property>
4847
<style>
4948
<class name="image-button"/>
50-
<class name="header-toggle-button"/>
5149
</style>
5250
</object>
5351
</child>
@@ -57,7 +55,6 @@
5755
<property name="icon-name">edit-find-symbolic</property>
5856
<style>
5957
<class name="image-button"/>
60-
<class name="header-button"/>
6158
</style>
6259
</object>
6360
</child>
@@ -174,11 +171,15 @@
174171
</object>
175172
</child>
176173
<child>
177-
<object class="GtkSeparator" id="sep">
178-
<property name="orientation">vertical</property>
179-
<style>
180-
<class name="sidebar"/>
181-
</style>
174+
<object class="AdwLeafletPage">
175+
<property name="navigatable">False</property>
176+
<property name="child">
177+
<object class="GtkSeparator">
178+
<style>
179+
<class name="sidebar"/>
180+
</style>
181+
</object>
182+
</property>
182183
</object>
183184
</child>
184185
<child>

‎data/ui/note_menu.ui‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
<property name="can-focus">0</property>
3535
<property name="column-spacing">6</property>
3636
<property name="row-spacing">6</property>
37+
<property name="margin-top">3</property>
38+
<property name="margin-bottom">3</property>
3739
<child>
3840
<object class="GtkButton" id="color_button_red">
3941
<property name="tooltip-text" translatable="yes">Red</property>

‎src/Widgets/Note.vala‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -121,33 +121,19 @@ namespace Notejot {
121121
string style = null;
122122
style = """
123123
.notejot-sidebar-dbg-%d {
124-
background: mix(%s, @theme_base_color, 0.5);
124+
background: mix(%s, @theme_bg_color, 0.5);
125+
border: 1px solid @borders;
125126
border-radius: 9999px;
126127
}
127128
.notejot-action-%d {
128-
background: mix(@theme_base_color, %s, 0.1);
129+
background: mix(@theme_bg_color, %s, 0.06);
129130
border-bottom: 1px solid @borders;
130131
}
131-
.notejot-stack-%d {
132-
background: mix(@theme_base_color, %s, 0.1);
133-
}
134132
.notejot-stack-%d .notejot-bar {
135-
background: mix(@theme_base_color, %s, 0.1);
136-
}
137-
.notejot-action-%d:backdrop {
138-
opacity: 0.66;
139-
}
140-
.notejot-stack-%d:backdrop {
141-
opacity: 0.66;
142-
}
143-
.notejot-stack-%d:backdrop .notejot-bar {
144-
opacity: 0.66;
145-
}
146-
.notejot-stack-%d box {
147-
border-image-width: 0;
133+
background: mix(@theme_bg_color, %s, 0.06);
148134
}
149135
.notejot-tview-%d text {
150-
background: mix(@theme_base_color, %s, 0.1);
136+
background: mix(@theme_base_color, %s, 0.06);
151137
}
152138
""".printf( uid,
153139
color,
@@ -156,12 +142,6 @@ namespace Notejot {
156142
uid,
157143
color,
158144
uid,
159-
color,
160-
uid,
161-
uid,
162-
uid,
163-
uid,
164-
uid,
165145
color
166146
);
167147

‎src/Widgets/TextField.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace Notejot {
2424
this.win = win;
2525
this.editable = true;
2626
this.set_can_focus (true);
27-
this.left_margin = this.right_margin = this.top_margin = 20;
27+
this.left_margin = this.right_margin = this.top_margin = this.bottom_margin = 20;
2828
this.wrap_mode = Gtk.WrapMode.WORD_CHAR;
2929

3030

0 commit comments

Comments
 (0)