From 1cac0fcff97ad04ef115591fcc416a706c9fd421 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Fri, 6 Feb 2015 13:49:09 +0000 Subject: [PATCH] Remove tag css specification for et2_container in calendar --- calendar/templates/pixelegg/app.css | 118 +++++++++++++-------------- calendar/templates/pixelegg/app.less | 2 +- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index 19a4b1839e..2fec4b7184 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -11,7 +11,7 @@ * @package calendar * @version $Id$ */ -/* $Id: app.css 49681 2014-12-03 00:33:35Z nathangray $ */ +/* $Id: app.css 49793 2014-12-09 17:55:00Z nathangray $ */ /*Media print classes*/ @media print { .th td, @@ -1025,7 +1025,7 @@ div.calendar { # # # # ##############################################*/ -div#calendar-edit { +#calendar-edit { /*###########################################*/ /*###########################################*/ /*Tab Beschreibung*/ @@ -1039,69 +1039,69 @@ div#calendar-edit { /*###########################################*/ /*// Toolbar*/ } -div#calendar-edit label.et2_label { +#calendar-edit label.et2_label { /*padding: 0 2px;*/ } -div#calendar-edit .chzn-container { +#calendar-edit .chzn-container { padding-top: 0; } -div#calendar-edit .et2_tabheader { +#calendar-edit .et2_tabheader { background-color: transparent; } -div#calendar-edit .et2_tabs { +#calendar-edit .et2_tabs { min-height: 246px; } -div#calendar-edit .et2_tabcntr { +#calendar-edit .et2_tabcntr { overflow-y: auto; } -div#calendar-edit input.hasDatepicker, -div#calendar-edit #calendar-edit_start { +#calendar-edit input.hasDatepicker, +#calendar-edit #calendar-edit_start { width: 129px; } -div#calendar-edit #calendar-edit_whole_day { +#calendar-edit #calendar-edit_whole_day { margin: 0 0.8em 0 23px; } -div#calendar-edit label.et2_label#calendar-edit_calendar_edit_duration { +#calendar-edit label.et2_label#calendar-edit_calendar_edit_duration { /*margin-left: 20px;*/ /*margin-right: 49px;*/ } -div#calendar-edit select#calendar-edit_duration { +#calendar-edit select#calendar-edit_duration { width: 133px; } -div#calendar-edit button#calendar-edit_freetime { +#calendar-edit button#calendar-edit_freetime { height: 16px; background-size: 12px auto !important; margin-left: 32px; padding: 0px; } -div#calendar-edit #calendar-edit_id { +#calendar-edit #calendar-edit_id { float: right; margin-right: 5px; } -div#calendar-edit #calendar-edit_calendar-edit-details { +#calendar-edit #calendar-edit_calendar-edit-details { display: block; float: left; width: 100%; } -div#calendar-edit #calendar-edit_calendar-edit-details table.et2_grid { +#calendar-edit #calendar-edit_calendar-edit-details table.et2_grid { /*background-color: yellow;*/ line-height: 20px; width: 60%; } -div#calendar-edit #calendar-edit_calendar-edit-details .calendar_category_details { +#calendar-edit #calendar-edit_calendar-edit-details .calendar_category_details { margin: 0 1em; width: 20em; } -div#calendar-edit #calendar-edit_calendar-edit-details .et2_hbox_right { +#calendar-edit #calendar-edit_calendar-edit-details .et2_hbox_right { overflow-y: auto; } -div#calendar-edit #calendar-edit_calendar-edit-details .et2_selectbox .ui-multiselect-checkboxes { +#calendar-edit #calendar-edit_calendar-edit-details .et2_selectbox .ui-multiselect-checkboxes { min-height: 229px; } -div#calendar-edit #calendar-edit_calendar-edit-details .et2_selectbox .ui-multiselect-checkboxes li { +#calendar-edit #calendar-edit_calendar-edit-details .et2_selectbox .ui-multiselect-checkboxes li { text-indent: -20px; } -div#calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_category { +#calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_category { border: 1px solid; border-color: #b4b4b4; -webkit-border-radius: 3px; @@ -1109,30 +1109,30 @@ div#calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_category { border-radius: 3px; padding: 0 0.3em 0 0; } -div#calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_category li .ui-state-hover { +#calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_category li .ui-state-hover { font-weight: normal !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); } -div#calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_details_alarms { +#calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_details_alarms { background-color: #cdcdcd; display: block !important; } -div#calendar-edit #calendar-edit_calendar-edit-description #calendar-edit_details_category { +#calendar-edit #calendar-edit_calendar-edit-description #calendar-edit_details_category { margin: 0 1em; width: 20em; } -div#calendar-edit #calendar-edit_calendar-edit-description .et2_hbox_right { +#calendar-edit #calendar-edit_calendar-edit-description .et2_hbox_right { overflow-y: auto; } -div#calendar-edit #calendar-edit_calendar-edit-description .et2_selectbox .ui-multiselect-checkboxes { +#calendar-edit #calendar-edit_calendar-edit-description .et2_selectbox .ui-multiselect-checkboxes { min-height: 218px; } -div#calendar-edit #calendar-edit_calendar-edit-description .et2_selectbox .ui-multiselect-checkboxes li { +#calendar-edit #calendar-edit_calendar-edit-description .et2_selectbox .ui-multiselect-checkboxes li { text-indent: -20px; } -div#calendar-edit #calendar-edit_calendar-edit-description #calendar-edit_category { +#calendar-edit #calendar-edit_calendar-edit-description #calendar-edit_category { border: 1px solid; border-color: #b4b4b4; -webkit-border-radius: 3px; @@ -1140,42 +1140,42 @@ div#calendar-edit #calendar-edit_calendar-edit-description #calendar-edit_catego border-radius: 3px; padding: 0 0.3em 0 0; } -div#calendar-edit #calendar-edit_calendar-edit-description #calendar-edit_category li .ui-state-hover { +#calendar-edit #calendar-edit_calendar-edit-description #calendar-edit_category li .ui-state-hover { font-weight: normal !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); } -div#calendar-edit #calendar-edit_calendar-edit-participants { +#calendar-edit #calendar-edit_calendar-edit-participants { /*.et2_label {padding: 0 5px 0 0;}*/ } -div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants { +#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants { margin: 5px; } -div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants td { +#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants td { padding: 0.2em 0.5em; } -div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_account { +#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_account { width: 143px; } -div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_resource select { +#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_resource select { width: 143px !important; } -div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_resource input { +#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_resource input { width: 103px !important; } -div#calendar-edit #calendar-edit_calendar-edit-participants tr.optional { +#calendar-edit #calendar-edit_calendar-edit-participants tr.optional { background-color: rgba(255, 221, 115, 0.1); } -div#calendar-edit #calendar-edit_calendar-edit-participants tbody { +#calendar-edit #calendar-edit_calendar-edit-participants tbody { display: table; width: 100%; } -div#calendar-edit #calendar-edit_calendar-edit-participants tbody td { +#calendar-edit #calendar-edit_calendar-edit-participants tbody td { vertical-align: top; padding-top: 3px; } -div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-search { +#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-search { /*.background_color_10_gray;*/ -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); @@ -1191,7 +1191,7 @@ div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-s position: relative; top: 4px; } -div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-search:hover { +#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-search:hover { /*.background_color_20_gray;*/ -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -1201,7 +1201,7 @@ div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-s -moz-border-radius: 3px; border-radius: 3px; } -div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-searchactive { +#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-searchactive { /*.background_color_30_gray;*/ border: 1px solid rgba(0, 0, 0, 0.9); -webkit-border-radius: 3px; @@ -1212,20 +1212,20 @@ div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-s box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); background-color: #1aa200; } -div#calendar-edit #calendar-edit_calendar-edit-participants tbody input#calendar-edit_quantity { +#calendar-edit #calendar-edit_calendar-edit-participants tbody input#calendar-edit_quantity { width: 30px; /* position: relative; top: 34px; left: 40px;*/ margin: 6px 0px; } -div#calendar-edit #calendar-edit_calendar-edit-participants tbody div#calendar-edit_resource { +#calendar-edit #calendar-edit_calendar-edit-participants tbody div#calendar-edit_resource { margin: 5px 0 10px 0; } -div#calendar-edit #calendar-edit_calendar-edit-participants tbody div#calendar-edit_resource select { +#calendar-edit #calendar-edit_calendar-edit-participants tbody div#calendar-edit_resource select { margin-right: 3px; } -div#calendar-edit #calendar-edit_calendar-edit-participants tbody select#calendar-edit_role { +#calendar-edit #calendar-edit_calendar-edit-participants tbody select#calendar-edit_role { /*width: 30px;*/ /* position: relative; top: 6px; @@ -1233,57 +1233,57 @@ div#calendar-edit #calendar-edit_calendar-edit-participants tbody select#calenda width: 120px; margin-top: 2px; } -div#calendar-edit #calendar-edit_calendar-edit-participants tbody #calendar-edit_add { +#calendar-edit #calendar-edit_calendar-edit-participants tbody #calendar-edit_add { position: relative; /*left: -145px;*/ top: 31px; } -div#calendar-edit #calendar-edit_calendar-edit-recurrence tbody { +#calendar-edit #calendar-edit_calendar-edit-recurrence tbody { display: table; width: 100%; line-height: 30px; } -div#calendar-edit #calendar-edit_calendar-edit-custom tbody { +#calendar-edit #calendar-edit_calendar-edit-custom tbody { display: table; width: 100%; } -div#calendar-edit #calendar-edit_calendar-edit-links tbody { +#calendar-edit #calendar-edit_calendar-edit-links tbody { display: table; width: 100%; } -div#calendar-edit #calendar-edit_calendar-edit-links tbody .et2_link_to { +#calendar-edit #calendar-edit_calendar-edit-links tbody .et2_link_to { width: auto !important; margin: 1em; } -div#calendar-edit #calendar-edit_calendar-edit-links span.et2_label { +#calendar-edit #calendar-edit_calendar-edit-links span.et2_label { padding: 1em; } -div#calendar-edit #calendar-edit_calendar-edit-links div.delete { +#calendar-edit #calendar-edit_calendar-edit-links div.delete { background-image: url("https:://192.168.1.100/egroupware2/pixelegg/images/delete.png"); } -div#calendar-edit #calendar-edit_calendar-edit-alarms tbody { +#calendar-edit #calendar-edit_calendar-edit-alarms tbody { display: table; width: 100%; } -div#calendar-edit #calendar-edit_calendar-edit-alarms tbody label.et2_label { +#calendar-edit #calendar-edit_calendar-edit-alarms tbody label.et2_label { white-space: nowrap; padding: 0 5px; } -div#calendar-edit #calendar-edit_calendar-edit-alarms tbody tr.add_alarm_action { +#calendar-edit #calendar-edit_calendar-edit-alarms tbody tr.add_alarm_action { background-color: rgba(255, 221, 115, 0.1); margin-bottom: 1em; } -div#calendar-edit #calendar-edit_calendar-edit-history { +#calendar-edit #calendar-edit_calendar-edit-history { max-width: 800px; } -div#calendar-edit #calendar-edit_calendar-edit-history tbody { +#calendar-edit #calendar-edit_calendar-edit-history tbody { display: table-row-group; width: 100%; } -div#calendar-edit tr.dialogFooterToolbar label.et2_label { +#calendar-edit tr.dialogFooterToolbar label.et2_label { top: 0px !important; } -div#calendar-edit #calendar-edit_action { +#calendar-edit #calendar-edit_action { margin-left: 5px; padding-left: 10px; width: 10em; diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index 31de2d2a53..9bc1f9f33d 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -411,7 +411,7 @@ div.calendar { position: relative; } ##############################################*/ -div#calendar-edit{ +#calendar-edit{ label.et2_label{ /*padding: 0 2px;*/ }