Further style tweaks.

web/pgadmin/dashboard/static/img/welcome_logo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 130"><defs><style>.cls-1{stroke:#000;stroke-width:10.19px;}.cls-2{fill:#336791;}.cls-3,.cls-4,.cls-9{fill:none;}.cls-3,.cls-4,.cls-5,.cls-6{stroke:#fff;}.cls-3,.cls-4{stroke-linecap:round;stroke-width:3.4px;}.cls-3{stroke-linejoin:round;}.cls-4{stroke-linejoin:bevel;}.cls-5,.cls-6{fill:#fff;}.cls-5{stroke-width:1.13px;}.cls-6{stroke-width:0.57px;}.cls-7{fill:#2775b6;}.cls-8{fill:#333;}.cls-9{stroke:#333;stroke-width:3px;}</style></defs><title>pgAdmin_PostgreSQL</title><g id="Layer_1" data-name="Layer 1"><g id="Layer_3"><path class="cls-1" d="M95.59,93.65c.77-6.44.54-7.38,5.33-6.34l1.21.11a27.6,27.6,0,0,0,11.34-1.91c6.09-2.83,9.71-7.55,3.7-6.31-13.71,2.83-14.65-1.81-14.65-1.81C117,55.91,123,28.64,117.82,22,103.57,3.76,78.91,12.37,78.5,12.6l-.13,0a48.65,48.65,0,0,0-9.15-.95C63,11.57,58.31,13.29,54.74,16c0,0-44-18.12-41.95,22.8.44,8.7,12.48,65.86,26.84,48.6C44.88,81.08,50,75.75,50,75.75A13.39,13.39,0,0,0,58.65,78l.25-.21a9,9,0,0,0,.1,2.46c-3.7,4.13-2.62,4.86-10,6.38s-3.09,4.29-.22,5c3.48.87,11.53,2.1,17-5.52l-.22.87c1.46,1.16,1.36,8.35,1.56,13.48s.55,9.93,1.6,12.75,2.28,10.1,12,8C88.81,119.46,95,117,95.59,93.65"/><path class="cls-2" d="M117.17,79.2c-13.71,2.83-14.65-1.81-14.65-1.81C117,55.91,123,28.64,117.82,22,103.57,3.76,78.91,12.37,78.5,12.6l-.13,0a48.65,48.65,0,0,0-9.15-.95C63,11.57,58.31,13.29,54.74,16c0,0-44-18.12-41.95,22.8.44,8.7,12.48,65.86,26.84,48.6C44.88,81.08,50,75.75,50,75.75A13.39,13.39,0,0,0,58.65,78l.25-.21A9.41,9.41,0,0,0,59,80.22c-3.7,4.13-2.61,4.86-10,6.38s-3.08,4.29-.21,5c3.48.87,11.53,2.1,17-5.52l-.22.87c1.45,1.16,2.47,7.56,2.3,13.35s-.28,9.77.86,12.88,2.28,10.1,12,8C88.81,119.46,93,115,93.6,107.42,94,102.07,95,102.87,95,98.08l.75-2.26c.87-7.26.14-9.6,5.15-8.51l1.21.11a27.6,27.6,0,0,0,11.34-1.91c6.09-2.83,9.71-7.55,3.7-6.31Z"/><path class="cls-3" d="M66.33,83.36c-.38,13.5.09,27.09,1.41,30.39s4.15,9.73,13.88,7.64c8.12-1.74,11.08-5.11,12.36-12.55.94-5.47,2.77-20.67,3-23.79"/><path class="cls-3" d="M54.67,15.7s-44-18-42,22.93c.44,8.7,12.48,65.87,26.84,48.6,5.25-6.32,10-11.27,10-11.27"/><path class="cls-3" d="M78.45,12.42c-1.52.47,24.49-9.51,39.28,9.38,5.22,6.67-.83,33.94-15.31,55.42"/><path class="cls-4" d="M102.42,77.22s.94,4.64,14.65,1.81c6-1.24,2.4,3.48-3.7,6.31-5,2.32-16.21,2.92-16.39-.29-.47-8.27,5.9-5.76,5.44-7.83-.42-1.87-3.26-3.7-5.15-8.27-1.64-4-22.57-34.58,5.8-30,1-.22-7.4-27-33.95-27.42S43.45,44.14,43.45,44.14"/><path class="cls-3" d="M58.9,80.05c-3.7,4.13-2.61,4.86-10,6.38s-3.09,4.29-.22,5c3.48.87,11.53,2.1,17-5.52,1.66-2.32,0-6-2.28-7-1.1-.46-2.57-1-4.46,1.09Z"/><path class="cls-3" d="M58.66,80c-.38-2.44.79-5.33,2.05-8.71C62.6,66.19,67,61.11,63.47,45c-2.6-12-20-2.5-20-.87a81.48,81.48,0,0,1-.29,16c-1.41,10.06,6.4,18.57,15.39,17.7"/><path class="cls-5" d="M54.51,43.9c-.08.55,1,2,2.45,2.23a2.62,2.62,0,0,0,2.72-1.51c.08-.56-1-1.17-2.44-1.37s-2.65.09-2.73.65Z"/><path class="cls-6" d="M98,42.76c.07.56-1,2-2.45,2.24a2.64,2.64,0,0,1-2.73-1.52c-.07-.55,1-1.16,2.45-1.36s2.65.09,2.73.64Z"/><path class="cls-3" d="M103.07,38.92c.24,4.36-.94,7.33-1.08,12-.22,6.74,3.21,14.46-2,22.19"/></g><path class="cls-7" d="M154.72,28.15h5.16v4.16A12.84,12.84,0,0,1,163.35,29a11.17,11.17,0,0,1,6.28-1.76,11.84,11.84,0,0,1,9.08,4.09c2.48,2.72,3.73,6.62,3.73,11.67q0,10.26-5.38,14.65a12.2,12.2,0,0,1-7.95,2.79,10.78,10.78,0,0,1-6-1.56,13.55,13.55,0,0,1-3.14-3v16h-5.28Zm19.84,24.6Q177,49.65,177,43.5a17,17,0,0,0-1.09-6.44,7.51,7.51,0,0,0-7.53-5.19q-5.49,0-7.52,5.48a21.49,21.49,0,0,0-1.09,7.44A15.64,15.64,0,0,0,160.88,51a8,8,0,0,0,13.68,1.78Z"/><path class="cls-7" d="M206,29.26a14.6,14.6,0,0,1,3,3V28.3h4.86V56.83c0,4-.58,7.13-1.75,9.44q-3.27,6.38-12.35,6.38a15.07,15.07,0,0,1-8.5-2.27,8.86,8.86,0,0,1-3.85-7.1h5.36a6,6,0,0,0,1.52,3.25q1.77,1.75,5.59,1.76,6,0,7.9-4.28,1.1-2.52,1-9a10.39,10.39,0,0,1-3.8,3.57,13.56,13.56,0,0,1-14.75-2.45q-3.81-3.62-3.81-12,0-7.89,3.84-12.31a11.85,11.85,0,0,1,9.27-4.42A11.37,11.37,0,0,1,206,29.26Zm.64,5.66a7.61,7.61,0,0,0-6.09-2.81A7.52,7.52,0,0,0,193,37.32a20.56,20.56,0,0,0-1.08,7.3c0,3.53.72,6.22,2.14,8.07a6.93,6.93,0,0,0,5.76,2.77,8.09,8.09,0,0,0,8-5.13A16.72,16.72,0,0,0,209,43.56Q209,37.73,206.62,34.92Z"/><path class="cls-7" d="M235.16,16.34h6.58l15.62,43H251l-4.5-12.89H229.6l-4.67,12.89h-6Zm9.67,25.4-6.63-19-6.88,19Z"/><path class="cls-7" d="M279.16,29a14.3,14.3,0,0,1,3.18,3.08V16.2h5.07V59.38h-4.75V55a11.33,11.33,0,0,1-4.35,4.19,12.51,12.51,0,0,1-5.75,1.28,11.61,11.61,0,0,1-9-4.4q-3.82-4.41-3.83-11.74a20.35,20.35,0,0,1,3.49-11.88,11.41,11.41,0,0,1,10-5A11.15,11.15,0,0,1,279.16,29ZM267.39,52.5q2.13,3.39,6.82,3.39a7.17,7.17,0,0,0,6-3.14c1.56-2.1,2.35-5.12,2.35-9s-.81-6.9-2.42-8.81a7.56,7.56,0,0,0-6-2.85,7.88,7.88,0,0,0-6.43,3c-1.64,2-2.46,5-2.46,9A15.62,15.62,0,0,0,267.39,52.5Z"/><path class="cls-7" d="M295.29,28h5.21v4.46a17.4,17.4,0,0,1,3.4-3.37,10.24,10.24,0,0,1,5.92-1.79,9.34,9.34,0,0,1,6,1.85,9.61,9.61,0,0,1,2.34,3.1,11.37,11.37,0,0,1,4.13-3.73,11.52,11.52,0,0,1,5.33-1.22q6.33,0,8.62,4.57a15,15,0,0,1,1.23,6.62V59.38H332V3Line truncated

web/pgadmin/dashboard/static/scss/_dashboard.scss

@@ -41,3 +41,8 @@
     border-radius: $card-border-radius;
     border: $panel-border;
 }
+
+.dashboard-link a {
+    cursor: pointer;
+    color: $color-fg-theme;
+}

web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html

@@ -5,8 +5,9 @@
                 <div class="card">
                     <div class="card-header">{{ _('Welcome') }}</div>
                     <div class="card-body p-2">
-                        <img src="{{ url_for('dashboard.static', filename='img/welcome_logo.png') }}"
-                             alt="{{ config.APP_NAME }} {{ _('logo') }}">
+                        <img src="{{ url_for('dashboard.static', filename='img/welcome_logo.svg') }}"
+                             alt="{{ config.APP_NAME }} {{ _('logo') }}"
+                             width="400" height="100">
                         <h4>{{ _('Feature rich') }} | {{ _('Maximises PostgreSQL') }} | {{ _('Open Source') }} </h4>
                         <p>
                             {{ _('pgAdmin is an Open Source administration and management tool for the PostgreSQL database. It includes a graphical administration interface, an SQL query tool, a procedural code debugger and much more. The tool is designed to answer the needs of developers, DBAs and system administrators alike.') }}

web/pgadmin/misc/file_manager/static/css/file_manager.css

@@ -31,10 +31,6 @@
   margin: 50px auto;
 }
 
-.fm_file {
-  font-size: xx-large !important;
-}
-
 .file_manager h1 {
   font-size: medium;
 }
@@ -72,7 +68,6 @@ x:-o-prefocus, .file-input-container {top:16px;width:198px;}
 }
 
 div.clip {
-  height: 30px;
   margin: 10px auto;
   overflow: hidden;
 }

web/pgadmin/misc/file_manager/static/js/utility.js

@@ -264,7 +264,7 @@ define([
               }
 
               if ($('.fileinfo').data('view') == 'grid') {
-                $('.fileinfo span[data-alt="' + oldPath + '"]').parent().next('p span').text(newName);
+                $('.fileinfo span[data-alt="' + oldPath + '"]').parent().next('div span').text(newName);
                 $('.fileinfo span[data-alt="' + oldPath + '"]').attr('data-alt', newPath);
               } else {
                 $('.fileinfo td[title="' + oldPath + '"]').text(newName);
@@ -537,7 +537,7 @@ define([
             } else if ((data[key]).file_type == 'drive') {
               class_type = 'fa fa-hdd-o fm_drive';
             } else {
-              class_type = 'fa fa-file-text fm_file';
+              class_type = 'fa fa-file-text-o fm_file_grid';
             }
 
             var fm_filename = (data[key]).Filename;
@@ -617,7 +617,7 @@ define([
               icon_type = 'fa fa-hdd-o';
             } else {
               class_type = 'tbl_file';
-              icon_type = 'fa fa-file-text';
+              icon_type = 'fa fa-file-text-o';
             }
 
             result += '<tr class="' + cap_classes + '">';
@@ -641,7 +641,7 @@ define([
             } else {
               result += '<div><input type="text" class="fm_file_rename"/>'+
                         '<div class="d-flex">' +
-                        '<span class="'+icon_type+'"></span>' +
+                        '<span class="fm_file_list '+icon_type+'"></span>' +
                         data_protected +
                         '<span class="less_text ml-2" title="' + fm_filename + '">' + fm_filename + '</span>' +
                         '</div>' +
@@ -1582,32 +1582,32 @@ define([
           folder_div =
             '<li class=\'cap_download cap_delete cap_select_file cap_select_folder cap_rename cap_create cap_upload\'>' +
             '<div class=\'clip\'><span data-alt=\'\' class=\'fa fa-folder-open fm_folder_grid\'></span></div>' +
-            '<div><input type=\'text\' class=\'fm_file_rename\'><span title=\'\'>New_Folder</span></div>' +
+            '<div><input type=\'text\' class=\'fm_file_rename\'><span class="less_text" title=\'\'>New_Folder</span></div>' +
             '<span class=\'meta size\'></span><span class=\'meta created\'></span><span class=\'meta modified\'></span></li>';
 
           path = $('.currentpath').val();
           $file_element = $(folder_div);
-          $('.fileinfo #contents.grid').append($file_element);
-          $file_element.find('p span').toggle();
-          $file_element.find('p input').toggle().val(lg.new_folder).select();
+          $('.fileinfo #contents.grid').prepend($file_element);
+          $file_element.find('div span.less_text').toggle();
+          $file_element.find('div input').toggle().val(lg.new_folder).select();
 
           // rename folder/file on pressing enter key
           $('.file_manager').on('keyup', function(e) {
             if (e.keyCode == 13) {
               e.stopPropagation();
-              $file_element.find('p input').trigger('blur');
+              $file_element.find('div input').trigger('blur');
             }
           });
 
           // rename folder/file on blur
-          $file_element.find('p input').on('blur', function() {
+          $file_element.find('div input').on('blur', function() {
             $('.file_manager button.create').removeAttr('disabled');
-            var text_value = $file_element.find('p input').val();
+            var text_value = $file_element.find('div input').val();
 
             path = $('.currentpath').val();
 
-            $file_element.find('p input').toggle();
-            $file_element.find('p span').toggle().html(text_value);
+            $file_element.find('div input').toggle();
+            $file_element.find('div span.less_text').toggle().html(text_value);
             if (text_value === undefined) {
               text_value = lg.new_folder;
             }
@@ -1620,9 +1620,9 @@ define([
           folder_div = $(
             '<tr class=\'cap_download cap_delete cap_select_file cap_select_folder cap_rename cap_create cap_upload\'>' +
             '<td title=\'\' class=\' tbl_folder\'>' +
-            '<input type=\'text\' class=\'fm_file_rename\'>'+
             '<span class="fa fa-folder-open fm_folder_list"></span>' +
-            '<span>' + lg.new_folder + '</span>' +
+            '<span class="less_text">' + lg.new_folder + '</span>' +
+            '<input type=\'text\' class=\'fm_file_rename\'>'+
             '</td>'+
             '<td><span title=\'\'></span></td>' +
             '<td></td>' +
@@ -1630,25 +1630,25 @@ define([
           );
 
           $file_element_list = $(folder_div);
-          $('.fileinfo #contents.list').prepend($file_element_list);
-          $file_element_list.find('p span').toggle();
-          $file_element_list.find('p input').toggle().val(lg.new_folder).select();
+          $('.fileinfo #contents.file_listing_table tbody').prepend($file_element_list);
+          $file_element_list.find('td span.less_text').toggle();
+          $file_element_list.find('td input').toggle().val(lg.new_folder).select();
 
           // rename folder/file on pressing enter key
           $('.file_manager').on('keyup', function(e) {
             if (e.keyCode == 13) {
               e.stopPropagation();
-              $file_element_list.find('p input').trigger('blur');
+              $file_element_list.find('td input').trigger('blur');
             }
           });
 
           // rename folder/file on blur
-          $file_element_list.find('p input').on('blur', function() {
+          $file_element_list.find('td input').on('blur', function() {
             $('.file_manager button.create').removeAttr('disabled');
-            var text_value = $file_element_list.find('p input').val();
+            var text_value = $file_element_list.find('td input').val();
             path = $('.currentpath').val();
-            $file_element_list.find('p input').toggle();
-            $file_element_list.find('p span').toggle().html(text_value);
+            $file_element_list.find('td input').toggle();
+            $file_element_list.find('td span.less_text').toggle().html(text_value);
             if (text_value === undefined) {
               text_value = lg.new_folder;
             }

web/pgadmin/misc/file_manager/static/scss/_file_manager.scss

@@ -93,13 +93,15 @@
   }
 }
 
-.fm_folder_grid {
+.fm_folder_grid, .fm_file_grid {
   font-size: xx-large !important;
 }
 
 .fm_folder_list,
-.fm_folder_grid {
-  color: $color-warning;
+.fm_folder_grid,
+.fm_file_grid,
+.fm_file_list {
+  color: $color-gray-darker;
 }
 
 .fm_drive {
@@ -365,4 +367,12 @@
 
 .cap_select_file {
   cursor: pointer;
+}
+
+.add-folder-icon {
+  position: relative;
+  top: -8px;
+  left: -6px;
+  font-size: 8px;
+  margin-right: -8px;
 }

web/pgadmin/misc/file_manager/templates/file_manager/index.html

@@ -43,6 +43,7 @@
                 <button name="newfolder" type="button" title="{{ _('Create new folder') }}" value="New Folder"
                         class="btn btn-sm btn-secondary create" tabindex="8">
                     <span class="fa fa-folder-open sql-icon-lg"></span>
+                    <span class="fa fa-plus add-folder-icon"></span>
                 </button>
                 <div class="btn-group" role="group">
                     <button class="ON btn btn-secondary btn-sm grid" type="button" title="{{ _('View as grid') }}" tabindex="9">

web/pgadmin/static/scss/_webcabin.pgadmin.scss

@@ -47,7 +47,7 @@
 }
 
 .wcFrameButton .fa {
-  margin: auto;
+  align-self: center;
 }
 
 .wcFrameButtonBar {