neilcsmith-net closed pull request #10: [NETBEANS-145] Apache NetBeans Logo images and icons URL: https://github.com/apache/incubator-netbeans-website/pull/10
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/netbeans.apache.org/src/content/android-chrome-192x192.png b/netbeans.apache.org/src/content/android-chrome-192x192.png new file mode 100644 index 0000000..42bcc7a Binary files /dev/null and b/netbeans.apache.org/src/content/android-chrome-192x192.png differ diff --git a/netbeans.apache.org/src/content/android-chrome-512x512.png b/netbeans.apache.org/src/content/android-chrome-512x512.png new file mode 100644 index 0000000..29a672a Binary files /dev/null and b/netbeans.apache.org/src/content/android-chrome-512x512.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-114x114-precomposed.png b/netbeans.apache.org/src/content/apple-touch-icon-114x114-precomposed.png new file mode 100644 index 0000000..22d8541 Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-114x114-precomposed.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-114x114.png b/netbeans.apache.org/src/content/apple-touch-icon-114x114.png new file mode 100644 index 0000000..a2802a1 Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-114x114.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-120x120-precomposed.png b/netbeans.apache.org/src/content/apple-touch-icon-120x120-precomposed.png new file mode 100644 index 0000000..848ec51 Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-120x120-precomposed.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-120x120.png b/netbeans.apache.org/src/content/apple-touch-icon-120x120.png new file mode 100644 index 0000000..d320fbd Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-120x120.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-144x144-precomposed.png b/netbeans.apache.org/src/content/apple-touch-icon-144x144-precomposed.png new file mode 100644 index 0000000..4aa3be8 Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-144x144-precomposed.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-144x144.png b/netbeans.apache.org/src/content/apple-touch-icon-144x144.png new file mode 100644 index 0000000..7423033 Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-144x144.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-152x152-precomposed.png b/netbeans.apache.org/src/content/apple-touch-icon-152x152-precomposed.png new file mode 100644 index 0000000..ae7559b Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-152x152-precomposed.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-152x152.png b/netbeans.apache.org/src/content/apple-touch-icon-152x152.png new file mode 100644 index 0000000..df3d1dc Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-152x152.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-180x180-precomposed.png b/netbeans.apache.org/src/content/apple-touch-icon-180x180-precomposed.png new file mode 100644 index 0000000..decc5be Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-180x180-precomposed.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-180x180.png b/netbeans.apache.org/src/content/apple-touch-icon-180x180.png new file mode 100644 index 0000000..a1d64cb Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-180x180.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-57x57-precomposed.png b/netbeans.apache.org/src/content/apple-touch-icon-57x57-precomposed.png new file mode 100644 index 0000000..bf95ef5 Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-57x57-precomposed.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-57x57.png b/netbeans.apache.org/src/content/apple-touch-icon-57x57.png new file mode 100644 index 0000000..e690a9b Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-57x57.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-60x60-precomposed.png b/netbeans.apache.org/src/content/apple-touch-icon-60x60-precomposed.png new file mode 100644 index 0000000..243c38f Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-60x60-precomposed.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-60x60.png b/netbeans.apache.org/src/content/apple-touch-icon-60x60.png new file mode 100644 index 0000000..c9e364b Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-60x60.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-72x72-precomposed.png b/netbeans.apache.org/src/content/apple-touch-icon-72x72-precomposed.png new file mode 100644 index 0000000..95317de Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-72x72-precomposed.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-72x72.png b/netbeans.apache.org/src/content/apple-touch-icon-72x72.png new file mode 100644 index 0000000..1f699dc Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-72x72.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-76x76-precomposed.png b/netbeans.apache.org/src/content/apple-touch-icon-76x76-precomposed.png new file mode 100644 index 0000000..afb7b86 Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-76x76-precomposed.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-76x76.png b/netbeans.apache.org/src/content/apple-touch-icon-76x76.png new file mode 100644 index 0000000..a28ee18 Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-76x76.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon-precomposed.png b/netbeans.apache.org/src/content/apple-touch-icon-precomposed.png new file mode 100644 index 0000000..decc5be Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon-precomposed.png differ diff --git a/netbeans.apache.org/src/content/apple-touch-icon.png b/netbeans.apache.org/src/content/apple-touch-icon.png new file mode 100644 index 0000000..a1d64cb Binary files /dev/null and b/netbeans.apache.org/src/content/apple-touch-icon.png differ diff --git a/netbeans.apache.org/src/content/browserconfig.xml b/netbeans.apache.org/src/content/browserconfig.xml new file mode 100644 index 0000000..249c5c1 --- /dev/null +++ b/netbeans.apache.org/src/content/browserconfig.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<browserconfig> + <msapplication> + <tile> + <square150x150logo src="/mstile-150x150.png"/> + <TileColor>#ffc40d</TileColor> + </tile> + </msapplication> +</browserconfig> diff --git a/netbeans.apache.org/src/content/favicon-16x16.png b/netbeans.apache.org/src/content/favicon-16x16.png new file mode 100644 index 0000000..c8d1cc2 Binary files /dev/null and b/netbeans.apache.org/src/content/favicon-16x16.png differ diff --git a/netbeans.apache.org/src/content/favicon-32x32.png b/netbeans.apache.org/src/content/favicon-32x32.png new file mode 100644 index 0000000..1e71b95 Binary files /dev/null and b/netbeans.apache.org/src/content/favicon-32x32.png differ diff --git a/netbeans.apache.org/src/content/favicon.ico b/netbeans.apache.org/src/content/favicon.ico index 765ed9c..a74d6c8 100644 Binary files a/netbeans.apache.org/src/content/favicon.ico and b/netbeans.apache.org/src/content/favicon.ico differ diff --git a/netbeans.apache.org/src/content/images/apache-netbeans.svg b/netbeans.apache.org/src/content/images/apache-netbeans.svg index d7714f4..d296421 100644 --- a/netbeans.apache.org/src/content/images/apache-netbeans.svg +++ b/netbeans.apache.org/src/content/images/apache-netbeans.svg @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information @@ -7,22 +8,29 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + --> -<svg width="260px" height="288px" viewBox="0 0 260 288" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <title>apache-netbeans</title> - <g stroke="none" stroke-width="0" fill="none" fill-rule="evenodd" > - <path d="M130,288 L0,217 L0,72 L50,100 L50,188 L130,232" fill="#327CC5"/> - <path d="M0,72 L50,100 L130,54 L210,100 L260,72 L130,0 Z" fill="#326FB8"/> - <path d="M130,54 L210,100 L130,145 L50,100 Z" fill="#DCDFE7"/> - <path d="M50,100 L130,145 L130,232 L50,188 Z" fill="#FFFFFF"/> - <path d="M130,145 L210,100 L210,188 L130,232 Z" fill="#C9DAE9"/> - <path d="M130,288 L260,217 L260,72 L210,100 L210,188 L130,232" fill="#538EC7"/> - </g> +<svg xmlns="http://www.w3.org/2000/svg" width="444px" height="512px" viewBox="0 0 444 512" version="1.1"> + <title>Apache NetBeans Logo</title> + <description>Apache NetBeans Logo</description> + <g id="logo" stroke-width="0" fill="none" fill-rule="evenodd"> + <path d="M222,0 L222,99 L86,178 L0,128 L222,0 Z" fill="#A1C535"/> + <path d="M444,128 L358,178 L222,99 L222,0 L444,128 L444,128 Z" fill="#ADD439"/> + <path d="M444,384 L358,334 L358,178 L444,128 L444,384 L444,384 Z" fill="#1B6AC6"/> + <path d="M222,512 L222,413 L358,334 L444,384 L222,512 L222,512 Z" fill="#2E90E8"/> + <path d="M0,384 L86,334 L222,413 L222,512 L0,384 L0,384 Z" fill="#EA205E"/> + <path d="M0,128 L86,178 L86,334 L0,384 L0,128 L0,128 Z" fill="#A5073E"/> + <path d="M86,178 L222,99 L358,178 L222,256 L86,178 Z" fill="#F1F6E2"/> + <path d="M222,256 L358,178 L358,334 L222,413 L222,256 Z" fill="#CEDBE6"/> + <path d="M86,178 L222,256 L222,413 L86,334 L86,178 Z" fill="#FFFFFF"/> + </g> </svg> diff --git a/netbeans.apache.org/src/content/images/apache-netbeans.xcf b/netbeans.apache.org/src/content/images/apache-netbeans.xcf deleted file mode 100644 index be9fdbb..0000000 Binary files a/netbeans.apache.org/src/content/images/apache-netbeans.xcf and /dev/null differ diff --git a/netbeans.apache.org/src/content/images/apache-netbeansx1024.png b/netbeans.apache.org/src/content/images/apache-netbeansx1024.png index 8471d18..98089b5 100644 Binary files a/netbeans.apache.org/src/content/images/apache-netbeansx1024.png and b/netbeans.apache.org/src/content/images/apache-netbeansx1024.png differ diff --git a/netbeans.apache.org/src/content/images/favicon.ico b/netbeans.apache.org/src/content/images/favicon.ico deleted file mode 100644 index cfead7c..0000000 Binary files a/netbeans.apache.org/src/content/images/favicon.ico and /dev/null differ diff --git a/netbeans.apache.org/src/content/images/nblogo32x32.png b/netbeans.apache.org/src/content/images/nblogo32x32.png index 4e48e48..75e21aa 100644 Binary files a/netbeans.apache.org/src/content/images/nblogo32x32.png and b/netbeans.apache.org/src/content/images/nblogo32x32.png differ diff --git a/netbeans.apache.org/src/content/images/nblogo48x48.png b/netbeans.apache.org/src/content/images/nblogo48x48.png index 97c7f13..62340a6 100644 Binary files a/netbeans.apache.org/src/content/images/nblogo48x48.png and b/netbeans.apache.org/src/content/images/nblogo48x48.png differ diff --git a/netbeans.apache.org/src/content/images/nblogo64x64.png b/netbeans.apache.org/src/content/images/nblogo64x64.png index 3eec0cf..29ca14b 100644 Binary files a/netbeans.apache.org/src/content/images/nblogo64x64.png and b/netbeans.apache.org/src/content/images/nblogo64x64.png differ diff --git a/netbeans.apache.org/src/content/images/nblogo96x96.png b/netbeans.apache.org/src/content/images/nblogo96x96.png index 225a075..2fd05d1 100644 Binary files a/netbeans.apache.org/src/content/images/nblogo96x96.png and b/netbeans.apache.org/src/content/images/nblogo96x96.png differ diff --git a/netbeans.apache.org/src/content/images/touch-icon-ipad-retina.png b/netbeans.apache.org/src/content/images/touch-icon-ipad-retina.png index 4034892..48848c9 100644 Binary files a/netbeans.apache.org/src/content/images/touch-icon-ipad-retina.png and b/netbeans.apache.org/src/content/images/touch-icon-ipad-retina.png differ diff --git a/netbeans.apache.org/src/content/images/touch-icon-ipad.png b/netbeans.apache.org/src/content/images/touch-icon-ipad.png index a0c7eff..531975f 100644 Binary files a/netbeans.apache.org/src/content/images/touch-icon-ipad.png and b/netbeans.apache.org/src/content/images/touch-icon-ipad.png differ diff --git a/netbeans.apache.org/src/content/images/touch-icon-iphone-retina.png b/netbeans.apache.org/src/content/images/touch-icon-iphone-retina.png index 06fcf99..2dec5b8 100644 Binary files a/netbeans.apache.org/src/content/images/touch-icon-iphone-retina.png and b/netbeans.apache.org/src/content/images/touch-icon-iphone-retina.png differ diff --git a/netbeans.apache.org/src/content/mstile-150x150.png b/netbeans.apache.org/src/content/mstile-150x150.png new file mode 100644 index 0000000..b4c97c7 Binary files /dev/null and b/netbeans.apache.org/src/content/mstile-150x150.png differ diff --git a/netbeans.apache.org/src/content/safari-pinned-tab.svg b/netbeans.apache.org/src/content/safari-pinned-tab.svg new file mode 100644 index 0000000..7cf68e5 --- /dev/null +++ b/netbeans.apache.org/src/content/safari-pinned-tab.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" + "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> +<svg version="1.0" xmlns="http://www.w3.org/2000/svg" + width="512.000000pt" height="512.000000pt" viewBox="0 0 512.000000 512.000000" + preserveAspectRatio="xMidYMid meet"> +<metadata> +Created by potrace 1.11, written by Peter Selinger 2001-2013 +</metadata> +<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)" +fill="#000000" stroke="none"> +<path d="M1448 4483 l-1107 -638 -1 -1285 0 -1286 1101 -634 c605 -349 1109 +-635 1118 -635 10 0 514 286 1120 635 l1101 635 0 1285 -1 1285 -147 84 c-81 +46 -575 330 -1099 632 -524 302 -958 552 -965 554 -7 3 -511 -282 -1120 -632z +m1793 -750 c367 -214 668 -390 669 -393 0 -3 -303 -178 -673 -391 l-672 -385 +-3 -783 c-1 -456 -6 -781 -11 -779 -5 2 -311 178 -680 393 l-671 390 0 775 0 +776 673 391 c369 216 678 392 686 392 7 1 314 -173 682 -386z"/> +</g> +</svg> diff --git a/netbeans.apache.org/src/content/site.webmanifest b/netbeans.apache.org/src/content/site.webmanifest new file mode 100644 index 0000000..b20abb7 --- /dev/null +++ b/netbeans.apache.org/src/content/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "", + "short_name": "", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} diff --git a/netbeans.apache.org/src/content/templates/head.gsp b/netbeans.apache.org/src/content/templates/head.gsp index 9696d59..143fbef 100644 --- a/netbeans.apache.org/src/content/templates/head.gsp +++ b/netbeans.apache.org/src/content/templates/head.gsp @@ -29,6 +29,13 @@ <meta name="generator" content="Apache NetBeans"> <link rel="stylesheet" href="/css/font-awesome.min.css"> <link rel="stylesheet" href="/css/netbeans.css"> + <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"> + <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"> + <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"> + <link rel="manifest" href="/site.webmanifest"> + <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5"> + <meta name="msapplication-TileColor" content="#ffc40d"> + <meta name="theme-color" content="#ffffff"> <link href="https://fonts.googleapis.com/css?family=Lato:400,700" rel="stylesheet"> <!-- Licensed to the Apache Software Foundation (ASF) under one diff --git a/netbeans.apache.org/src/content/templates/menu.gsp b/netbeans.apache.org/src/content/templates/menu.gsp index c7cb845..3c452b5 100644 --- a/netbeans.apache.org/src/content/templates/menu.gsp +++ b/netbeans.apache.org/src/content/templates/menu.gsp @@ -25,7 +25,7 @@ </div> <div class="top-bar" id="responsive-menu"> <div class='top-bar-left'> - <a class='title' href="/"><img src='/images/nblogo48x48.png' style='padding: 8px'></img> Apache NetBeans</a> + <a class='title' href="/"><img src='/images/apache-netbeans.svg' style='padding: 8px; height: 48px;'></img> Apache NetBeans</a> </div> <div class="top-bar-right"> <ul class="vertical medium-horizontal menu" data-responsive-menu="drilldown medium-dropdown"> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@netbeans.apache.org For additional commands, e-mail: notifications-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists