search

postiffm / bibledit-desktop

Desktop version of Bibledit
GNU General Public License v3.0
4 stars 6 forks source link

Gtk3 #99

Closed rluzynski closed 5 years ago

rluzynski commented 5 years ago

Most probably you can merge this pull request only after you accept #98 and then rebase the gtk3 branch against the new master.

postiffm commented 5 years ago

This makes the floating windows looks nicer.

postiffm commented 5 years ago

I had problems merging this simple pr for some reason. I don't get it. After that, I cannot rebase anything to gtk3 branch because there were some odd diffs.

postiffm commented 5 years ago

Here's what I'm trying to do: (and I removed all pick commands that have duplicate commits)

git rebase -i fff1ba4 The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use:

git commit --allow-empty

Otherwise, please use 'git reset' interactive rebase in progress; onto fff1ba4 Last commands done (21 commands done): pick 787fddb Use the GTK3 CSS to style the focused floating window. pick 6c2b7ed Floating window: simplify the UI template Next commands to do (2 remaining commands): pick 842b4d7 Close buttons ported to GTK3 and CSS. pick 0c7c665 CSS: Apply rounded top corners to the floating window You are currently rebasing branch 'gtk3' on 'fff1ba4'.

Untracked files: config.rpath po/stamp-po

nothing added to commit but untracked files present Could not apply 6c2b7ed... Floating window: simplify the UI template