Merge branch 'remove-unused-assets' into update-forms

janfaracik · Oct 7, 2021 · 458b29c · 458b29c
2 parents 16cf101 + 8799f5f
commit 458b29c
Show file tree

Hide file tree

Showing 23 changed files with 12 additions and 258 deletions.
diff --git a/core/src/main/resources/lib/layout/breadcrumb.gif b/core/src/main/resources/lib/layout/breadcrumb.gif
diff --git a/core/src/main/resources/lib/layout/html.jelly b/core/src/main/resources/lib/layout/html.jelly
@@ -99,7 +99,6 @@ THE SOFTWARE.
       <link rel="stylesheet" href="${resURL}${attrs.css}" type="text/css" />
     </j:if>
     <link rel="shortcut icon" href="${resURL}/favicon.ico" type="image/vnd.microsoft.icon" />
-    <link rel="mask-icon" href="${rootURL}/images/mask-icon.svg" color="black" />
 
     <script src="${resURL}/scripts/prototype.js" type="text/javascript"/>
     <script src="${resURL}/scripts/behavior.js" type="text/javascript"/>

diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
@@ -122,7 +122,6 @@ THE SOFTWARE.
       <link rel="stylesheet" href="${resURL}${attrs.css}" type="text/css" />
     </j:if>
     <link rel="shortcut icon" href="${resURL}/favicon.ico" type="image/vnd.microsoft.icon" />
-    <link rel="mask-icon" href="${rootURL}/images/mask-icon.svg" color="black" />
 
     <script src="${resURL}/scripts/prototype.js" type="text/javascript"/>
     <script src="${resURL}/scripts/behavior.js" type="text/javascript"/>

diff --git a/core/src/main/resources/lib/layout/menu_down_arrow.png b/core/src/main/resources/lib/layout/menu_down_arrow.png
diff --git a/core/src/main/resources/lib/layout/menu_down_arrow2.png b/core/src/main/resources/lib/layout/menu_down_arrow2.png
diff --git a/core/src/main/resources/lib/layout/menu_right_arrow.png b/core/src/main/resources/lib/layout/menu_right_arrow.png
diff --git a/core/src/main/resources/lib/layout/menu_right_arrow2.png b/core/src/main/resources/lib/layout/menu_right_arrow2.png
diff --git a/core/src/main/resources/lib/layout/pageHeader.jelly b/core/src/main/resources/lib/layout/pageHeader.jelly
@@ -30,13 +30,13 @@
         <div class="page-header__brand">
             <div class="logo">
                 <a id="jenkins-home-link" href="${rootURL}/">
-                    <img id="jenkins-head-icon" src="${imagesURL}/jenkins-header-logo-v2.svg" alt="[${logoAlt}]" />
+                    <img id="jenkins-head-icon" src="${imagesURL}/svgs/logo.svg" alt="[${logoAlt}]" />
                     <img id="jenkins-name-icon" src="${imagesURL}/title.svg" alt="${title}" width="139" height="34" />
                 </a>
             </div>
 
             <a class="page-header__brand-link" href="${rootURL}/">
-                <img src="${imagesURL}/jenkins-header-logo-v2.svg"
+                <img src="${imagesURL}/svgs/logo.svg"
                      alt="[${logoAlt}]"
                      class="page-header__brand-image" />
                 <span class="page-header__brand-name">Jenkins</span>

diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
@@ -86,16 +86,6 @@ td.center-align {
   border-collapse: collapse;
 }
 
-#top-panel {
-  margin-bottom: 3pt;
-  height: 34px;
-  background: url(../../images/topbar.png) repeat-x;
-}
-
-#top-panel a {
-  text-decoration: none;
-}
-
 .skiplink {
     position: absolute;
     left: -20000px;
@@ -1256,15 +1246,22 @@ div.to-be-removed { display: none; }
 
 textarea {
     margin-bottom: 0;
+    resize: vertical;
 }
 
+// Remove styling + textarea-handle.gif when IE11 is no longer supported
 div.textarea-handle {
-    height: 5px;
+    height: 6px;
     font-size: 0;
     background: var(--light-grey) url(../../images/textarea-handle.gif) no-repeat 50% 1px;
     border: 1px solid var(--medium-grey);
     border-top: none;
     cursor: s-resize;
+
+    // Hide .textarea-handle on devices that support native textarea resizing
+    @supports (resize: both) {
+        display: none;
+    }
 }
 
 textarea.rich-editor {

diff --git a/war/src/main/webapp/css/simple-page.theme.css b/war/src/main/webapp/css/simple-page.theme.css
@@ -33,9 +33,10 @@ html {
 }
 
 .simple-page .logo {
-  background-image: url('../images/jenkins.svg');
+  background-image: url('../images/svgs/logo.svg');
   background-repeat: no-repeat;
   background-position: 50% 0;
+  background-size: contain;
   height: 130px;
 }
 

diff --git a/war/src/main/webapp/images/atom-license.txt b/war/src/main/webapp/images/atom-license.txt
diff --git a/war/src/main/webapp/images/atom.gif b/war/src/main/webapp/images/atom.gif
diff --git a/war/src/main/webapp/images/bottom-sticker-top-edge.png b/war/src/main/webapp/images/bottom-sticker-top-edge.png
diff --git a/war/src/main/webapp/images/headshot.png b/war/src/main/webapp/images/headshot.png
diff --git a/war/src/main/webapp/images/jenkins-header-logo-v2.svg b/war/src/main/webapp/images/jenkins-header-logo-v2.svg
diff --git a/war/src/main/webapp/images/jenkins-redbg.png b/war/src/main/webapp/images/jenkins-redbg.png
diff --git a/war/src/main/webapp/images/jenkins.png b/war/src/main/webapp/images/jenkins.png
diff --git a/war/src/main/webapp/images/jenkins.svg b/war/src/main/webapp/images/jenkins.svg