[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 5 commits - icon-themes/galaxy instsetoo_native/inc_common setup_native/source
Andras Timar
andras.timar at collabora.com
Sat Jun 23 18:01:00 UTC 2018
icon-themes/galaxy/brand_cp/flat_logo.svg | 158 +---------
icon-themes/galaxy/brand_cp/intro-highres.png |binary
icon-themes/galaxy/brand_cp/intro.png |binary
icon-themes/galaxy/sfx2/res/logo.png |binary
instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp |binary
setup_native/source/packinfo/osxdndinstall.png |binary
7 files changed, 27 insertions(+), 131 deletions(-)
New commits:
commit 72523ad8f51643165fc1a5eadbd4db87f72a38f1
Author: Andras Timar <andras.timar at collabora.com>
Date: Sat Jun 23 19:47:41 2018 +0200
New Collabora Office app logo for Start Center
Change-Id: Ia934fb1e6d8c7ab9cf427ec9c72903a0bb193c58
diff --git a/icon-themes/galaxy/sfx2/res/logo.png b/icon-themes/galaxy/sfx2/res/logo.png
index 2da14712d31d..dd87a1b95254 100644
Binary files a/icon-themes/galaxy/sfx2/res/logo.png and b/icon-themes/galaxy/sfx2/res/logo.png differ
commit 7aee0c49ec43ac0ae2ea7bd0ee13d473f59dfd70
Author: Andras Timar <andras.timar at collabora.com>
Date: Sat Jun 23 19:44:54 2018 +0200
New Collabora Office app logo for macOS Installer
Change-Id: I14a91f65d50232a27b449076c7302911a3de8731
diff --git a/setup_native/source/packinfo/osxdndinstall.png b/setup_native/source/packinfo/osxdndinstall.png
index cd259122042e..eb90a85c6028 100644
Binary files a/setup_native/source/packinfo/osxdndinstall.png and b/setup_native/source/packinfo/osxdndinstall.png differ
commit 91de1ffea9fb941877e100023db02cfd439ec665
Author: Andras Timar <andras.timar at collabora.com>
Date: Sat Jun 23 19:27:54 2018 +0200
New Collabora Office app logo for splash screen
Change-Id: I959a35b626a72b71d0cd3f6f2beba4906ae5c271
diff --git a/icon-themes/galaxy/brand_cp/intro-highres.png b/icon-themes/galaxy/brand_cp/intro-highres.png
new file mode 100644
index 000000000000..7891caaa8047
Binary files /dev/null and b/icon-themes/galaxy/brand_cp/intro-highres.png differ
diff --git a/icon-themes/galaxy/brand_cp/intro.png b/icon-themes/galaxy/brand_cp/intro.png
index 60257cde6ebc..7449b643cd95 100644
Binary files a/icon-themes/galaxy/brand_cp/intro.png and b/icon-themes/galaxy/brand_cp/intro.png differ
commit 318452ea5c52e17d5ef0c7baf2fbf91bd6526dea
Author: Andras Timar <andras.timar at collabora.com>
Date: Sat Jun 23 19:27:33 2018 +0200
New Collabora Office app logo for About Box
Change-Id: Ib3d2f7a09482dec6732a498a2f198673d0e94717
diff --git a/icon-themes/galaxy/brand_cp/flat_logo.svg b/icon-themes/galaxy/brand_cp/flat_logo.svg
old mode 100644
new mode 100755
index 0245cfceac12..48dd0ff5a0f6
--- a/icon-themes/galaxy/brand_cp/flat_logo.svg
+++ b/icon-themes/galaxy/brand_cp/flat_logo.svg
@@ -19,7 +19,7 @@
viewBox="0 0 491.5 85.5"
enable-background="new 0 0 486 80"
xml:space="preserve"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="flat_logo.svg"
inkscape:export-filename="/home/samtuke/cb/git/productivity/Marketing/rebrand/splash-screens/collabora-office/flat_logo.png"
inkscape:export-xdpi="90"
@@ -481,16 +481,16 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
- inkscape:window-height="1018"
+ inkscape:window-height="1992"
id="namedview149"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
- inkscape:zoom="1.335391"
- inkscape:cx="271.36578"
- inkscape:cy="-21.533046"
+ inkscape:zoom="5.341564"
+ inkscape:cx="216.49851"
+ inkscape:cy="-8.8675977"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
@@ -691,7 +691,7 @@
transform="matrix(0.81809146,0,0,0.81809146,22.434697,75.008495)"><polygon
transform="matrix(2.0377711,0,0,2.0377711,94.256411,-105.65899)"
id="polygon14"
- points="30.958,32.599 17.914,44.893 17.358,44.386 17.258,20.718 17.772,20.172 "
+ points="17.258,20.718 17.772,20.172 30.958,32.599 17.914,44.893 17.358,44.386 "
style="fill:#ffffff" /><path
id="path24-7"
d="M 130.47169,-64.553074"
@@ -701,129 +701,25 @@
transform="matrix(2.0144385,0,0,2.0144385,132.16103,-257.68199)"
id="g4221"
style="fill:#000000"><text
- style="font-size:14.08969975px;fill:#000000;font-family:LiberationSans"
- font-size="14.0897"
- id="text4158"
- x="40.715214"
- y="113.12014"><tspan
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
- id="tspan4239">Collabora Office</tspan></text>
-
+ style="font-size:14.08969975px;line-height:0%;font-family:LiberationSans;fill:#000000"
+ font-size="14.0897"
+ id="text4158"
+ x="40.715214"
+ y="113.12014"><tspan
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#000000"
+ id="tspan4239">Collabora Office</tspan></text>
</g><g
- id="g4266"
- transform="matrix(2.1028722,0,0,2.1028722,46.210308,36.318668)"><path
- style="fill:#5e3dcc"
- inkscape:connector-curvature="0"
- d="m 50.274805,-58.443898 c 0,0 -10.455046,7.866666 -10.455046,10.955225 0,3.088558 0,20.157431 0,22.936814 0,2.779583 10.546114,10.95134 10.546114,10.95134 L 72.739737,-35.974881 50.274805,-58.443898"
- id="path24_106_" /><path
- inkscape:connector-curvature="0"
- style="fill:url(#path24_1_);fill-opacity:1"
- d="m 43.787118,-39.314127 9.154779,12.51176 c 0,0 -11.567596,-1.260512 -13.122138,2.250508 0,-3.044219 3.967359,-14.762268 3.967359,-14.762268 z"
- id="path24_105_" /><path
- d="m 39.819759,-47.440648 c 0,3.102109 11.718746,11.513892 11.718746,11.513892 0,0 -11.718746,8.44257 -11.718746,11.423221 l 0,-22.937113 z"
- id="path43"
- style="fill:url(#SVGID_1_)"
- inkscape:connector-curvature="0" /><line
- stroke-miterlimit="10"
- x1="47.095875"
- y1="-53.193111"
- x2="52.941898"
- y2="-53.193111"
- id="line47"
- style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line
- stroke-miterlimit="10"
- x1="43.992672"
- y1="-50.3106"
- x2="55.69717"
- y2="-50.3106"
- id="line49"
- style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line
- stroke-miterlimit="10"
- x1="42.42976"
- y1="-47.427994"
- x2="58.579178"
- y2="-47.427994"
- id="line51"
- style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line
- stroke-miterlimit="10"
- x1="44.389626"
- y1="-44.545185"
- x2="61.706097"
- y2="-44.545185"
- id="line53"
- style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line
- stroke-miterlimit="10"
- x1="47.580212"
- y1="-41.662579"
- x2="64.343399"
- y2="-41.662579"
- id="line55"
- style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line
- stroke-miterlimit="10"
- x1="51.005047"
- y1="-38.779873"
- x2="67.225609"
- y2="-38.779873"
- id="line57"
- style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line
- stroke-miterlimit="10"
- x1="54.291084"
- y1="-35.897064"
- x2="70.030098"
- y2="-35.897064"
- id="line59"
- style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line
- stroke-miterlimit="10"
- x1="50.779568"
- y1="-33.014259"
- x2="67.069572"
- y2="-33.014259"
- id="line61"
- style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line
- stroke-miterlimit="10"
- x1="47.247921"
- y1="-30.131649"
- x2="64.186966"
- y2="-30.131649"
- id="line63"
- style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line
- stroke-miterlimit="10"
- x1="44.085434"
- y1="-27.248842"
- x2="61.304359"
- y2="-27.248842"
- id="line65"
- style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line
- stroke-miterlimit="10"
- x1="42.645077"
- y1="-24.366137"
- x2="58.421654"
- y2="-24.366137"
- id="line67"
- style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line
- stroke-miterlimit="10"
- x1="44.43755"
- y1="-21.483328"
- x2="55.538845"
- y2="-21.483328"
- id="line69"
- style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line
- stroke-miterlimit="10"
- x1="47.580212"
- y1="-18.600719"
- x2="52.656338"
- y2="-18.600719"
- id="line71"
- style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><path
- id="path22_11_"
- d="m 46.431491,-37.528427 c -0.854689,0 -1.547467,0.692679 -1.547467,1.547767 0,0.854091 0.692778,1.547168 1.547467,1.547168 0.85449,0 1.547269,-0.693077 1.547269,-1.547168 0,-0.855088 -0.692779,-1.547767 -1.547269,-1.547767 m 0,2.542945 c -0.549998,0 -0.995775,-0.445579 -0.995775,-0.995178 0,-0.549998 0.445877,-0.996174 0.995775,-0.996174 0.549899,0 0.995876,0.446275 0.995876,0.996174 -10e-5,0.549699 -0.446077,0.995178 -0.995876,0.995178"
- inkscape:connector-curvature="0"
- style="fill:#5e3dcc" /><path
- id="path24_102_"
- d="m 43.986292,-36.774072 -0.390678,0.390877 0.435913,0.411203 -0.432426,0.407617 0.390578,0.390478 0.798593,-0.798095 -0.80198,-0.80208"
- inkscape:connector-curvature="0"
- style="fill:#5e3dcc" /><path
- id="path26_11_"
- d="m 42.548724,-34.415856 c -0.385696,0 -0.735822,-0.134112 -1.039915,-0.398848 -0.341158,-0.297816 -0.513929,-0.691284 -0.513929,-1.16765 0,-0.423558 0.15653,-0.791021 0.465206,-1.092922 0.305289,-0.300905 0.678132,-0.45325 1.107569,-0.45325 0.42585,0 0.796102,0.154139 1.100196,0.458331 l -0.403631,0.403532 c -0.195788,-0.195489 -0.423658,-0.290842 -0.696565,-0.290842 -0.277988,0 -0.509545,0.09466 -0.708023,0.289746 -0.19778,0.193396 -0.29383,0.417879 -0.29383,0.685405 0,0.309175 0.10422,0.550297 0.318142,0.737017 0.199573,0.173768 0.417082,0.258161 0.66468,0.258161 0.282871,0 0.517118,-0.09436 0.716592,-0.289148 l 0.398649,0.40951 c -0.306783,0.29931 -0.682217,0.450958 -1.115141,0.450958"
- inkscape:connector-curvature="0"
- style="fill:#666666" /></g></g></svg>
\ No newline at end of file
+ transform="matrix(2.0374308,0,0,2.0374308,92.668958,-105.73989)"
+ id="g4298"><polygon
+ style="fill:#ffffff"
+ points="17.772,20.172 30.958,32.599 17.914,44.893 17.358,44.386 17.258,20.718 "
+ id="polygon14-7" /><polygon
+ points="28.654,55.638 51.742,32.55 28.561,9.362 17.763,20.162 17.772,20.172 30.379,32.053 30.958,32.599 30.379,33.145 17.914,44.893 "
+ id="polygon16"
+ style="fill:#504999;fill-opacity:1" /><polygon
+ style="fill:#c8c8c8"
+ points="29.864,32.599 17.358,44.386 17.258,20.718 "
+ id="polygon18" /><polygon
+ points="31.847,41.483 27.743,35.628 18.807,44.052 "
+ id="polygon20"
+ style="fill:#38257a;fill-opacity:1" /></g></g></svg>
\ No newline at end of file
commit 09a4d781e265f47c8aaeb5cf16887da42a53c0a5
Author: Andras Timar <andras.timar at collabora.com>
Date: Sat Jun 23 19:26:21 2018 +0200
New Collabora Office app logo for Windows Installer
Change-Id: Iad5f57c30db2d27706365ba55de24bdd3863aba3
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
index dca3b6a86f20..6df027c6e13e 100644
Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
index 4a445365f0cb..496e0d308c89 100644
Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp and b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp differ
More information about the Libreoffice-commits
mailing list