From d02e0dff9db736ff1c740c2327b75da5714c2a66 Mon Sep 17 00:00:00 2001 From: Milan Date: Sat, 13 Mar 2021 18:05:39 +0100 Subject: [PATCH] minor changes in the appearance --- website/agenda/planung/css/calendar.css | 5 ++- website/agenda/planung/css/default.css | 24 +++++----- website/agenda/planung/css/event.css | 37 ++++++++++----- website/agenda/planung/css/series.css | 45 +++++++------------ .../agenda/planung/css/studio-timeslots.css | 5 ++- website/agenda/planung/css/studios.css | 2 +- website/agenda/planung/event.cgi | 2 +- website/agenda/planung/js/studio-timeslots.js | 2 +- website/agenda/planung/studio-timeslots.cgi | 4 +- .../agenda/planung/templates/edit-event.html | 4 +- .../agenda/planung/templates/projects.html | 2 +- website/agenda/planung/templates/users.html | 8 ---- 12 files changed, 68 insertions(+), 72 deletions(-) diff --git a/website/agenda/planung/css/calendar.css b/website/agenda/planung/css/calendar.css index 1abf587..7e74005 100644 --- a/website/agenda/planung/css/calendar.css +++ b/website/agenda/planung/css/calendar.css @@ -89,12 +89,12 @@ button:hover { #calendar div.schedule div.text, #calendar div.event div.text { - positions: absolute; top: 0; left: 0; padding-left: 0; padding-top: 0; padding-bottom: 0; + padding:0.5rem; } #calendar div.event div.icons { @@ -143,7 +143,7 @@ button:hover { padding: 0; min-width: 1px; height: 100%; - background: repeating-linear-gradient(to right, #fff, #fff 1px, #999 1px, #999 2px); + background: #ccc; } #calendar td.week div { @@ -256,6 +256,7 @@ input.tablesorter-filter { #event_list tr td.start_date { white-space: nowrap; font-family: monospace; + word-spacing:-0.2rem; } #event_list tr .start_date { diff --git a/website/agenda/planung/css/default.css b/website/agenda/planung/css/default.css index 6f1dae0..1618900 100644 --- a/website/agenda/planung/css/default.css +++ b/website/agenda/planung/css/default.css @@ -17,7 +17,7 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 400; - src: url('../fonts/open-sans-v15-latin_latin-ext-regular.eot'); /* IE9 Compat Modes */ + src: url('../fonts/open-sans-v15-latin_latin-ext-regular.eot'); /* IE9 Compat Modes */ src: local('Open Sans Regular'), local('OpenSans-Regular'), url('../fonts/open-sans-v15-latin_latin-ext-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/open-sans-v15-latin_latin-ext-regular.woff2') format('woff2'), /* Super Modern Browsers */ @@ -57,8 +57,8 @@ body { body #content { color: #000; text-align: left; - min-width: 500px; - max-width: 1200px; + min-width: 480px; + max-width: 960px; margin-left: auto; margin-right: auto; } @@ -103,6 +103,7 @@ body, #content textarea { padding: 6px; border: 1px solid #ccc; + box-sizing:border-box; } @media handheld { @@ -324,18 +325,12 @@ table { border: 0; padding: 2em; color: #000; - background: #eee; } .error.head { position: relative; top: 3em; -} - -#content h1, -#content h2 { - margin: 1em; - font-weight: 100; + padding:0; } #jobs th { @@ -355,6 +350,10 @@ table { color: green; } +#content ul.error{ + padding:0; +} + #content div.ok, #content div.warn, #content div.error { @@ -572,7 +571,6 @@ table.tablesorter tr { border: none; border-bottom: solid 1px #9e9e9e; cursor: pointer; - margin-left: 0.5rem; } #content select, @@ -596,6 +594,10 @@ input[type='checkbox'] { min-width: 32px; } +#content img{ + border-radius: 0.3rem; +} + #content button.selectImage, #content button.selectImage img { width: 32px; diff --git a/website/agenda/planung/css/event.css b/website/agenda/planung/css/event.css index 2b3d0bf..1d0118c 100644 --- a/website/agenda/planung/css/event.css +++ b/website/agenda/planung/css/event.css @@ -7,12 +7,17 @@ pre { } #content div.editor td { - width: 800px; - padding-left: 0; + width: 100%; } #content div.editor td.label { - width: 11em; + width:6rem; + color:#666; +} + +#content div.editor span.label { + width: 6rem; + color:#666; } #content .editor img { @@ -31,28 +36,40 @@ pre { #content .excerpt { width: 100%; - max-width: 40rem; - height: 3em; + height: 3rem; } #content textarea { width: 100%; - max-width: 40rem; } #content .edit_event input.url { width: 100%; - max-width: 40rem; } .date { - width: 10em; + width: 9rem; } .time { - width: 6em; + width: 5rem; } .episode { - width: 3em; + width: 3rem; } + +div#edit_new form, +div#edit_new table{ + width:480px; +} + +#content table.edit_event{ + background:white; +} + +#content table.edit_event td{ + padding-left:1rem; + padding-right:1rem; +} + diff --git a/website/agenda/planung/css/series.css b/website/agenda/planung/css/series.css index 55cdf98..945c12a 100644 --- a/website/agenda/planung/css/series.css +++ b/website/agenda/planung/css/series.css @@ -1,10 +1,13 @@ #content { margin-top: 3em; padding: 1em; - /*max-width:1000px;*/ min-height: 100%; } +#content table.td{ + padding:0; +} + #content td.label { max-width: 3em; } @@ -31,7 +34,13 @@ } #content .editor { + padding:0.5rem; clear: both; + background:white; +} + +#content .editor td{ + padding:0; } #content .editor div.buttons { @@ -43,13 +52,6 @@ margin-left: 1em; } -/* -#content .editor input, -#content .editor textarea, -#content .editor button{ - padding:6px; -} -*/ #imagePreview { border: none; width: 24px; @@ -91,9 +93,10 @@ } #content .editor .cell { - float: left; + display:table-cell; text-align: center; white-space: nowrap; + padding-right:0.5rem; } #content .editor .row.active { @@ -207,11 +210,6 @@ width: 2em; } -/* -#content div.show_schedule tr:nth-child(odd){ - background:#f0f0f0; -} -*/ #content div.show_schedule tr.exclude td { text-decoration: line-through; } @@ -224,6 +222,10 @@ width: 90%; } +div#tabs > div { + background:white; +} + #content #tabs-events td.weekday, #content #tabs-events td.date, #content #tabs-events td.time, @@ -231,25 +233,10 @@ width: 0; } -#content #tabs-events td.weekday, -#content #tabs-events td.spacer { - padding: 0; -} - -#content input.datetimepicker { - padding-left: 0; - padding-right: 0; -} - button { cursor: pointer; } -form { - padding: 0; - margin: 0; -} - @media print { input, button { display: none; diff --git a/website/agenda/planung/css/studio-timeslots.css b/website/agenda/planung/css/studio-timeslots.css index 9f9b0cf..93fe428 100644 --- a/website/agenda/planung/css/studio-timeslots.css +++ b/website/agenda/planung/css/studio-timeslots.css @@ -1,7 +1,7 @@ #content { margin-top: 3em; padding: 1em; - max-width: 1000px; + max-width: 960px; min-height: 100%; } @@ -46,7 +46,8 @@ } #content .editor .cell { - float: left; + display: table-cell ; + vertical-align:baseline; text-align: center; } diff --git a/website/agenda/planung/css/studios.css b/website/agenda/planung/css/studios.css index be30a55..066f09e 100644 --- a/website/agenda/planung/css/studios.css +++ b/website/agenda/planung/css/studios.css @@ -6,7 +6,7 @@ } #content div.studio { - min-width: 40%; + width: 45%; } #content div.editor { diff --git a/website/agenda/planung/event.cgi b/website/agenda/planung/event.cgi index 1fe9bd9..5ecbbb3 100755 --- a/website/agenda/planung/event.cgi +++ b/website/agenda/planung/event.cgi @@ -802,7 +802,7 @@ sub download { print `$cmd`; $request->{params}->{checked}->{download} = '' - . qq{} + . qq{} . q{Download: } . $event->{start_date_name} . ", " . $event->{start_time_name} . " - " diff --git a/website/agenda/planung/js/studio-timeslots.js b/website/agenda/planung/js/studio-timeslots.js index 4797399..2ce10cf 100644 --- a/website/agenda/planung/js/studio-timeslots.js +++ b/website/agenda/planung/js/studio-timeslots.js @@ -70,7 +70,7 @@ $(document).ready( setTabs('#tabs'); - initTextWidth(); + initTextWidth(); setTextWidth('.datetimepicker.start', 130); setTextWidth('.datetimepicker.end', 130); diff --git a/website/agenda/planung/studio-timeslots.cgi b/website/agenda/planung/studio-timeslots.cgi index 2712216..4e6b351 100755 --- a/website/agenda/planung/studio-timeslots.cgi +++ b/website/agenda/planung/studio-timeslots.cgi @@ -72,9 +72,7 @@ if ( $action eq 'show_dates' ) { } else { print q{ - - - + diff --git a/website/agenda/planung/templates/edit-event.html b/website/agenda/planung/templates/edit-event.html index bc9744d..3c2c282 100644 --- a/website/agenda/planung/templates/edit-event.html +++ b/website/agenda/planung/templates/edit-event.html @@ -47,11 +47,9 @@ $( "#edit_event textarea" ).prop( "disabled", true ); $( "#edit_event select" ).prop( "disabled", true ); - } ); - @@ -521,7 +519,7 @@ - > diff --git a/website/agenda/planung/templates/projects.html b/website/agenda/planung/templates/projects.html index deb5897..4ce56fe 100644 --- a/website/agenda/planung/templates/projects.html +++ b/website/agenda/planung/templates/projects.html @@ -23,7 +23,7 @@ - + diff --git a/website/agenda/planung/templates/users.html b/website/agenda/planung/templates/users.html index f06f527..d995a54 100644 --- a/website/agenda/planung/templates/users.html +++ b/website/agenda/planung/templates/users.html @@ -7,14 +7,6 @@ color:#555; } -#content div.user{ - border:1px solid gray; - border-radius:1em; - margin:1em; - width:30em; - float:left; -} - #content .disabled{ color:#999; }