D16365: Update diff against newest master

Olli Helin noreply at phabricator.kde.org
Mon Oct 22 01:38:16 BST 2018


ohelin added a comment.


  Ok, I just dissected the thing. First, I made the updated diff file against the newest master: **diff_updated.diff**.
  Then I saved these files from Phabricator:
  
  - **Breeze-dark-gtk_gtk-3.20_gtk.css**: saved the left raw diff file
  - **Breeze-gtk_gtk-3.20_common.css**: saved the new raw diff file
  - **Breeze-gtk_gtk-3.20_gtk.css**: saved the left raw diff file
  
  I then made the following diff files:
  
    diff Breeze-gtk_gtk-3.20_gtk.css Breeze-gtk_gtk-3.20_common.css > diff_gtk_vs_common.diff
    diff -t -y --suppress-common-lines Breeze-dark-gtk_gtk-3.20_gtk.css Breeze-gtk_gtk-3.20_common.css > diff_gtk_dark_vs_common.diff
  
  The contents of **diff_gtk_vs_common.diff** are trivial:
  
    1,3d0
    < @define-color headerbar_disabled_highlight_top @disabled_highlight_top;
    < @define-color headerbar_disabled_highlight_bottom @disabled_highlight_bottom;
    < @define-color headerbar_action_disabled_backdrop @action_disabled_backdrop;
  
  Therefore, **for the light theme, I say the patch is reviewed**. The only new line in the light CSS file imports the new common file, so basically the contents have just been moved.
  
  For the dark theme, we review the file **diff_gtk_dark_vs_common.diff**. Almost all the file is just the obvious, i.e. replacing color literals with the new variables. The real differences start from line 595: border-width has been modified. The differences continue until line 648. In the original files these lines correspond to the following:
  Breeze-dark-gtk_gtk-3.20_gtk.css: 3069-3160
  Breeze-gtk_gtk-3.20_common.css: 3066-3142
  
  I stripped those lines as files **Breeze-dark-gtk_gtk-3.20_gtk.css_diff_part** and **Breeze-gtk_gtk-3.20_common.css_diff_part**. I then created the special diff which is the beef of this review:
  
    diff Breeze-dark-gtk_gtk-3.20_gtk.css_diff_part Breeze-gtk_gtk-3.20_common.css_diff_part > special_diff.diff
  
  So, **the only thing left to review is the contents of special_diff.diff**, and obviously that everything looks about correct visually in practice (i.e. the colors are fine). I'll continue to check out that special diff a bit later.
  
  F6342214: diff_updated.diff <https://phabricator.kde.org/F6342214>
  F6342215: Breeze-dark-gtk_gtk-3.20_gtk.css <https://phabricator.kde.org/F6342215>
  F6342216: Breeze-gtk_gtk-3.20_common.css <https://phabricator.kde.org/F6342216>
  F6342218: Breeze-gtk_gtk-3.20_gtk.css <https://phabricator.kde.org/F6342218>
  F6342220: diff_gtk_vs_common.diff <https://phabricator.kde.org/F6342220>
  F6342221: diff_gtk_dark_vs_common.diff <https://phabricator.kde.org/F6342221>
  F6342222: Breeze-dark-gtk_gtk-3.20_gtk.css_diff_part <https://phabricator.kde.org/F6342222>
  F6342223: Breeze-gtk_gtk-3.20_common.css_diff_part <https://phabricator.kde.org/F6342223>
  F6342224: special_diff.diff <https://phabricator.kde.org/F6342224>

REPOSITORY
  R98 Breeze for Gtk

REVISION DETAIL
  https://phabricator.kde.org/D16365

To: ohelin
Cc: plasma-devel, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20181022/98eb057d/attachment.html>


More information about the Plasma-devel mailing list