From 05da76f3b91a3d8755592994d47e1b033ed8e1ce Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sun, 1 Oct 2017 23:20:19 +0200 Subject: [PATCH] Cleaning up code --- themes/zuitedesk/css/forms.css | 20 +- themes/zuitedesk/css/global.css | 81 ++------ themes/zuitedesk/css/navigation.css | 10 +- themes/zuitedesk/css/nodes.css | 51 +---- themes/zuitedesk/css/pages.css | 30 --- themes/zuitedesk/css/print.css | 7 +- themes/zuitedesk/css/suitedesk.css | 299 ++-------------------------- themes/zuitedesk/css/tabs.css | 2 - themes/zuitedesk/css/wireframes.css | 2 - 9 files changed, 41 insertions(+), 461 deletions(-) diff --git a/themes/zuitedesk/css/forms.css b/themes/zuitedesk/css/forms.css index e4c5195..a2dfb34 100644 --- a/themes/zuitedesk/css/forms.css +++ b/themes/zuitedesk/css/forms.css @@ -73,8 +73,7 @@ form#diff-node-revisions table.table td { } body.section-admin form table.table td { padding: 5px !important; -} -/* +} /* .form-item .description { font-size: 75%; line-height: 150%; @@ -161,12 +160,10 @@ span.password-confirm { span.password-confirm span { font-weight: normal; } */ -#edit-notify-wrapper { /* - margin-top: 16px 0 0; */ +#edit-notify-wrapper { padding-left: 70px; background: transparent url(../images/notify.png) no-repeat 8px 4px; - min-height: 52px; /* - font-size: 14px; */ + min-height: 52px; } /* @@ -224,9 +221,7 @@ textarea.teaser { fieldset { margin: 1em 0; padding: .5em 1em; - border: 2px solid #ddd; /* - border-radius: 5px; - background: #fff url(images/bg-content-bottom.png) repeat-x 0 bottom; */ + border: 2px solid #ddd; } form > div > fieldset { margin-top: 0; @@ -249,13 +244,10 @@ fieldset legend a { /* * Collapsible fieldsets. */ -html.js fieldset.collapsed { /* - border-radius: 0; */ +html.js fieldset.collapsed { border-bottom-color: transparent; border-left-color: transparent; - border-right-color: transparent; /* - margin-bottom: 0; - height: 1.2em; */ + border-right-color: transparent; } html.ie.js fieldset.collapsed { height: 2em; diff --git a/themes/zuitedesk/css/global.css b/themes/zuitedesk/css/global.css index efb101f..3e8ed14 100644 --- a/themes/zuitedesk/css/global.css +++ b/themes/zuitedesk/css/global.css @@ -12,16 +12,10 @@ html { } body.drag { cursor: move; -} /* -@media (max-width: 799px) { - body { - font-size: 17px; - } -} */ +} pre { - border: 0; /* - border-radius: 0; */ + border: 0; border-left: 6px solid #3c8dbc; } body.print-body pre { @@ -58,12 +52,9 @@ table.sticky-enabled td { vertical-align: top; } */ th.active { - white-space: nowrap; /* - padding-right: 22px !important; - position: relative !important; */ + white-space: nowrap; } -th.active img { /* - position: absolute; */ +th.active img { margin-left: 5px; } /* th a:link, th a:visited { @@ -188,18 +179,15 @@ span.marker { tr.error { background: #fcc; - color: #200; /* - padding: 2px; */ + color: #200; } tr.warning { background: #ffd; - color: #220; /* - padding: 2px; */ + color: #220; } tr.ok { background: #dfd; - color: #020; /* - padding: 2px; */ + color: #020; } div.messages, @@ -268,8 +256,7 @@ div.status { .new { color: #fff999; - background-color: red; /* - border-radius: 2px; */ + background-color: red; margin: .3em 0 .3em .6em; padding: 0 5px; font-size: .92em; @@ -299,8 +286,7 @@ div.indentation { padding: .1em; } -/* Other common styles */ -/* +/* Other common styles */ /* div.tree-child { background: url(../images/tree.png) no-repeat 11px center; } @@ -413,14 +399,12 @@ dl.multiselect .form-item { margin: 0; } */ -/* Inline items (need to override above) */ -/* +/* Inline items (need to override above) */ /* .container-inline div, .container-inline label { display: inline; } */ -/* Teaser splitter */ -/* +/* Teaser splitter */ /* .joined + .grippie { height: 5px; background-position: center 1px; @@ -499,46 +483,6 @@ html.js .js-hide { font-weight: bold; } -/* - * Drupal Aggregator module. - */ /* -#aggregator .feed-source .feed-title { - margin-top: 0; -} -#aggregator .feed-source .feed-image img { - margin-bottom: 0.75em; -} -#aggregator .feed-source .feed-icon { - float: right; - display: block; -} -#aggregator .feed-item { - margin-bottom: 1.5em; -} -#aggregator .feed-item-title { - margin-bottom: 0; - font-size: 1.3em; -} -#aggregator .feed-item-meta, #aggregator .feed-item-body { - margin-bottom: 0.5em; -} -#aggregator .feed-item-categories { - font-size: 0.9em; -} -#aggregator td { - vertical-align: bottom; -} -#aggregator td.categorize-item { - white-space: nowrap; -} -#aggregator .categorize-item .news-item .body { - margin-top: 0; -} -#aggregator .categorize-item h3 { - margin-bottom: 1em; - margin-top: 0; -} */ - /* * Drupal User module. */ @@ -600,8 +544,7 @@ html.js .js-hide { #user-login-form div.item-list ul li a:hover { color: #fff; background-color: #ccc; -} -*/ +} */ #user-pass #edit-submit { width: 100%; margin-top: 20px; diff --git a/themes/zuitedesk/css/navigation.css b/themes/zuitedesk/css/navigation.css index 1e4f685..a79859f 100644 --- a/themes/zuitedesk/css/navigation.css +++ b/themes/zuitedesk/css/navigation.css @@ -123,10 +123,7 @@ ul.social-menu .social-link-mail:hover a { #navigation { margin-bottom: 0; border: 0; -} /* -.navbar-image { - height: 88px; -} */ +} .navbar-default .navbar-nav > li > a { color: #aaa; font-size: 18px; @@ -147,10 +144,7 @@ ul.social-menu .social-link-mail:hover a { display: none; } } -@media (max-width: 767px) {/* - .navbar-brand > img { - margin-top: -5px; - }*/ +@media (max-width: 767px) { .navbar-default .navbar-nav > li > a { line-height: 20px; } diff --git a/themes/zuitedesk/css/nodes.css b/themes/zuitedesk/css/nodes.css index 2532119..2c051cb 100644 --- a/themes/zuitedesk/css/nodes.css +++ b/themes/zuitedesk/css/nodes.css @@ -4,8 +4,7 @@ */ -.node .content { /* - margin-top: 1em; */ +.node .content { text-align: justify; } @media (max-width: 799px) { @@ -25,35 +24,17 @@ .node .meta ul { padding: 0; } -.node .meta ul li, -.node .meta ul li a { /* - color: #777; */ -} -.node .meta ul li a:hover { /* - color: #555; - border-bottom: 1px dotted #555; */ -} -.node .meta ul li a.active { /* - color: #555; - font-weight: bold; */ -} -.node .meta ul li.last { /* - padding-right: 10px; */ -} .node ul.links li { line-height: 1.8em; - padding: .4em .8em .4em 0; /* - padding-right: 1.2em; */ + padding: .4em .8em .4em 0; text-transform: capitalize; } .node ul.links li.comment_add, -.node ul.links li.comment_comments { /* - padding: .4em .6em; */ +.node ul.links li.comment_comments { padding-left: .6em; padding-right: .6em; - margin-right: .6em; /* - border-radius: 4px; */ + margin-right: .6em; background-color: #d9534f; } .node ul.links li.comment_add:hover, @@ -109,19 +90,7 @@ .node .terms ul li a.active, .node .terms ul li a:hover { color: #fff; -} /* -.node .links ul.links li.comment_comments { - background: url(images/ico-comments.png) no-repeat 0 2px; } -.node .links ul.links li.comment_reply { - background: url(images/ico-comment-add.png) no-repeat 0 0; -} -.node .links ul.links li.comment_edit { - background: url(images/ico-comment-edit.png) no-repeat 0 0; -} -.node .links ul.links li.comment_delete { - background: url(images/ico-comment-delete.png) no-repeat 0 0; -} */ /* * Override modules/cck/modules/fieldgroup/fieldgroup.css style. @@ -160,19 +129,7 @@ img.filefield-icon { text-transform: uppercase; text-align: center; color: #d8d8d8; -} /* -.node-unpublished { - background-color: #fff4f4; } -.preview .node { - background-color: #ffffea; -} -td.revision-current { - background: #ffc; -} -.terms-inline { - display: inline; -} */ #node-admin-filter ul { list-style: none; diff --git a/themes/zuitedesk/css/pages.css b/themes/zuitedesk/css/pages.css index 59928fd..1248c1b 100644 --- a/themes/zuitedesk/css/pages.css +++ b/themes/zuitedesk/css/pages.css @@ -127,20 +127,7 @@ body.not-logged-in[class*="page-user"] #socket { font-size: 13px; font-weight: bold; color: #aaa; - -/* position: relative; - left: -2px; - right: auto; - line-height: 18px; - max-width: 100%; - */ -} /* -.breadcrumb a { - color: #444; } -.breadcrumb a:hover { - color: #f70a0a; -} */ #submitted { position: relative; @@ -189,23 +176,6 @@ body.not-logged-in[class*="page-user"] #socket { line-height: 1em; font-size: 2.16em; } -/* -h1.title { - color: #ff3300; - margin: -0.12em 0 0.2em; -} -@media (max-width: 399px), (min-width: 530px) and (max-width: 599px) { * MINW * - h1.title { - font-size: 1.8em; - } -} -#submitted + #page-title { - margin-left: 4.6em; -} -#author { - font-size: .8em; - margin: -0.35em 0; -} */ /* * Footer. diff --git a/themes/zuitedesk/css/print.css b/themes/zuitedesk/css/print.css index fbe7dc1..013c5c6 100644 --- a/themes/zuitedesk/css/print.css +++ b/themes/zuitedesk/css/print.css @@ -1,8 +1,6 @@ /** * @file - * Print styling - * - * We provide some sane print styling for Drupal using Zen's layout method. + * Print styling. */ @@ -27,6 +25,9 @@ body.print-body select::-ms-expand { body.print-body button.form-submit { display: none !important; } +body.print-body div[class^="section-"] { + page-break-before: always; +} /* * Collapsible fieldsets. diff --git a/themes/zuitedesk/css/suitedesk.css b/themes/zuitedesk/css/suitedesk.css index 005ee8f..f695bb7 100644 --- a/themes/zuitedesk/css/suitedesk.css +++ b/themes/zuitedesk/css/suitedesk.css @@ -255,54 +255,6 @@ body.page-doks-tags .view-storm-doks-tags .views-row { padding-top: .8em; } -/* - * "Upcoming" blocks. - */ /* -.block-upcoming-events ul { - padding-left: .4em; -} -.block-upcoming-events ul li { - padding-left: 40px; - padding-bottom: .8em; - list-style: none; - background: transparent url(../images/storm/event.png) no-repeat 0 0; -} -.block-upcoming-events .views-field-title { - font-weight: bold; - line-height: 1em; -} -.block-upcoming-events .views-field-field-stormevent-place-value { - font-size: .75em; - color: #999; -} -.block-upcoming-events .views-field-field-stormevent-date-value { - font-size: .75em; - color: #e58a28; -} -#block-views-calendar-block_2 { - margin: 2em 0 -1.5em; - background: transparent; -} -#block-views-calendar-block_2 .content { - overflow: hidden; - margin: 0; -} -#block-views-calendar-block_2 .view-content ul { - width: 3000px; - padding-left: 0; -} -#block-views-calendar-block_2 .view-content ul li { - float: left; - max-width: 14em; - margin: 0 .8em 0 0; -} -#block-views-calendar-block_2 .more-link { - float: right; - padding: 3px 8px; - font-weight: bold; - background: #dfdfdf; -} */ - /* * "SuiteDesk" dynamic desktop. */ @@ -316,8 +268,7 @@ body.page-doks-tags .view-storm-doks-tags .views-row { div.stormlinks { float: right; width: 30%; - border: 1px solid #ddd; /* - border-radius: 5px; */ + border: 1px solid #ddd; background: #fff; padding: 8px 0 4px 1%; margin-bottom: 1em; @@ -335,12 +286,7 @@ div.stormlinks dl { div.stormlinks { display: none; } -} /* -@media (max-width: 439px), (min-width: 530px) and (max-width: 679px) { * MINW * - div.stormlinks { - display: none; - } -} */ +} div.stormlinks .sqtt-timetracking-trigger { display: block; margin-top: 1.4em; @@ -354,14 +300,9 @@ div.stormlinks .sqtt-timetracking-trigger span { div.stormlinks .sqtt-timetracking-trigger img { margin-top: 0; margin-right: 8px; -} /* -#stormdesktop { - clear: both; - padding: 1em 0 0; -} */ +} div.stormdashboard { - width: 50%; /* - margin-left: 0; */ + width: 50%; } div.stormdashboard dt.stormcomponent { background-color: #e2e2e2 !important; @@ -394,37 +335,15 @@ div.stormdashboard dt.stormcomponent:hover a { @media (max-width: 659px), (min-width: 768px) and (max-width: 899px) { div.stormdashboard { width: 100%; - margin-left: 0; /* - width: 100%; - margin-top: 0; - margin-left: 0; */ + margin-left: 0; } -} /* -@media (min-width: 660px) and (max-width: 799px) { - div.stormdashboard dt.stormcomponent { - padding-left: 10px; - background-image: none !important; - } -} */ +} #stormdashboard-block dt.stormcomponent { min-width: 50%; padding-right: 5px; margin-bottom: .1em; -} /* -@media (min-width: 530px) and (max-width: 729px) { * MINW * - #stormdashboard-block dt.stormcomponent { - width: 100%; - background: #e2e2e2 !important; - padding-left: 5px; - } - #stormdashboard-block dt.stormcomponent:hover { - background-color: #d2e0f1 !important; - } - #stormdashboard-block a.popups-form { - display: none; - } -} */ +} dt.stormcomponent img { margin: 0 !important; } @@ -501,27 +420,7 @@ dt.stormcomponent span.stormlinks-count + a > img { /* * "SuiteDesk" list & filter. - */ /* -#edit-datefrom-wrapper label, -#edit-dateto-wrapper label, -#edit-datebeginfrom-wrapper label, -#edit-datebeginto-wrapper label, -#edit-dateendfrom-wrapper label, -#edit-dateendto-wrapper label, -#edit-reqdatefrom-wrapper label, -#edit-reqdateto-wrapper label { - margin-bottom: 0; -} -#edit-datefrom-wrapper .description, -#edit-dateto-wrapper .description, -#edit-datebeginfrom-wrapper .description, -#edit-datebeginto-wrapper .description, -#edit-dateendfrom-wrapper .description, -#edit-dateendto-wrapper .description, -#edit-reqdatefrom-wrapper .description, -#edit-reqdateto-wrapper .description { - margin-bottom: -0.5em; -} */ + */ #edit-itemsperpage-wrapper { margin-top: .5em; } @@ -1233,23 +1132,7 @@ div.field-items img.imagefield[class$="_image"] { body:not(.print-pdf).suitedesk div.field-items { margin-right: 0; } -} /* -@media (max-width: 439px), (min-width: 530px) and (max-width: 679px) { * MINW * - div.stormfields div.value, - body.suitedesk div.field-items { - margin-right: 0; - } -} */ /* -body.print-body div.stormfields div.label, -body.print-body div.field-label { - line-height: 1.8em; - width: 8.3em; - float: left; } -body.print-body div.stormfields div.value, -body.print-body div.field-items { - margin: 0 24% .2em 8.3em; -} */ div[class*="node-type-storm"] .stormbody div.label, div[class*="node-type-storm"] .field-field-stormorganization-notes .field-label, @@ -1322,8 +1205,6 @@ body.suitedesk .field-field-stormorganization-members div.field-items { /* * "SuiteDesk Project" node. - * - * Restore bootstrap normal line height. */ body.suitedesk .field-field-stormproject-ms div.field-items, body.suitedesk .field-field-stormproject-status div.field-items { @@ -1356,36 +1237,7 @@ body.suitedesk .field-field-stormproject-subprojects div.field-items { /* Disable too when printing project book */ .node-type-stormproject .section-2 .stormbody div.label { display: none; -} /* -.node-type-stormdok .group-stormdok-visible { - margin-right: 32%; - margin-bottom: 1.4em; - padding: .5em 1em .5em 50px; - text-align: left; - border: 1px solid #faebcc; - background: #fcf8e3 url(../images/message_warning.png) no-repeat 5px 5px; } -@media (max-width: 889px) { - .node-type-stormdok .group-stormdok-visible { - margin-right: 44%; - } -} -@media (max-width: 439px), all and (min-width: 530px) and (max-width: 679px) { *//* MINW *//* - .node-type-stormdok .group-stormdok-visible { - margin-right: 0; - } -} -.node-type-stormdok .group-stormdok-visible legend { - display: none; -} -.node-type-stormdok .group-stormdok-visible .description { - color: #8a6d3b; -} -body.suitedesk .node-type-stormdok .group-stormdok-visible div.field-items { - margin: 0; - background-color: #fff; - text-align: center; -} */ /* * "SuiteDesk Note" node. @@ -1439,42 +1291,6 @@ body.suitedesk .node-type-stormdok .group-stormdok-visible div.field-items { margin-left: 1.85em; font-size: .82em; } -/* -dt.print_html { - background: transparent url(images/html.png) no-repeat top left; -} -dt.print_pdf { - background: transparent url(images/pdf.png) no-repeat top left; -} - -div.stormfields, div.field, div.stormbody { - width: 70%; -} - -div.stormfields div.label, div.stormbody div.label, div.field div.field-label-inline-first { - float: left; - width: 150px; - text-align: right; - clear: left; - font-weight: bold; -} - -div.stormlinks { - float:right; - width: 30%; -} - -div.stormbody div.value p { - clear: left; - margin: 1.2em; - margin-left: 0; - margin-top: 0; - margin-right: 0; -} - -table#attachments { - float: left; -} */ /* * "SuiteDesk" comments. @@ -1505,8 +1321,7 @@ body.section-ticket #main-content .section { .node-type-stormtask .meta, .node-type-stormticket .meta { position: absolute; - bottom: 1.4em; /* - width: 90%; */ + bottom: 1.4em; padding: 0; } .section-node-add .node-type-stormtask .meta, @@ -1611,20 +1426,7 @@ div.tt-new { div[id$="-attach-items"] table.table td:not(.content-multiple-drag), div[id$="-attached-items"] table.table td:not(.content-multiple-drag) { float: none !important; -} /* -#field-stormorganization-attached-items table.table td, -#field-stormperson-attached-items table.table td, -#field-stormproject-attached-items table.table td, -#field-stormtask-attached-items table.table td, -#field-stormtaskc-attach-items table.table td, -#field-stormticket-attached-items table.table td, -#field-stormticketc-attach-items table.table td, -#field-stormevent-attach-items table.table td, -#field-stormnote-attached-items table.table td, -#field-stormdok-attach-items table.table td { - float: none; -} */ - +} table[id*="_attach_values"], table[id*="_attached_values"] { margin-top: -0.5em; @@ -1720,13 +1522,7 @@ fieldset.group-stormorganization-members { } fieldset.group-stormorganization-members legend { display: none; -} /* -table#field_stormorganization_attached_values { - margin-top: -0.5em; } -table#field_stormorganization_attached_values thead { - display: none; -} */ /* * "SuiteDesk Person" node form. @@ -1734,13 +1530,7 @@ table#field_stormorganization_attached_values thead { #edit-field-stormperson-name-0-value, #edit-field-stormperson-lastname-0-value { width: 100%; -} /* -table#field_stormperson_attached_values { - margin-top: -0.5em; } -table#field_stormperson_attached_values thead { - display: none; -} */ /* * "SuiteDesk Project" node form. @@ -1755,14 +1545,7 @@ fieldset.group-stormproject-subprojects legend { } #edit-field-stormproject-team-value-wrapper { margin: 1.4em 0 .4em; -} /* -table#field_stormproject_attached_values { - margin-top: -0.5em; } -table#field_stormproject_attached_values thead, -form.stormproject_node_form fieldset.book-outline-form { - display: none; -} */ form.stormproject_node_form fieldset.book-outline-form { display: none; } @@ -1772,33 +1555,11 @@ form.stormproject_node_form fieldset.book-outline-form { */ #edit-durationunit-wrapper { margin-bottom: 1.2em; /* Solving field position in responsive actions */ -} /* -table#field_stormtask_attached_values { - margin-top: -0.5em; } -table#field_stormtask_attached_values thead { - display: none; -} */ - -/* - * "SuiteDesk Ticket" node form. - */ /* -table#field_stormticket_attached_values { - margin-top: -0.5em; -} -table#field_stormticket_attached_values thead { - display: none; -} */ /* * "SuiteDesk Event" node form. - */ /* -table#field_stormevent_attach_values { - margin-top: -0.5em; -} -table#field_stormevent_attach_values thead { - display: none; -} */ + */ #edit-field-stormevent-place-0-value-wrapper + .form-item .form-radios label { float: left; width: 7.24%; @@ -1868,34 +1629,10 @@ table#field_stormevent_attach_values thead { } #edit-field-stormevent-place-0-value-wrapper + .form-item + fieldset > legend { display: none; -} /* -#edit-field-stormevent-date-value-wrapper label, -#edit-field-stormevent-date-value2-wrapper label { - display: block; - float: left; - width: 9em; -} */ +} #edit-field-stormevent-date-rrule-UNTIL-datetime-wrapper { padding-top: 1em; -} /* -#edit-field-stormevent-date-rrule-UNTIL-datetime-wrapper label { - display: block; - float: left; - width: 4em; } -#edit-field-stormevent-date-rrule-advanced-BYDAY { - max-width: 300px; -} */ - -/* - * "SuiteDesk Note" node form. - */ /* -table#field_stormnote_attached_values { - margin-top: -0.5em; -} -table#field_stormnote_attached_values thead { - display: none; -} */ /* * "SuiteDesk Idea" node form. @@ -1952,21 +1689,11 @@ table#field_stormnote_attached_values thead { #edit-access-public-wrapper, #edit-access-authorised-wrapper { margin: .5em 0; -} /* -table#field_stormdok_attach_values { - margin-top: -0.5em; } -table#field_stormdok_attach_values thead { - display: none; -} */ /* * "SuiteDesk Task & Ticket" comment form. - */ /* -table#field_stormtaskc_attach_values thead, -table#field_stormticketc_attach_values thead { - display: none; -} */ + */ #edit-field-stormtaskc-title-0-value, #edit-field-stormticketc-title-0-value { width: 100%; diff --git a/themes/zuitedesk/css/tabs.css b/themes/zuitedesk/css/tabs.css index 0671c18..e15c0c7 100644 --- a/themes/zuitedesk/css/tabs.css +++ b/themes/zuitedesk/css/tabs.css @@ -1,8 +1,6 @@ /** * @file * Tabs Styling. - * - * Adds styles for the primary and secondary tabs. */ diff --git a/themes/zuitedesk/css/wireframes.css b/themes/zuitedesk/css/wireframes.css index 917ae6c..1517109 100644 --- a/themes/zuitedesk/css/wireframes.css +++ b/themes/zuitedesk/css/wireframes.css @@ -1,8 +1,6 @@ /** * @file * Wireframes Styling. - * - * Add wireframes to the basic layout elements. */