From 2aabf9370fe2e99685392867d059f3b295c142d7 Mon Sep 17 00:00:00 2001 From: nathangray Date: Tue, 31 Jan 2017 09:26:55 -0700 Subject: [PATCH] Restore left padding on edit dialog's location field --- calendar/templates/default/app.css | 1 - calendar/templates/mobile/app.css | 10 ++++++---- calendar/templates/pixelegg/app.css | 3 --- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css index 42695ee830..be86e0b2ed 100644 --- a/calendar/templates/default/app.css +++ b/calendar/templates/default/app.css @@ -1403,7 +1403,6 @@ img.calendar_print_button, img.calendar_print_appicon { #calendar-edit_account + .chzn-container .chzn-results { max-height: 195px; } -input#calendar-edit_location {padding-left: 0;} #calendar_sidebox_content .ui-datepicker div.ui-datepicker-buttonpane { border-top: 0; margin: 0; diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css index ac461592c3..cdfe6488b0 100644 --- a/calendar/templates/mobile/app.css +++ b/calendar/templates/mobile/app.css @@ -548,7 +548,7 @@ Hide subsequent headers in week view with non-consolidated owners position: absolute; width: 55px; } -.calendar_TimeGridNoLabel > .calendar_calGridHeader > ul { +.calendar_TimeGridNoLabel > .calendar_calGridHeader > span.et2_label { display: none; } .calendar_calDayColHeader img { @@ -1334,9 +1334,6 @@ img.calendar_print_appicon { #calendar-edit_account + .chzn-container .chzn-results { max-height: 195px; } -input#calendar-edit_location { - padding-left: 0; -} #calendar_sidebox_content .ui-datepicker div.ui-datepicker-buttonpane { border-top: 0; margin: 0; @@ -1366,12 +1363,14 @@ input#calendar-edit_location { to see if it still fits. */ @media all and (max-width: 1000px) and (min-width: 481px) { + /* styles assigned when width is smaller than 1000px */ .calendar_calDayColHeader > div[data-date] .long_date { display: inline; } .calendar_calDayColHeader > div[data-date] .short_date { display: none; } + /* 7 day needs short day labels */ .calendar_calDayColHeader:first-child:nth-last-child(7) > div[data-date] .short_date, .calendar_calDayColHeader:first-child:nth-last-child(7) ~ .calendar_calDayColHeader > div[data-date] .short_date { display: inline; @@ -1392,10 +1391,12 @@ input#calendar-edit_location { } } @media all and (max-width: 480px) { + /* styles assigned when width is smaller than 480px; */ .calendar_calDayColHeader > div[data-date] .long_date, .calendar_calDayColHeader > div[data-date] .short_date { display: none; } + /* 5 day and less fits short day labels */ .calendar_calDayColHeader:first-child:nth-last-child(3) > div[data-date] .short_date, .calendar_calDayColHeader:first-child:nth-last-child(3) ~ .calendar_calDayColHeader > div[data-date] .short_date, .calendar_calDayColHeader:first-child:nth-last-child(4) > div[data-date] .short_date, @@ -1404,6 +1405,7 @@ input#calendar-edit_location { .calendar_calDayColHeader:first-child:nth-last-child(5) ~ .calendar_calDayColHeader > div[data-date] .short_date { display: inline; } + /* 2 day view and less has enough room for full label */ .calendar_calDayColHeader:first-child:nth-last-child(1) > div[data-date] .long_date, .calendar_calDayColHeader:first-child:nth-last-child(1) ~ .calendar_calDayColHeader > div[data-date] .long_date, .calendar_calDayColHeader:first-child:nth-last-child(2) > div[data-date] .long_date, diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index 1dd639b4d4..b0bb749f97 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -1370,9 +1370,6 @@ img.calendar_print_appicon { #calendar-edit_account + .chzn-container .chzn-results { max-height: 195px; } -input#calendar-edit_location { - padding-left: 0; -} #calendar_sidebox_content .ui-datepicker div.ui-datepicker-buttonpane { border-top: 0; margin: 0;