From 4ed126cbbe168fb336c157d0cbbfb1727d08e412 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 23 Dec 2015 09:09:50 +0000 Subject: [PATCH] Mobile theme W.I.P.: -More styling enhancement for infolog rows --- infolog/templates/mobile/index.xet | 15 ++++++++++----- infolog/templates/pixelegg/app.css | 13 ++++++++----- infolog/templates/pixelegg/app.less | 11 +++++++---- pixelegg/css/mobile.css | 16 +++++++++------- pixelegg/css/mobile.less | 7 +++++-- 5 files changed, 39 insertions(+), 23 deletions(-) diff --git a/infolog/templates/mobile/index.xet b/infolog/templates/mobile/index.xet index 0c342659b2..934ae3983b 100644 --- a/infolog/templates/mobile/index.xet +++ b/infolog/templates/mobile/index.xet @@ -22,6 +22,7 @@ + @@ -29,18 +30,20 @@ - + - + + + - - + + @@ -48,7 +51,9 @@ - + + + diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css index 162c92c109..6bd7e46289 100755 --- a/infolog/templates/pixelegg/app.css +++ b/infolog/templates/pixelegg/app.css @@ -454,9 +454,12 @@ button#infolog-edit_timestamp { white-space: nowrap !important; } label[id^='infolog-index_'][id$='info_enddate]'] { - font-size: 9pt; + font-size: 8pt; float: right; } + label[id^='infolog-index_'][id$='info_enddate]'] time { + font-weight: normal; + } label[id^='infolog-index_'][id$='info_startdate]'] { float: left; font-size: 8pt; @@ -477,9 +480,6 @@ button#infolog-edit_timestamp { ul[id^='infolog-index_'][id$='filelinks]'] { white-space: nowrap !important; } - .infoSubRow span:last-child { - width: 20%; - } .infoSubRow span[id^='infolog-index_'][id$='info_subject]'] { white-space: nowrap; } @@ -487,7 +487,7 @@ button#infolog-edit_timestamp { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; - width: 70%; + width: 100%; font-size: 9pt; font-weight: normal; } @@ -498,5 +498,8 @@ button#infolog-edit_timestamp { tr.infolog_rowHasParent > td:first-child { background: none !important; } + div.et2_vbox.infolog_CompletedClmn { + display: table-caption; + } } /**/ diff --git a/infolog/templates/pixelegg/app.less b/infolog/templates/pixelegg/app.less index eb0e950f39..e7f0fd768d 100755 --- a/infolog/templates/pixelegg/app.less +++ b/infolog/templates/pixelegg/app.less @@ -429,6 +429,9 @@ button#infolog-edit_timestamp { label[id^='infolog-index_'][id$='info_enddate]'] { .mob-fontsize-xs; float:right; + time { + font-weight: normal; + } } label[id^='infolog-index_'][id$='info_startdate]']{ float: left; @@ -452,9 +455,6 @@ button#infolog-edit_timestamp { white-space: nowrap !important; } .infoSubRow { - span:last-child { - width:20%; - } span[id^='infolog-index_'][id$='info_subject]'] { white-space: nowrap; } @@ -464,7 +464,7 @@ button#infolog-edit_timestamp { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; - width: 70%; + width: 100%; .mob-fontsize-s; font-weight: normal; } @@ -475,6 +475,9 @@ button#infolog-edit_timestamp { tr.infolog_rowHasParent > td:first-child { background: none !important; } + div.et2_vbox.infolog_CompletedClmn { + display: table-caption; + } } /**/// Ende der APP INfolo \ No newline at end of file diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index c3ce7ac05c..af4fe343aa 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -2194,7 +2194,6 @@ body { * @package pixelegg * @version $Id$ */ -@import-once "def_colors.less"; #socialMedia { position: relative; bottom: 20px; @@ -4272,7 +4271,7 @@ td.message span.message { text-decoration: none; height: 32px; /*font-size: 1.1em;*/ - font-size: 12.100000000000001px; + font-size: 12.1px; line-height: 1.5em; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover { @@ -4296,7 +4295,7 @@ td.message span.message { } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before { padding-right: 20px; - font-size: 12.100000000000001px; + font-size: 12.1px; content: " "; background-image: url(../images/topmenu_items/home.png); background-repeat: no-repeat; @@ -4692,7 +4691,7 @@ td.message span.message { padding-left: 3em; color: #999999; /*font-size: 12px;*/ - font-size: 12.100000000000001px; + font-size: 12.1px; line-height: 17px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object { @@ -4864,7 +4863,7 @@ td.message span.message { margin: 5px 0px 3px 5px; padding: 0px 0px 0px 15px; line-height: 1em; - font-size: 12.100000000000001px; + font-size: 12.1px; background-image: url(../images/arrow_left.png); background-repeat: no-repeat; background-position: left center; @@ -6693,7 +6692,7 @@ span.egw_tutorial_title { body table.egwGridView_outer tbody tr td.et2_date, body table.egwGridView_outer tbody tr td.et2_date_ro { float: right; - font-size: 10px; + font-size: 9pt; } body table.egwGridView_outer tbody tr td { position: relative; @@ -7179,7 +7178,7 @@ span.egw_tutorial_title { margin: 5px 0px 3px 5px; padding: 0px 0px 0px 15px; line-height: 1em; - font-size: 12.100000000000001px; + font-size: 12.1px; background-image: url(../images/arrow_left.png); background-repeat: no-repeat; background-position: left center; @@ -7745,6 +7744,9 @@ span.egw_tutorial_title { body .et2_nextmatch table.egwGridView_grid tbody tr td span.mobile_cat_col { padding: 0; } + body .et2_nextmatch table.egwGridView_grid tbody tr td div.et2_progress { + margin: 0; + } body .et2_nextmatch table.egwGridView_grid tbody tr.swipe { background-color: #ffc200; border: none; diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less index db461c0a4b..1b035f3a09 100644 --- a/pixelegg/css/mobile.less +++ b/pixelegg/css/mobile.less @@ -11,7 +11,7 @@ */ @import "pixelegg.less"; - +@import (reference) "../less/def_mobile.less"; /********************************/ /* */ /* MEDIA DEFINITION */ @@ -126,7 +126,7 @@ touch-action:initial; td time, td.et2_date , td.et2_date_ro{ float: right; - font-size: 10px; + .mob-fontsize-s; } td { position: relative; @@ -1287,6 +1287,9 @@ time.et2_label, span.mobile_cat_col { padding: 0; } + div.et2_progress { + margin:0; + } } } tr.swipe{