IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-11 00:22:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Further style tweaks.

Browse Source
This commit is contained in:
Aditya Toshniwal 2019-01-07 16:03:54 +05:30 committed by Akshay Joshi
parent 419bb7f995
commit d361e604c1
10 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
runtime/splash.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
web/pgadmin/dashboard/static/img/welcome_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB

1
web/pgadmin/dashboard/static/img/welcome_logo.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

5
web/pgadmin/dashboard/static/scss/_dashboard.scss
View File

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

5
web/pgadmin/dashboard/templates/dashboard/welcome_dashboard.html
View File

@ -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.') }}

5
web/pgadmin/misc/file_manager/static/css/file_manager.css
View File

@ -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;
}

46
web/pgadmin/misc/file_manager/static/js/utility.js
View File

@ -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;
}

16
web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
View File

@ -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;
}

1
web/pgadmin/misc/file_manager/templates/file_manager/index.html
View File

@ -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">

2
web/pgadmin/static/scss/_webcabin.pgadmin.scss
View File

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