Исправлена панель xfce-4.16

3 years ago · e9f02ef8f5
parent 898ccc94a4
commit e9f02ef8f5
7 changed files with 26 additions and 9 deletions
--- a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0/gtk.css
+++ b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0/gtk.css
@ -246,16 +246,14 @@ panel-toplevel.background button:checked:not(#tasklist-button) {
 .mate-panel-menu-bar button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; border-bottom-color: #0b0c0c; text-shadow: 0 -1px rgba(0, 0, 0, 0.779451); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.779451); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: linear-gradient(to bottom, #353c3e, #2e3436 60%, #2a2e30); }
 #pkg#

-#?pkg(xfce-base/xfce4-panel)>=4.14#
+#?pkg(xfce-base/xfce4-panel)>=4.16#
+.panel button.flat:active { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; background-image: image(#25292b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; }
+.panel button.flat:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; border-bottom-color: #0b0c0c; text-shadow: 0 -1px rgba(0, 0, 0, 0.779451); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.779451); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: image(#252726); border-radius: 3; border: 1px solid #1b1f20; }
+.panel button.flat:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; background-image: image(#25292b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; border-radius: 3; border: 1px solid #1b1f20; }
+#!pkg#
 .panel button.flat:active { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; background-image: image(#25292b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; }
 .panel button.flat:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; border-bottom-color: #0b0c0c; text-shadow: 0 -1px rgba(0, 0, 0, 0.779451); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.779451); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: image(#252726); border-radius: 3; border: 1px solid #1b1f20; }
 .panel button.flat:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; background-image: image(#25292b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; border-radius: 3; border: 1px solid #1b1f20; }
 #systray-6 > frame > border { border: 1px solid #1b1f20; margin-top: 0px; margin-bottom: 1px; }
 #systray-6 .horizontal { padding-right: 4px; margin-top: -1px; }
-#!pkg#
-.panel button:active,
-.panel button:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; background-image: image(#25292b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; }
-.panel button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; border-bottom-color: #0b0c0c; text-shadow: 0 -1px rgba(0, 0, 0, 0.779451); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.779451); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: image(#252726); }
-.panel button,
-.panel button:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; background-image: image(#343938); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; }
 #pkg#
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-54/.calculate_directory
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-54/.calculate_directory
@ -0,0 +1 @@
+# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<54
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-54/datetime-5.rc
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-54/datetime-5.rc
@ -0,0 +1,7 @@
+# Calculate path=~/.config/xfce4/panel
+layout=3
+date_font=Droid Sans 8
+time_font=Droid Sans 21
+date_format=%Y-%m-%d
+time_format=%H:%M
+
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-54/ini.env
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-54/ini.env
@ -0,0 +1,7 @@
+# Calculate format=samba path=~/.calculate
+
+[ver]
+patch = 54
+
+[update]
+patch = on
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/datetime-5.rc
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/datetime-5.rc
@ -1,6 +1,6 @@
 layout=3
 date_font=Droid Sans 8
-time_font=Droid Sans 22
+time_font=Droid Sans 21
 date_format=%Y-%m-%d
 time_format=%H:%M

--- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
@ -2,4 +2,4 @@

 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20201230
+remerge = 20201230.1
--- a/profiles/templates/3.6/6_ac_update_sync/remerge/2020/20201230.1
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2020/20201230.1
@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-themes/gnome-themes-standard
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#
				`@ -0,0 +1 @@`
				`# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<54`