espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

css form panel bottom margin fix

Browse Source
This commit is contained in:
yuri
2018-01-11 16:31:25 +02:00
parent 37cae817a7
commit fba8ca7817
12 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Call.json
+8 -4
View File
@@ -14,7 +14,8 @@
"name":"attendees",
"label":"Attendees",
"view":"crm:views/meeting/record/panels/attendees",
"sticked": true
"sticked": true,
"isForm": true
}
],
"detailSmall":[
@@ -22,7 +23,8 @@
"name":"attendees",
"label":"Attendees",
"view":"crm:views/meeting/record/panels/attendees",
"sticked": true
"sticked": true,
"isForm": true
}
],
"edit":[
@@ -30,7 +32,8 @@
"name":"attendees",
"label":"Attendees",
"view":"crm:views/meeting/record/panels/attendees",
"sticked": true
"sticked": true,
"isForm": true
}
],
"editSmall":[
@@ -38,7 +41,8 @@
"name":"attendees",
"label":"Attendees",
"view":"crm:views/meeting/record/panels/attendees",
"sticked": true
"sticked": true,
"isForm": true
}
]
},
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json
+2 -1
View File
@@ -39,7 +39,8 @@
"name":"statistics",
"label":"Statistics",
"view":"crm:views/campaign/record/panels/campaign-stats",
"hidden": false
"hidden": false,
"isForm": true
}
]
},
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json
+8 -4
View File
@@ -36,7 +36,8 @@
"view":"crm:views/lead/record/panels/converted-to",
"notRefreshable":true,
"hidden":true,
"style":"success"
"style":"success",
"isForm": true
},
{
"name":"activities",
@@ -64,7 +65,8 @@
"view":"crm:views/lead/record/panels/converted-to",
"notRefreshable":true,
"hidden":true,
"style":"success"
"style":"success",
"isForm": true
}
],
"detailSmall":[
@@ -74,7 +76,8 @@
"view":"crm:views/lead/record/panels/converted-to",
"notRefreshable":true,
"hidden":true,
"style":"success"
"style":"success",
"isForm": true
},
{
"name":"activities",
@@ -102,7 +105,8 @@
"view":"crm:views/lead/record/panels/converted-to",
"notRefreshable":true,
"hidden":true,
"style":"success"
"style":"success",
"isForm": true
}
]
},
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Meeting.json
+8 -4
View File
@@ -21,7 +21,8 @@
"leads"
]
},
"sticked": true
"sticked": true,
"isForm": true
}
],
"detailSmall":[
@@ -29,7 +30,8 @@
"name":"attendees",
"label":"Attendees",
"view":"crm:views/meeting/record/panels/attendees",
"sticked": true
"sticked": true,
"isForm": true
}
],
"edit":[
@@ -37,7 +39,8 @@
"name":"attendees",
"label":"Attendees",
"view":"crm:views/meeting/record/panels/attendees",
"sticked": true
"sticked": true,
"isForm": true
}
],
"editSmall":[
@@ -45,7 +48,8 @@
"name":"attendees",
"label":"Attendees",
"view":"crm:views/meeting/record/panels/attendees",
"sticked": true
"sticked": true,
"isForm": true
}
]
},
application/Espo/Resources/metadata/clientDefs/User.json
+8 -4
View File
@@ -18,22 +18,26 @@
"detail": {
"name": "default",
"label": false,
"view": "views/user/record/panels/default-side"
"view": "views/user/record/panels/default-side",
"isForm": true
},
"detailSmall": {
"name": "default",
"label": false,
"view": "views/user/record/panels/default-side"
"view": "views/user/record/panels/default-side",
"isForm": true
},
"edit": {
"name": "default",
"label": false,
"view": "views/user/record/panels/default-side"
"view": "views/user/record/panels/default-side",
"isForm": true
},
"editSmall": {
"name": "default",
"label": false,
"view": "views/user/record/panels/default-side"
"view": "views/user/record/panels/default-side",
"isForm": true
}
},
"defaultSidePanelFieldLists": {
client/res/layout-types/record.tpl
+1 -1
View File
@@ -15,7 +15,7 @@
<% if (panelLabelString) { %>
<div class="panel-heading"><h4 class="panel-title"><%= panelLabelString %></h4></div>
<% } %>
<div class="panel-body">
<div class="panel-body panel-body-form">
<% _.each(panel.rows, function (row, rowNumber) { %>
<div class="row">
<% _.each(row, function (cell, cellNumber) { %>
client/res/templates/record/bottom.tpl
+1 -2
View File
@@ -32,9 +32,8 @@
{{/unless}}
</h4>
</div>
<div class="panel-body" data-name="{{name}}">
<div class="panel-body{{#if isForm}} panel-body-form{{/if}}" data-name="{{name}}">
{{{var name ../this}}}
</div>
</div>
{{/each}}
client/res/templates/record/side.tpl
+1 -1
View File
@@ -34,7 +34,7 @@
</h4>
</div>
{{/if}}
<div class="panel-body" data-name="{{name}}">
<div class="panel-body{{#if isForm}} panel-body-form{{/if}}" data-name="{{name}}">
{{{var name ../this}}}
</div>
</div>
client/src/views/record/detail-side.js
+1 -1
View File
@@ -46,6 +46,7 @@ Espo.define('views/record/detail-side', 'view', function (Dep) {
name: 'default',
label: false,
view: 'views/record/panels/default-side',
isForm: true,
options: {
fieldList: [
{
@@ -334,4 +335,3 @@ Espo.define('views/record/detail-side', 'view', function (Dep) {
});
});
client/src/views/record/edit-side.js
+1 -2
View File
@@ -36,6 +36,7 @@ Espo.define('views/record/edit-side', 'views/record/detail-side', function (Dep)
name: 'default',
label: false,
view: 'views/record/panels/side',
isForm: true,
options: {
fieldList: [
{
@@ -52,5 +53,3 @@ Espo.define('views/record/edit-side', 'views/record/detail-side', function (Dep)
});
});
frontend/less/espo/custom.less
+5 -9
View File
@@ -2,10 +2,6 @@
border-radius: @button-radius;
}
.panel-heading {
padding: 6px 10px;
}
.panel-body {
padding: @panel-padding;
.clearfix();
@@ -72,10 +68,6 @@ blockquote {
font-weight: normal;
}
.form-group {
margin-bottom: 12px;
}
.form-group.hidden-cell {
margin-bottom: 0;
}
@@ -326,6 +318,10 @@ ul.dropdown-menu > li.checkbox:last-child {
margin-bottom: -1px;
}
.panel > .panel-body.panel-body-form {
padding-bottom: @panel-padding - @form-group-margin-bottom;
}
.panel-body .field > .link-container > .list-group-item {
background-color: @panel-bg;
}
@@ -1251,7 +1247,7 @@ table.table td.cell .complex-text {
.popup-notification {
width: 400px;
padding: 14px;
padding: @panel-padding;
background-color: @panel-bg;
border: 2px solid @main-gray;
margin-top: 10px;
frontend/less/espo/variables.less
+3
View File
@@ -19,6 +19,7 @@
@container-lg: @container-large-desktop;
@panel-padding: 14px;
@panel-heading-padding: 6px 10px;
@container-padding: 15px;
@@ -133,3 +134,5 @@
@panel-border-width: 2px;
@navbar-panel-body-max-height: 350px;
@form-group-margin-bottom: 12px;