Commit 08137d8d authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'F3129-subrecord-design' into 'master'

Feature #3129 - suggestion for subrecord title design

See merge request !86

closes #3129
parents acdcaf88 59a8c1f8
Pipeline #891 passed with stage
in 1 minute and 41 seconds
...@@ -793,7 +793,7 @@ const SUBRECORD_COLUMN_ROW_CLASS = '_rowClass'; ...@@ -793,7 +793,7 @@ const SUBRECORD_COLUMN_ROW_CLASS = '_rowClass';
const SUBRECORD_COLUMN_ROW_TITLE = '_rowTitle'; const SUBRECORD_COLUMN_ROW_TITLE = '_rowTitle';
const SUBRECORD_COLUMN_ROW_TOOLTIP = '_rowTooltip'; const SUBRECORD_COLUMN_ROW_TOOLTIP = '_rowTooltip';
const SUBRECORD_TABLE_CLASS_DEFAULT = 'table table-hover qfq-table-100'; const SUBRECORD_TABLE_CLASS_DEFAULT = 'table table-hover qfq-table-100 qfq-subrecord-table';
const GLYPH_ICON = 'glyphicon'; const GLYPH_ICON = 'glyphicon';
const GLYPH_ICON_EDIT = 'glyphicon-pencil'; const GLYPH_ICON_EDIT = 'glyphicon-pencil';
......
...@@ -147,12 +147,10 @@ select.qfq-locked:invalid { ...@@ -147,12 +147,10 @@ select.qfq-locked:invalid {
} }
.qfq-subrecord-table { .qfq-subrecord-table {
margin-left: 10px; margin-top: 0;
margin-right: 10px;
width: calc(~"100% - 20px");
} }
.qfq-form-title, .qfq-subrecord-title { .qfq-form-title {
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
background-image: linear-gradient(to bottom, #fefefe 0, #dedede 100%); background-image: linear-gradient(to bottom, #fefefe 0, #dedede 100%);
...@@ -163,40 +161,6 @@ select.qfq-locked:invalid { ...@@ -163,40 +161,6 @@ select.qfq-locked:invalid {
font-weight: bold; font-weight: bold;
} }
.qfq-subrecord-title {
color: #333;
padding: 10px 12px;
}
.qfq-subrecord-table .btn {
padding: 5px 10px;
}
.qfq-subrecord-head {
background-color: #dedede;
border: 1px solid #ccc;
border-top: none;
}
.qfq-subrecord-head th, .qfq-subrecord-table td {
padding: 3px !important;
vertical-align: middle !important;
border-bottom: 1px solid #ccc !important;
}
.qfq-subrecord-table tbody {
border: 1px solid #ccc;
border-radius: 0 0 3px 3px;
}
.qfq-subrecord-table>tbody>tr {
background-color: #ededed;
}
.qfq-subrecord-table>tbody>tr:hover {
background-color: #efefef;
}
.qfq-table-button-width { .qfq-table-button-width {
width: 44px; width: 44px;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment