From 4c4e75a38f3009415ed90b6cff6df8a6963013de Mon Sep 17 00:00:00 2001 From: lukabazuka Date: Wed, 13 Apr 2011 19:23:38 +0200 Subject: [PATCH] CSS modifications for issues CC-2039, CC-2160 and CC-2174 --- public/css/fullcalendar.css | 41 +++++++++++++++++++++--- public/css/images/icon_alert_ffffff.png | Bin 0 -> 1014 bytes public/css/playlist_builder.css | 7 ++-- public/css/plupload.queue.css | 2 +- public/css/styles.css | 14 ++++++++ 5 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 public/css/images/icon_alert_ffffff.png diff --git a/public/css/fullcalendar.css b/public/css/fullcalendar.css index 06af1a321..0c93d9936 100644 --- a/public/css/fullcalendar.css +++ b/public/css/fullcalendar.css @@ -1,11 +1,11 @@ /* - * FullCalendar v1.5 Stylesheet + * FullCalendar v1.5.1 Stylesheet * * Copyright (c) 2011 Adam Shaw * Dual licensed under the MIT and GPL licenses, located in * MIT-LICENSE.txt and GPL-LICENSE.txt respectively. * - * Date: Sat Mar 19 18:59:37 2011 -0700 + * Date: Sat Apr 9 14:09:51 2011 -0700 * */ @@ -245,6 +245,10 @@ html .fc, border-color: #ddd; } +.fc-state-disabled { + cursor: default; + } + .fc-state-disabled .fc-button-effect { display: none; } @@ -286,6 +290,7 @@ a.fc-event { height: 100%; border-style: solid; border-width: 0; + overflow: hidden; } .fc-event-time, @@ -609,5 +614,33 @@ table.fc-border-separate { .fc-agenda .ui-resizable-resizing { /* TODO: better selector */ _overflow: hidden; } - - + +/*---////////////////////////////////////////// CUSTOM OVERRIDES ////////////////////////////////---*/ + +html .fc, .fc table { + font-size: 12px; +} +.fc table thead tr.fc-first th, .fc table thead tr.fc-first th.fc-agenda-axis { + height:26px !important; + vertical-align:middle; +} +.fc-agenda-axis input.input_select { + height:22px !important; + font-size:11px; +} +.fc-header-title h2 { + font-size: 18px; + font-weight: normal; + margin-top:2px; +} +.fc-event-vert .fc-event-time { + font-size: 11px; +} +.fc-event-time, .fc-event-title { + font-size: 11px; + padding: 0 2px; +} + +/*.fc-event { + overflow:hidden; +}*/ diff --git a/public/css/images/icon_alert_ffffff.png b/public/css/images/icon_alert_ffffff.png new file mode 100644 index 0000000000000000000000000000000000000000..35d3d1b642eeccfc5227cbf4d1c72ea5ae48a73b GIT binary patch literal 1014 zcmaJ=J#5oJ7z%NW`(PiD~RJ_LaDq zs&1f4UAqATNGu33bSML`!OX@43`k5!NGzyQIHyUgTnG+eB|;7 zMN#qml3FD57#X9dhROe?*SJHbOIR!86|{z%h7YN%g{lzb9is+|(6Bb|eSjH?8Ul8y zjLZ5h*+dRwL>MM?Ji?}^%xvfx<~qcn3Tw8j&_7%48iKvoz>H@VY`DnJViAkV8HMDTYg!+$0Ak zd4^Alk|f;#0>^VKC$PMb;3YXJ$Q%c{A5Eh9)|y;Y7rL>?PNC}|CRq>_^BDPdb9cwbpS*i` zWq;@8oO-bqJ9oPLHM3FNv(BTdmg>Sytb^qn6GUA E0X^A1#{d8T literal 0 HcmV?d00001 diff --git a/public/css/playlist_builder.css b/public/css/playlist_builder.css index bd0ecc44f..4724055e9 100644 --- a/public/css/playlist_builder.css +++ b/public/css/playlist_builder.css @@ -78,6 +78,7 @@ .spl_artist { font-size:12px; + color:#d5d5d5; } /*#spl_editor { @@ -108,10 +109,10 @@ } #side_playlist h3 { - font-size:17px; + font-size:20px; margin:9px 0 3px 0; padding:0; - color:#1c1c1c; + color:#444444; font-weight:normal; clear:both; float:left; @@ -120,7 +121,7 @@ font-size:15px; margin:8px 0 10px 0; padding:0; - color:#1c1c1c; + color:#6e6e6e; font-weight:normal; clear:both; float:left; diff --git a/public/css/plupload.queue.css b/public/css/plupload.queue.css index 75489a419..e54912b37 100644 --- a/public/css/plupload.queue.css +++ b/public/css/plupload.queue.css @@ -107,7 +107,7 @@ } .plupload_file_size, .plupload_file_status, .plupload_file_action {text-align: right;} -.plupload_filelist .plupload_file_name {width: 205px} +.plupload_filelist .plupload_file_name {width: 68%;} .plupload_file_action { float: right; diff --git a/public/css/styles.css b/public/css/styles.css index a500fdc26..c204c11b0 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -899,6 +899,7 @@ div.ui-datepicker { } #show_time_info { font-size:12px; + height:30px; } #show_time_info > div, #show_time_info > span{ @@ -1595,6 +1596,19 @@ dd.radio-inline-list, .preferences dd.radio-inline-list { height: 120px; } +#show_time_info { + font-size:12px; + height:30px; +} +#show_time_warning { + background:#c83f3f url(images/icon_alert_ffffff.png) no-repeat 5px 4px; + border:1px solid #9d1010; + color:#fff; + padding: 2px 5px 2px 24px; + font-size: 12px; + line-height: 140%; +} + /* HACK, to be removed after 1.7.0 */ button.ui-button.md-cancel { padding: .4em 1em;