Skip to content

Commit

Permalink
* - start work on libadwaita recent button changes, small UI changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Lains committed Sep 10, 2021
1 parent a4b6539 commit d81bbfe
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 82 deletions.
39 changes: 15 additions & 24 deletions data/app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,36 @@

.flat-button {
background: none;
margin: 0;
font-weight: 400;
}

.flat-button:hover,
.flat-button:checked {
.flat-button:hover {
background: alpha(@theme_fg_color, 0.1);
}

.flat-button:active,
.flat-button:checked:active {
.flat-button:active {
background: alpha(@theme_fg_color, 0.2);
}

.rename-button .toggle {
border-radius: 5px;
background: none;
font-weight: 400;
}

.rename-button .toggle:hover,
.rename-button .toggle:checked {
.rename-button .toggle:hover {
background: alpha(@theme_fg_color, 0.1);
}

.rename-button .toggle:active,
.rename-button .toggle:checked:active {
.rename-button .toggle:active {
background: alpha(@theme_fg_color, 0.2);
}

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

.circular:hover {
border: 1px solid @theme_selected_bg_color;
box-shadow: inset 0 0 2px 0 alpha(@theme_fg_color, 0.5);
box-shadow: inset 0 0 3px 0 alpha(@theme_fg_color, 0.8);
}

.notejot-stitle,
Expand Down Expand Up @@ -102,29 +96,26 @@
transition: 100ms ease-in-out;
}

.notejot-sbar:backdrop {
opacity: 0.66;
.notejot-sbar {
background: @theme_bg_color;
}

.empty-state {
background-color: @theme_bg_color;
}

.empty-state:backdrop {
background: @theme_base_color;
}

.notejot-view {
background: @theme_bg_color;
}

.notejot-view:backdrop {
background: @theme_base_color;
.notejot-searchbar {
background: alpha(@theme_fg_color, 0.05);
border-bottom: 1px solid @borders;
}

.notejot-searchbar {
background: alpha(@theme_fg_color, 0.1);
transition: 100ms ease-in-out;
.notejot-searchbar entry {
border: 1px solid @borders;
border-radius: 9999px;
}

.dark {
Expand Down
38 changes: 19 additions & 19 deletions data/icons/scalable/add-note-symbolic.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/shot.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions data/ui/formatbar.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
</child>
<child>
<object class="GtkSeparator">
<property name="can-focus">0</property>
<style>
<class name="spacer"/>
</style>
</object>
</child>
<child>
Expand Down Expand Up @@ -77,7 +79,9 @@
</child>
<child>
<object class="GtkSeparator">
<property name="can-focus">0</property>
<style>
<class name="spacer"/>
</style>
</object>
</child>
<child>
Expand Down
3 changes: 0 additions & 3 deletions data/ui/header_button.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@
<child>
<object class="GtkMenuButton" id="menu">
<property name="label" bind-source="NotejotWidgetsHeaderBarButton" bind-property="title" bind-flags="sync-create"/>
<property name="visible">1</property>
<property name="direction">up</property>
<property name="hexpand">0</property>
<style>
<class name="title"/>
<class name="rename-button"/>
</style>
</object>
Expand Down
17 changes: 9 additions & 8 deletions data/ui/main_window.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<property name="action-name">win.action_new_note</property>
<style>
<class name="image-button"/>
<class name="header-button"/>
</style>
</object>
</child>
Expand All @@ -47,7 +46,6 @@
<property name="icon-name">open-menu-symbolic</property>
<style>
<class name="image-button"/>
<class name="header-toggle-button"/>
</style>
</object>
</child>
Expand All @@ -57,7 +55,6 @@
<property name="icon-name">edit-find-symbolic</property>
<style>
<class name="image-button"/>
<class name="header-button"/>
</style>
</object>
</child>
Expand Down Expand Up @@ -174,11 +171,15 @@
</object>
</child>
<child>
<object class="GtkSeparator" id="sep">
<property name="orientation">vertical</property>
<style>
<class name="sidebar"/>
</style>
<object class="AdwLeafletPage">
<property name="navigatable">False</property>
<property name="child">
<object class="GtkSeparator">
<style>
<class name="sidebar"/>
</style>
</object>
</property>
</object>
</child>
<child>
Expand Down
2 changes: 2 additions & 0 deletions data/ui/note_menu.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
<property name="can-focus">0</property>
<property name="column-spacing">6</property>
<property name="row-spacing">6</property>
<property name="margin-top">3</property>
<property name="margin-bottom">3</property>
<child>
<object class="GtkButton" id="color_button_red">
<property name="tooltip-text" translatable="yes">Red</property>
Expand Down
30 changes: 5 additions & 25 deletions src/Widgets/Note.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,33 +121,19 @@ namespace Notejot {
string style = null;
style = """
.notejot-sidebar-dbg-%d {
background: mix(%s, @theme_base_color, 0.5);
background: mix(%s, @theme_bg_color, 0.5);
border: 1px solid @borders;
border-radius: 9999px;
}
.notejot-action-%d {
background: mix(@theme_base_color, %s, 0.1);
background: mix(@theme_bg_color, %s, 0.06);
border-bottom: 1px solid @borders;
}
.notejot-stack-%d {
background: mix(@theme_base_color, %s, 0.1);
}
.notejot-stack-%d .notejot-bar {
background: mix(@theme_base_color, %s, 0.1);
}
.notejot-action-%d:backdrop {
opacity: 0.66;
}
.notejot-stack-%d:backdrop {
opacity: 0.66;
}
.notejot-stack-%d:backdrop .notejot-bar {
opacity: 0.66;
}
.notejot-stack-%d box {
border-image-width: 0;
background: mix(@theme_bg_color, %s, 0.06);
}
.notejot-tview-%d text {
background: mix(@theme_base_color, %s, 0.1);
background: mix(@theme_base_color, %s, 0.06);
}
""".printf( uid,
color,
Expand All @@ -156,12 +142,6 @@ namespace Notejot {
uid,
color,
uid,
color,
uid,
uid,
uid,
uid,
uid,
color
);

Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/TextField.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Notejot {
this.win = win;
this.editable = true;
this.set_can_focus (true);
this.left_margin = this.right_margin = this.top_margin = 20;
this.left_margin = this.right_margin = this.top_margin = this.bottom_margin = 20;
this.wrap_mode = Gtk.WrapMode.WORD_CHAR;


Expand Down

0 comments on commit d81bbfe

Please sign in to comment.