This is an automated email from the git hooks/post-receive script. nomad pushed a commit to annotated tag 0.2.2 in repository apps/xfdashboard.
commit 137f87ff5e13ff232954914c4ca558716e559bfa Author: Stephan Haller <[email protected]> Date: Tue Aug 12 20:43:23 2014 +0200 Fix CSS file cherry-picked from master branch CSS in branch 0.2 does not understand @constants and @-functions so remove these lines. --- data/themes/xfdashboard/xfdashboard.css | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/data/themes/xfdashboard/xfdashboard.css b/data/themes/xfdashboard/xfdashboard.css index afcc200..6c4d47c 100644 --- a/data/themes/xfdashboard/xfdashboard.css +++ b/data/themes/xfdashboard/xfdashboard.css @@ -1,19 +1,3 @@ -<<<<<<< HEAD -======= -@constants -{ - background: @rgba(87, 146, 226, 0.38) /*#5792e260*/; - overlay-background: @alpha(@background, 1.0) /*#5792e2ff*/ ; - overlay-outline: #4681d1ff; - missing-icon: @try_icons("image-missing", "gtk-missing-image"); - close-icon: @try_icons("window-close-symbolic", "window-close", "gtk-close", @missing-icon); - search-icon: @try_icons("edit-find-symbolic", "edit-find", "gtk-find", @missing-icon); - home-icon: @try_icons("go-home-symbolic", "gtk-home", @missing-icon); - trash-icon: @try_icons("user-trash", "gtk-delete", @missing-icon); - clear-icon: @try_icons("edit-clear-symbolic", "edit-clear", "gtk-clear", @missing-icon); -} - ->>>>>>> e74c0bc... Fix loading scalable images by icon name /* Stage */ XfdashboardStage { -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list [email protected] https://mail.xfce.org/mailman/listinfo/xfce4-commits
