From 467013f26a46fa5e654213d0b2f1b616a5bf3667 Mon Sep 17 00:00:00 2001 From: Christoph Zierz - zzmedia Date: Tue, 5 Aug 2014 10:55:12 +0200 Subject: [PATCH 1/4] Add styles to tables in details-pane - added styles to tables in details-pane --- .../_work_packages_details_pane_tables.md | 36 +++++++++++++++++++ .../_work_packages_details_pane_tables.sass | 28 +++++++++++++++ app/assets/stylesheets/default.css.sass | 1 + .../stylesheets/default_simple.css.sass | 1 + 4 files changed, 66 insertions(+) create mode 100644 app/assets/stylesheets/content/_work_packages_details_pane_tables.md create mode 100644 app/assets/stylesheets/content/_work_packages_details_pane_tables.sass diff --git a/app/assets/stylesheets/content/_work_packages_details_pane_tables.md b/app/assets/stylesheets/content/_work_packages_details_pane_tables.md new file mode 100644 index 0000000000..7b2e62d8e6 --- /dev/null +++ b/app/assets/stylesheets/content/_work_packages_details_pane_tables.md @@ -0,0 +1,36 @@ +# Work Packages - [Details Pane] - Tables + +``` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SubjectStatusAssignee
Lorem ipsumResolvedJohn Doe
Lorem ipsum evvrevrevrevrebrebreberberbrebbreevrvrevrebreResolvedJohn Doe
Lorem ipsumResolvedJohn Doe
+ +``` diff --git a/app/assets/stylesheets/content/_work_packages_details_pane_tables.sass b/app/assets/stylesheets/content/_work_packages_details_pane_tables.sass new file mode 100644 index 0000000000..5a2ee812e0 --- /dev/null +++ b/app/assets/stylesheets/content/_work_packages_details_pane_tables.sass @@ -0,0 +1,28 @@ +/* Please use these styles for tables inside the details-pane */ + +table.detail-pane-table + width: 100% + table-layout: fixed + border-collapse: collapse + thead + border-bottom: 1px solid #dddddd + font-weight: bold + text-transform: uppercase + tr + td + padding: 3px 8px 3px 0 + text-overflow: ellipsis + white-space: nowrap + overflow: hidden + &:first-of-type + width: 50% + &:nth-child(2) + width: 15% + &:nth-child(3) + width: 25% + &:last-of-type + width: 10% + +.delete-item + cursor: pointer + float: right diff --git a/app/assets/stylesheets/default.css.sass b/app/assets/stylesheets/default.css.sass index 85b3eb86e5..b5cc22353f 100644 --- a/app/assets/stylesheets/default.css.sass +++ b/app/assets/stylesheets/default.css.sass @@ -59,6 +59,7 @@ @import content/work_packages_table @import content/work_packages_details_activities @import content/work_packages_details_attachments +@import content/work_packages_details_pane_tables @import content/expandable_group_content @import content/control_colors @import content/components_add_comments_default diff --git a/app/assets/stylesheets/default_simple.css.sass b/app/assets/stylesheets/default_simple.css.sass index b637d7bfa5..742d606ffe 100644 --- a/app/assets/stylesheets/default_simple.css.sass +++ b/app/assets/stylesheets/default_simple.css.sass @@ -59,6 +59,7 @@ @import content/work_packages @import content/work_packages_filters @import content/work_packages_table +@import content/work_packages_details_pane_tables @import content/expandable_group_content @import content/control_colors @import content/components_add_comments_default From ef1ea75710c415067e6e01e029f5e609029ccd3a Mon Sep 17 00:00:00 2001 From: Richard Date: Wed, 6 Aug 2014 09:29:32 +0200 Subject: [PATCH 2/4] use detail-pane-table style for relations table --- .../templates/work_packages/tabs/_work_package_relations.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/work_packages/tabs/_work_package_relations.html b/public/templates/work_packages/tabs/_work_package_relations.html index 88ee509e04..6df0981214 100644 --- a/public/templates/work_packages/tabs/_work_package_relations.html +++ b/public/templates/work_packages/tabs/_work_package_relations.html @@ -8,7 +8,7 @@
- +
From 5033ffc22ad57bc5310432d6836e8eb006629b62 Mon Sep 17 00:00:00 2001 From: Richard Date: Wed, 6 Aug 2014 10:42:23 +0200 Subject: [PATCH 3/4] Use generalised table styles for relations and attachments. --- .../_work_packages_details_attachments.sass | 32 ------------------- .../_work_packages_details_pane_tables.sass | 24 ++++++++++++-- .../content/_work_packages_relations.sass | 24 -------------- .../tabs/_attachments_table.html | 18 ++++++----- .../tabs/_work_package_relations.html | 2 +- 5 files changed, 32 insertions(+), 68 deletions(-) diff --git a/app/assets/stylesheets/content/_work_packages_details_attachments.sass b/app/assets/stylesheets/content/_work_packages_details_attachments.sass index e20e43fb0b..8fd66bbc21 100644 --- a/app/assets/stylesheets/content/_work_packages_details_attachments.sass +++ b/app/assets/stylesheets/content/_work_packages_details_attachments.sass @@ -38,38 +38,6 @@ margin: 0 padding: 0 line-height: 20px - table - padding: 0 - margin: 0px 0 10px 0 - float: left - border-collapse: collapse - border: 0px solid #ddd - width: 100% - table-layout: fixed - tbody - tr - td - white-space: nowrap - overflow: hidden - text-overflow: ellipsis - width: 10% - tr - &:hover - background: #ffffae - th - text-align: left - font-family: 'LatoBold' - font-weight: normal - text-transform: uppercase - background: #fff - padding: 6px 10px 6px 0 - border-bottom: 2px solid #eee - td - text-align: left - font-weight: normal - border-bottom: 0px solid #ddd - padding: 6px 10px 6px 0 - .add-file float: left diff --git a/app/assets/stylesheets/content/_work_packages_details_pane_tables.sass b/app/assets/stylesheets/content/_work_packages_details_pane_tables.sass index 5a2ee812e0..7b7f359a7f 100644 --- a/app/assets/stylesheets/content/_work_packages_details_pane_tables.sass +++ b/app/assets/stylesheets/content/_work_packages_details_pane_tables.sass @@ -14,6 +14,14 @@ table.detail-pane-table text-overflow: ellipsis white-space: nowrap overflow: hidden + +.delete-item + cursor: pointer + float: right + +table.relations-table + tr + td &:first-of-type width: 50% &:nth-child(2) @@ -23,6 +31,16 @@ table.detail-pane-table &:last-of-type width: 10% -.delete-item - cursor: pointer - float: right +table.attachments-table + tr + td + &:first-of-type + width: 20% + &:nth-child(2) + width: 10% + &:nth-child(3) + width: 20% + &:nth-child(4) + width: 15% + &:last-of-type + width: 25% \ No newline at end of file diff --git a/app/assets/stylesheets/content/_work_packages_relations.sass b/app/assets/stylesheets/content/_work_packages_relations.sass index 1b7ae18fdc..4f2038c014 100644 --- a/app/assets/stylesheets/content/_work_packages_relations.sass +++ b/app/assets/stylesheets/content/_work_packages_relations.sass @@ -35,30 +35,6 @@ a text-decoration: none color: inherit - .content - .workpackages - table - width: 100% - table-layout: fixed - thead - font-weight: bold - text-transform: uppercase - line-height: 32px - tr - td - text-overflow: ellipsis - white-space: nowrap - overflow: hidden - &:first-of-type - width: 50% - &:nth-child(2) - width: 15% - &:nth-child(3) - width: 25% - &:last-of-type - width: 10% - .delete-item - cursor: pointer .add-relation .related-issue-candidates ul li diff --git a/public/templates/work_packages/tabs/_attachments_table.html b/public/templates/work_packages/tabs/_attachments_table.html index eaff3f0040..984c681dc3 100644 --- a/public/templates/work_packages/tabs/_attachments_table.html +++ b/public/templates/work_packages/tabs/_attachments_table.html @@ -1,20 +1,22 @@ -
{{ I18n.t('js.work_packages.properties.subject') }}
- +
+ - - - - - + + + + + + + - +
{{ I18n.t('js.label_filename')}}{{ I18n.t('js.label_filesize')}}{{ I18n.t('js.label_uploaded_by')}}{{ I18n.t('js.label_description')}}{{ I18n.t('js.label_date')}}{{ I18n.t('js.label_filename')}}{{ I18n.t('js.label_filesize')}}{{ I18n.t('js.label_uploaded_by')}}{{ I18n.t('js.label_description')}}{{ I18n.t('js.label_date')}}
{{ attachment.props.description }}
diff --git a/public/templates/work_packages/tabs/_work_package_relations.html b/public/templates/work_packages/tabs/_work_package_relations.html index 6df0981214..93329bce19 100644 --- a/public/templates/work_packages/tabs/_work_package_relations.html +++ b/public/templates/work_packages/tabs/_work_package_relations.html @@ -8,7 +8,7 @@
- +
From 2a86e4f8ae931fe7aeba9c9f50d70014ce838669 Mon Sep 17 00:00:00 2001 From: Richard Date: Wed, 6 Aug 2014 14:38:11 +0200 Subject: [PATCH 4/4] add titles for attachments and relations table headers. --- .../work_packages/tabs/_attachments_table.html | 10 +++++----- .../work_packages/tabs/_work_package_relations.html | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/templates/work_packages/tabs/_attachments_table.html b/public/templates/work_packages/tabs/_attachments_table.html index 984c681dc3..8d93c1f414 100644 --- a/public/templates/work_packages/tabs/_attachments_table.html +++ b/public/templates/work_packages/tabs/_attachments_table.html @@ -2,11 +2,11 @@
{{ I18n.t('js.work_packages.properties.subject') }}
- - - - - + + + + + diff --git a/public/templates/work_packages/tabs/_work_package_relations.html b/public/templates/work_packages/tabs/_work_package_relations.html index 93329bce19..e281e674c8 100644 --- a/public/templates/work_packages/tabs/_work_package_relations.html +++ b/public/templates/work_packages/tabs/_work_package_relations.html @@ -11,9 +11,9 @@
{{ I18n.t('js.label_filename')}}{{ I18n.t('js.label_filesize')}}{{ I18n.t('js.label_uploaded_by')}}{{ I18n.t('js.label_description')}}{{ I18n.t('js.label_date')}}{{ I18n.t('js.label_filename')}}{{ I18n.t('js.label_filesize')}}{{ I18n.t('js.label_uploaded_by')}}{{ I18n.t('js.label_description')}}{{ I18n.t('js.label_date')}}
- - - + + +
{{ I18n.t('js.work_packages.properties.subject') }}{{ I18n.t('js.work_packages.properties.status') }}{{ I18n.t('js.work_packages.properties.assignee') }}{{ I18n.t('js.work_packages.properties.subject') }}{{ I18n.t('js.work_packages.properties.status') }}{{ I18n.t('js.work_packages.properties.assignee') }}