IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Subnode collection layout improvements, with additional tweaks from me.

Browse Source
This commit is contained in:
Arun Kollan
2016-03-15 12:30:01 +00:00
committed by Dave Page
parent b1d26db8d9
commit cdd7a1f637
3 changed files with 133 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js
View File

@@ -22,10 +22,12 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
}, },
schema: [{ schema: [{
id: 'provider', label: '{{ _('Provider') }}', id: 'provider', label: '{{ _('Provider') }}',
type: 'text', editable: true type: 'text', editable: true,
cellHeaderClasses:'width_percent_50'
},{ },{
id: 'security_label', label: '{{ _('Security Label') }}', id: 'security_label', label: '{{ _('Security Label') }}',
type: 'text', editable: true type: 'text', editable: true,
cellHeaderClasses:'width_percent_50'
}], }],
validate: function() { validate: function() {
var err = {}, var err = {},

4
web/pgadmin/browser/server_groups/servers/static/js/privilege.js
View File

@@ -234,13 +234,13 @@
template: _.template([ template: _.template([
'<tr class="<%= header ? "header" : "" %>">', '<tr class="<%= header ? "header" : "" %>">',
' <td class="renderable">', ' <td class="renderable">',
' <label>', ' <label class="privilege_label">',
' <input type="checkbox" name="privilege" privilege="<%- privilege_type %>" target="<%- target %>" <%= privilege ? \'checked\' : "" %>></input>', ' <input type="checkbox" name="privilege" privilege="<%- privilege_type %>" target="<%- target %>" <%= privilege ? \'checked\' : "" %>></input>',
' <%- privilege_label %>', ' <%- privilege_label %>',
' </label>', ' </label>',
' </td>', ' </td>',
' <td class="renderable">', ' <td class="renderable">',
' <label>', ' <label class="privilege_label">',
' <input type="checkbox" name="with_grant" privilege="<%- privilege_type %>" target="<%- target %>" <%= with_grant ? \'checked\' : "" %> <%= enable_with_grant ? "" : \'disabled\'%>></input>', ' <input type="checkbox" name="with_grant" privilege="<%- privilege_type %>" target="<%- target %>" <%= with_grant ? \'checked\' : "" %> <%= enable_with_grant ? "" : \'disabled\'%>></input>',
' WITH GRANT OPTION', ' WITH GRANT OPTION',
' </label>', ' </label>',

217
web/pgadmin/static/css/overrides.css
View File

@@ -91,47 +91,47 @@ iframe {
} }
.dropdown-submenu>.dropdown-menu { .dropdown-submenu>.dropdown-menu {
top:0; top: 0;
left:100%; left: 100%;
margin-top:-6px; margin-top: -6px;
margin-left:-1px; margin-left: -1px;
-webkit-border-radius:0 6px 6px 6px; -webkit-border-radius: 0 6px 6px 6px;
-moz-border-radius:0 6px 6px 6px; -moz-border-radius: 0 6px 6px 6px;
border-radius:0 6px 6px 6px; border-radius: 0 6px 6px 6px;
} }
.dropdown-submenu:hover>.dropdown-menu { .dropdown-submenu:hover>.dropdown-menu {
display:block; display: block;
} }
.dropdown-submenu>a:after { .dropdown-submenu>a:after {
display:block; display: block;
content:" "; content:" ";
float:right; float: right;
width:0; width: 0;
height:0; height: 0;
border-color:transparent; border-color: transparent;
border-style:solid; border-style: solid;
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: -10px;
} }
.dropdown-submenu:hover>a:after { .dropdown-submenu:hover>a:after {
border-left-color:#ffffff; border-left-color: #ffffff;
} }
.dropdown-submenu.pull-left { .dropdown-submenu.pull-left {
float:none; float: none;
} }
.dropdown-submenu.pull-left>.dropdown-menu { .dropdown-submenu.pull-left>.dropdown-menu {
left:-100%; left: -100%;
margin-left:10px; margin-left: 10px;
-webkit-border-radius:6px 0 6px 6px; -webkit-border-radius: 6px 0 6px 6px;
-moz-border-radius:6px 0 6px 6px; -moz-border-radius: 6px 0 6px 6px;
border-radius:6px 0 6px 6px; border-radius: 6px 0 6px 6px;
} }
.navbar-inverse > li > a, .navbar-inverse > li > a,
@@ -270,10 +270,7 @@ iframe {
.control-label { .control-label {
min-width: 250px; min-width: 250px;
margin: 0px; margin: 0px;
padding-top: 3px; padding: 5px;
padding-left: 5px;
padding-right: 5px;
padding-bottom: 3px;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
} }
@@ -470,18 +467,20 @@ fieldset[disabled] .form-control {
} }
.subnode > table.backgrid{ .subnode > table.backgrid{
width: 99%; width: 100%;
margin: 0.1% 0.49%; margin: 0px;
padding: 0; padding: 0;
margin-bottom: 15px;
} }
.backgrid thead th{ .backgrid thead th{
background-color: #2c76b4; background-color: #2C76B4;
} }
.backgrid th, .backgrid td { .backgrid th, .backgrid td {
line-height: 18px; line-height: 18px;
font-size: 12px; font-size: 12px;
letter-spacing:0.7px
} }
.backgrid td { .backgrid td {
@@ -492,7 +491,7 @@ fieldset[disabled] .form-control {
} }
.backgrid thead th a { .backgrid thead th a {
color: #ffffff; color: white;
} }
.backgrid > th.object { .backgrid > th.object {
@@ -513,24 +512,27 @@ fieldset[disabled] .form-control {
} }
.subnode-header { .subnode-header {
background-color:#2c76b4; background-color: #2C76B4;
height:35px; height: 35px;
color:#FFFFFF; color: #FFFFFF;
border-radius:5px 5px 0px 0px; border-radius: 3px 3px 0px 0px;
padding-top:3px; padding-top: 3px;
}
.subnode-header .control-label {
font-size: 14px;
font-weight: normal !important;
} }
.subnode-header > button.add { .subnode-header > button.add {
float:right; float: right;
margin-right:15px; margin-right: 3px;
margin-bottom: 3px;
margin-top: 3px;
} }
.subnode { .subnode {
margin-top:5px; padding-top: 0px;
padding-top:0px;
border-left:1px solid #dadada;
border-bottom:1px solid #ddd;
border-right:1px solid #ddd;
} }
.subnode-dialog { .subnode-dialog {
@@ -539,26 +541,26 @@ fieldset[disabled] .form-control {
overflow-x: auto; overflow-x: auto;
overflow-y: auto; overflow-y: auto;
right: 0; right: 0;
height:auto; height: auto;
margin-left: 23px; margin-left: 23px;
background-color: #dadada; background-color: #dadada;
margin-top: 0px; margin-top: 0px;
border: 1px solid #a9a9a9; border: 1px solid #a9a9a9;
} }
.subnode-body { .subnode-body {
height:auto; height: auto;
overflow:inherit; overflow: inherit;
} }
.subnode-footer { .subnode-footer {
height:38px; height: 38px;
margin: 0px, 15px; margin: 0px, 15px;
min-height:40px; min-height: 40px;
vertical-align: bottom; vertical-align: bottom;
} }
.sub-node-form { .sub-node-form {
height:auto; height: auto;
padding: 1px; padding: 1px;
} }
@@ -628,116 +630,151 @@ table.backgrid tr.new {
right: 0px; right: 0px;
background-color: #d2d2d2; background-color: #d2d2d2;
color: #b92c28; color: #b92c28;
padding: 5px; padding: 5px;
} }
.pg-prop-header { .pg-prop-header {
position: absolute; position: absolute;
left: 0px; left: 0px;
right: 0px; right: 0px;
top :0; top : 0;
} }
.pg-prop-footer{ .pg-prop-footer{
position: absolute; position: absolute;
left: 0px; left: 0px;
right: 0px; right: 0px;
bottom :0; bottom : 0;
} }
.subnode-header-form { .subnode-header-form {
background-color:#2c76b4; background-color: #F5F5F5;
color:#FFFFFF; color: black;
padding:3px 0 10px 0; padding: 3px 0 10px 0;
border-top: solid 1.5px white; border-top: solid 1.5px white;
font-size: 12px;
} }
.subnode-header-form button.add { .subnode-header-form button.add {
float:right; float: right;
margin-right:15px; margin-right: 0px;
} }
.select2-container--default .select2-search--inline .select2-search__field { .select2-container--default .select2-search--inline .select2-search__field {
background: transparent none repeat scroll 0% 0%; background: transparent none repeat scroll 0% 0%;
border: medium none; border: medium none;
outline: 0px none; outline: 0px none;
box-shadow: none; box-shadow: none;
width: 100% !important; width: 100% !important;
} }
.renderable > .select2-container { .renderable > .select2-container {
width: 100% !important; width: 100% !important;
} }
div.rolmembership { div.rolmembership {
border: 1.5px solid #faebd7; border: 1.5px solid #faebd7;
margin-top: 15px; margin-top: 15px;
} }
fieldset.inline-fieldset { fieldset.inline-fieldset {
margin: 0px; margin-left: 2px; margin-right: 2px; margin: 0px; margin-left: 2px; margin-right: 2px;
padding-right: 10px; padding-left: 10px; padding-top: 6px; padding-bottom: 12px; padding-right: 10px; padding-left: 10px; padding-top: 6px; padding-bottom: 12px;
border: 2px solid; border-radius: 5px; border: 2px solid; border-radius: 5px;
} }
fieldset.inline-fieldset > legend { fieldset.inline-fieldset > legend {
display: block; border: 0px solid black; box-shadow: none; display: block; border: 0px solid black; box-shadow: none;
box-sizing: content-box; top: auto; bottom: auto; left: auto; box-sizing: content-box; top: auto; bottom: auto; left: auto;
font-size: 16px; font-style: normal; font-weight: 600; font-size: 16px; font-style: normal; font-weight: 600;
height: 20px; line-height: 20px; margin: 0px; padding-bottom: 0px; height: 20px; line-height: 20px; margin: 0px; padding-bottom: 0px;
padding-left: 5px; padding-right: 5px; padding-top: 0px; padding-left: 5px; padding-right: 5px; padding-top: 0px;
vertical-align: middle; width: auto; vertical-align: middle; width: auto;
} }
fieldset.inline-fieldset > div { fieldset.inline-fieldset > div {
padding: 0px; margin: 0px; border: 0px; padding: 0px; margin: 0px; border: 0px;
} }
div.inline-tab-panel { div.inline-tab-panel {
float: left; width: 100%; float: left; width: 100%;
} }
div.inline-tab-panel > ul.nav-tabs > li { div.inline-tab-panel > ul.nav-tabs > li {
background-color: lightgrey; border-top-left-radius: 10px; border-top-right-radius: 10px; background-color: lightgrey; border-top-left-radius: 10px; border-top-right-radius: 10px;
} }
div.inline-tab-panel > ul.nav-tabs > li:first-child { div.inline-tab-panel > ul.nav-tabs > li:first-child {
background-color: lightgrey; border-top-left-radius: 3px; border-top-right-radius: 10px; background-color: lightgrey; border-top-left-radius: 3px; border-top-right-radius: 10px;
} }
div.inline-tab-panel > ul.nav-tabs > li > a, div.inline-tab-panel > ul.nav-tabs > li > a,
div.inline-tab-panel > ul.nav-tabs > li > a:active, div.inline-tab-panel > ul.nav-tabs > li > a:active,
div.inline-tab-panel > ul.nav-tabs > li > a:hover, div.inline-tab-panel > ul.nav-tabs > li > a:hover,
div.inline-tab-panel > ul.nav-tabs > li > a:focus { div.inline-tab-panel > ul.nav-tabs > li > a:focus {
border-top-left-radius: 10px; border-top-right-radius: 10px; border-top-left-radius: 10px; border-top-right-radius: 10px;
} }
div.inline-tab-panel > ul.nav-tabs > li:first-child > a, div.inline-tab-panel > ul.nav-tabs > li:first-child > a,
div.inline-tab-panel > ul.nav-tabs > li:first-child > a:active, div.inline-tab-panel > ul.nav-tabs > li:first-child > a:active,
div.inline-tab-panel > ul.nav-tabs > li:first-child > a:hover, div.inline-tab-panel > ul.nav-tabs > li:first-child > a:hover,
div.inline-tab-panel > ul.nav-tabs > li:first-child > a:focus { div.inline-tab-panel > ul.nav-tabs > li:first-child > a:focus {
border-top-left-radius: 3px; border-top-right-radius: 10px; border-top-left-radius: 3px; border-top-right-radius: 10px;
} }
div.inline-tab-panel > ul.tab-content { div.inline-tab-panel > ul.tab-content {
padding-left: 5px; padding-right: 5px; border-color: #DDD; padding-left: 5px; padding-right: 5px; border-color: #DDD;
border-bottom-left-radius: 10px; border-bottom-right-radius: 10px; border-bottom-left-radius: 10px; border-bottom-right-radius: 10px;
border-width: 1px; border-bottom-right-radius: 8px; border-width: 1px; border-bottom-right-radius: 8px;
border-bottom-left-radius: 8px; border-style: solid solid outset; border-bottom-left-radius: 8px; border-style: solid solid outset;
} }
div.inline-tab-panel > ul.tab-content > div.tab-pane { div.inline-tab-panel > ul.tab-content > div.tab-pane {
min-height: 300px; padding: 0px !important; min-height: 300px; padding: 0px !important;
} }
div.inline-tab-panel > ul.tab-content > div.tab-pane > *:first-child { div.inline-tab-panel > ul.tab-content > div.tab-pane > *:first-child {
margin-top: 5px; margin-top: 5px;
} }
div.inline-tab-panel > ul.tab-content > div.tab-pane > *:last-child { div.inline-tab-panel > ul.tab-content > div.tab-pane > *:last-child {
margin-bottom: 5px; margin-bottom: 5px;
} }
.pgadmin-control-error-message .pgadmin-control-error-message
{ {
padding-left:4px; padding-left: 4px;
}
.btn-group-sm>.btn, .btn-sm
{
font-size: 11px;
padding: 3px 3px;
}
td.edit-cell.editable.sortable.renderable.editor {
outline: 0px;
}
.privilege_label
{
font-size: 10px!important;
}
.backgrid th, .backgrid td
{
padding: 2px;
font-weight: normal!important;
}
.pg-panel-depends-container > table > thead > tr > th {
padding: 2px;
}
.backgrid th:first-child , .backgrid th:last-child{
border-left-color: #2C76B4;
}
.backgrid th:last-child{
border-right-color: #2C76B4;
}
.select2-container .select2-selection--single .select2-selection__rendered
{
padding-left: 3px;
} }