From fdef5d9484d7074401283a40ed5934c17a922187 Mon Sep 17 00:00:00 2001 From: Stefan Reinhardt Date: Thu, 13 Mar 2014 18:10:34 +0000 Subject: [PATCH] nextmatch_header_row => favorite filter -> fix css --- timesheet/templates/pixelegg/app.css | 8 ++++++-- timesheet/templates/pixelegg/app.less | 21 +++++++++++++-------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/timesheet/templates/pixelegg/app.css b/timesheet/templates/pixelegg/app.css index 3292c98d30..9eca42e4b0 100755 --- a/timesheet/templates/pixelegg/app.css +++ b/timesheet/templates/pixelegg/app.css @@ -62,12 +62,12 @@ #timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add { width: 32px; border: 1px solid #0C5DA5; + margin: 6px 2px; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); padding: -0.5em; background-color: #e6e6e6 !important; background-size: 16px 16px; height: 24px; - margin: 6px 2px; } #timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add:before { content: ""; @@ -103,6 +103,10 @@ #timesheet-index .nextmatch_header span.header_count { margin: 3px 4px 0 6px; } +#timesheet-index div#timesheet-index_favorite_wrapper { + top: -5px; + right: 6px; +} #timesheet-index table.egwGridView_outer tbody td .et2_link { font-weight: bold; } @@ -111,7 +115,7 @@ } /*########################################### # # -# dialog-header # +# dialogHeader # ############################################# # # # # diff --git a/timesheet/templates/pixelegg/app.less b/timesheet/templates/pixelegg/app.less index a4bcf8b34f..421635beb2 100755 --- a/timesheet/templates/pixelegg/app.less +++ b/timesheet/templates/pixelegg/app.less @@ -28,7 +28,7 @@ div.ui-helper-clearfix, div.ui-helper-reset{ - + height: 0px; // rechte Box mit add @@ -53,12 +53,11 @@ // rechte Box #timesheet-index_timesheet-index-add{ - + button#timesheet-index_add{ .Complete_Button_add_only_plus; .dimension_height_m; - margin: 6px 2px; - + &:hover {.Complete_Button_add_only_plus_hover;} &:active {background-color: @color_positive_action_active !important;} @@ -85,13 +84,19 @@ } } } //nextmatch_header - // Anzahl / positionieren - + + + + + // Anzahl / positionieren span.header_count{ - margin: 3px 4px 0 6px; + margin: 3px 4px 0 6px; } } +// Filter position + div#timesheet-index_favorite_wrapper{top: -5px; right: 6px;} + // Titel: in Bold table.egwGridView_outer tbody td .et2_link {font-weight: bold;} @@ -108,7 +113,7 @@ span.timesheet_titleDetails {font-weight: bold;} /*########################################### # # -# dialog-header # +# dialogHeader # ############################################# # # # #