From e8707bec908d643c12dcd50ededa97eeaba19f90 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 3 Mar 2016 18:27:32 +0000 Subject: [PATCH] Mobile theme W.I.P: - Fix calendar edit dialog --- calendar/templates/mobile/app.css | 50 +++-------- calendar/templates/mobile/app.less | 4 + calendar/templates/mobile/edit.xet | 124 +++++++++++++-------------- calendar/templates/pixelegg/app.css | 36 -------- calendar/templates/pixelegg/app.less | 52 ----------- pixelegg/css/mobile.css | 57 ++++-------- pixelegg/mobile/fw_mobile.css | 92 +++++++++++--------- pixelegg/mobile/fw_mobile.less | 24 +++++- 8 files changed, 165 insertions(+), 274 deletions(-) diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css index 345aa26390..317a5923b1 100644 --- a/calendar/templates/mobile/app.css +++ b/calendar/templates/mobile/app.css @@ -1686,8 +1686,6 @@ div.calendar { text-indent: -20px; } #calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_category { - border: 1px solid; - border-color: #b4b4b4; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -1730,42 +1728,6 @@ div.calendar { -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); } -#calendar-edit #calendar-edit_calendar-edit-participants { - /*.et2_label {padding: 0 5px 0 0;}*/ -} -#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants { - margin: 5px; -} -#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants td { - padding: 0.2em 0.5em; -} -#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_account { - width: 143px; -} -#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_resource select { - width: 143px !important; -} -#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_resource input { - width: 103px !important; -} -#calendar-edit #calendar-edit_calendar-edit-participants tr.optional { - background-color: rgba(255, 221, 115, 0.1); -} -#calendar-edit #calendar-edit_calendar-edit-participants tbody { - display: table; - width: 100%; -} -#calendar-edit #calendar-edit_calendar-edit-participants tbody td { - vertical-align: top; - padding-top: 3px; -} -#calendar-edit #calendar-edit_calendar-edit-participants tbody input#calendar-edit_quantity { - width: 30px; - /* position: relative; - top: 34px; - left: 40px;*/ - margin: 6px 0px; -} #calendar-edit #calendar-edit_calendar-edit-recurrence tbody { display: table; width: 100%; @@ -2591,4 +2553,16 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { #calendar-list button.plus_button { bottom: 65px ; } + #calendar-edit_category { + max-width: 100%; + } + #calendar-edit #calendar-edit_whole_day { + margin: 0; + } + .quantity { + margin-left: 5px; + } + #popupMainDiv .et2_date.calendar_alarm_date_display { + padding-left: 3px; + } } diff --git a/calendar/templates/mobile/app.less b/calendar/templates/mobile/app.less index 2b5a5dbf92..b3497912ef 100644 --- a/calendar/templates/mobile/app.less +++ b/calendar/templates/mobile/app.less @@ -51,4 +51,8 @@ #calendar-list button.plus_button { bottom: 65px ; } + #calendar-edit_category {max-width: 100%;} + #calendar-edit #calendar-edit_whole_day {margin:0;} + .quantity{margin-left:5px;} + #popupMainDiv .et2_date.calendar_alarm_date_display {padding-left: 3px;} } \ No newline at end of file diff --git a/calendar/templates/mobile/edit.xet b/calendar/templates/mobile/edit.xet index f93d364119..53c159adb2 100644 --- a/calendar/templates/mobile/edit.xet +++ b/calendar/templates/mobile/edit.xet @@ -9,7 +9,6 @@ - @@ -18,17 +17,17 @@