pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove icons from the menus to de-clutter the UI and make it more consistent with most OSs.

pull/6/head
Ashesh Vashi 2017-09-11 09:51:26 +01:00 committed by Dave Page
parent 8b1aeadaf0
commit 3bbd1a8a48
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/browser/static/js/browser.js
View File

@ -237,7 +237,7 @@ define(
/* separator above this menu */ /* separator above this menu */
above: false, above: false,
below: true, below: true,
icon: 'fa fa-magic', /* icon: 'fa fa-magic', */
single: true single: true
} }
}, },

7
web/pgadmin/browser/static/js/menu.js
View File

@ -9,7 +9,7 @@ function(_, S, pgAdmin, $) {
var MenuItem = pgAdmin.Browser.MenuItem = function(opts) { var MenuItem = pgAdmin.Browser.MenuItem = function(opts) {
var menu_opts = [ var menu_opts = [
'name', 'label', 'priority', 'module', 'callback', 'data', 'enable', 'name', 'label', 'priority', 'module', 'callback', 'data', 'enable',
'category', 'target', 'url', 'icon', 'node' 'category', 'target', 'url'/* Do not show icon in the menus, 'icon' */, 'node'
], ],
defaults = { defaults = {
url: '#', url: '#',
@ -34,7 +34,7 @@ function(_, S, pgAdmin, $) {
this.context = { this.context = {
name: this.label, name: this.label,
icon: this.icon || this.module && (this.module.type), /* icon: this.icon || this.module && (this.module.type), */
disabled: this.is_disabled, disabled: this.is_disabled,
callback: this.context_menu_callback.bind(this, item) callback: this.context_menu_callback.bind(this, item)
}; };
@ -77,6 +77,7 @@ function(_, S, pgAdmin, $) {
var span = this.$el.find('span'); var span = this.$el.find('span');
var icon = this.$el.find('i'); var icon = this.$el.find('i');
span.addClass('font-gray-4'); span.addClass('font-gray-4');
span.removeClass('font-white'); span.removeClass('font-white');
icon.addClass('font-gray-4'); icon.addClass('font-gray-4');
@ -126,7 +127,7 @@ function(_, S, pgAdmin, $) {
this.context = { this.context = {
name: this.label, name: this.label,
icon: this.icon || (this.module && this.module.type), /* icon: this.icon || (this.module && this.module.type), */
disabled: this.is_disabled, disabled: this.is_disabled,
callback: this.context_menu_callback.bind(this, item) callback: this.context_menu_callback.bind(this, item)
}; };

6
web/pgadmin/static/css/bootstrap.overrides.css
View File

@ -104,7 +104,7 @@ iframe {
border-width: 5px 0 5px 5px; border-width: 5px 0 5px 5px;
border-left-color: #cccccc; border-left-color: #cccccc;
margin-top: 5px; margin-top: 5px;
margin-right: -10px; margin-right: -2px;
} }
.dropdown-submenu:hover>a:after { .dropdown-submenu:hover>a:after {
@ -152,6 +152,10 @@ iframe {
margin-bottom: 0; margin-bottom: 0;
} }
.dropdown-menu > li > a {
padding: 3px 5px;
}
.dropdown-menu > li > a > i { .dropdown-menu > li > a > i {
margin-left: -17px; margin-left: -17px;
width: 13px; width: 13px;