diff --git a/common.inc.php b/common.inc.php index 0a309b8d..f90b98ec 100644 --- a/common.inc.php +++ b/common.inc.php @@ -372,10 +372,9 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated = echo i18n($config['fairname']); ?> - - + + - @@ -389,6 +388,7 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated = + @@ -601,9 +601,9 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated = if ($icon && theme_icon($icon)) { echo ''; echo theme_icon($icon); - echo ''; + echo ''; } else - echo ''; + echo ''; if ($title && !$titletranslated) echo '

' . i18n($title) . '

'; @@ -686,8 +686,8 @@ function send_popup_header($title = '') <?= i18n($title) ?> - - + + @@ -699,6 +699,7 @@ function send_popup_header($title = '') +
rowCount()) { echo '
'; echo "
\n"; echo "\n"; - echo "\n"; + echo "
\n"; $num = 1; while ($r = $q->fetch(PDO::FETCH_OBJ)) { $trclass = ($num % 2 == 0 ? 'odd' : 'even'); diff --git a/theme/classic/sfiab.css b/theme/classic/style.css similarity index 100% rename from theme/classic/sfiab.css rename to theme/classic/style.css diff --git a/theme/science_ation/sfiab.css b/theme/science_ation/style.css similarity index 81% rename from theme/science_ation/sfiab.css rename to theme/science_ation/style.css index 9bbba97d..0280d28a 100644 --- a/theme/science_ation/sfiab.css +++ b/theme/science_ation/style.css @@ -1,32 +1,44 @@ -html{ - overflow-x:hidden; +html { + overflow-x: hidden; } -body -{ - +body { font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-size: small; margin: 0; padding: 0; background: #E0E0FF; background: #e0e0ff; - overflow-x:hidden; - height:100%; - + overflow-x: hidden; + height: 100%; } -input, textarea, select -{ +input, +textarea, +select { font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-size: small; } -table{ - overflow-x:scroll; +table { + width: 100%; + overflow: scroll; + display:block; } +#main-content { + width: 100%; +} +#page-title { + vertical-align: bottom; +} + +.tableview { + border-collapse: collapse; + border-spacing: 1px; + color: black; +} td { vertical-align: top; @@ -46,7 +58,7 @@ table tr.odd { height: 50px; text-align: center; - + background: #ffffff; padding: 10px; } @@ -55,7 +67,7 @@ table tr.odd { #footer { width: 100%; text-align: center; - background-color : #5C6F90; + background-color: #5C6F90; font-size: 0.8em; } @@ -72,29 +84,22 @@ table tr.odd { padding: 5px; font-size: 1.0em; box-shadow: 2px 2px 2px black; + border-radius: 0.5rem; } #main { - - - background:#f1eeff; - padding: 3px; - border: 2px solid Silver; + background: #f1eeff; + padding: 10px; min-height: 600px; - width: 99%; - + border-radius: 0 0 0.5rem 0.5rem; } #mainwhere { - margin-right: 10px; - background: #EEEEFF; - padding: 3px; - border-top: 2px solid Silver; - border-left: 2px solid Silver; - border-right: 2px solid Silver; - font-size: 0.85em; - width: 99%; + background: #EEEEFF; + padding: 0.5rem; + border-radius: 0.5rem 0.5rem 0 0; + font-size: 1em; } @@ -108,19 +113,22 @@ h1 { font-weight: bold; margin-top: 0; margin-bottom: 0; -} +} + h2 { font-size: 1.6em; font-weight: bold; margin-top: 0; margin-bottom: .3em; } + h3 { font-size: 1.4em; font-weight: bold; margin-top: 0; margin-bottom: .2em; } + h4 { font-size: 1.2em; font-weight: bold; @@ -129,35 +137,35 @@ h4 { } ul.mainnav { - list-style : none; - margin : 0; - padding : 0; - background-color : #d6d6d6; + list-style: none; + margin: 0; + padding: 0; + background-color: #d6d6d6; width: 165px; } ul.mainnav li { - display : block; - border-top : 1px solid #a5b5c6; + display: block; + border-top: 1px solid #a5b5c6; } ul.mainnav li a { - display : block; - margin : 0; - padding : 6px; - + display: block; + margin: 0; + padding: 6px; + background-color: #e0e0ff; - font : bold 0.9em/1.5em Arial, sans-serif; - + font: bold 0.9em/1.5em Arial, sans-serif; + color: black; - text-decoration : none; + text-decoration: none; } ul.mainnav li a:hover { - + background-color: white; - - color:black; + + color: black; text-decoration: none; } @@ -187,7 +195,7 @@ a:hover { padding: 0px; margin-left: 30px; margin-right: 30px; - + } .summarytable th { @@ -200,7 +208,7 @@ a:hover { font-weight: bold; } -.summarytable th a{ +.summarytable th a { font-size: 1.0em; color: white; font-weight: bold; @@ -235,7 +243,7 @@ a:hover { .notice { font-weight: bold; border: 1px solid Silver; -/*background: #E0E0FF; */ + /*background: #E0E0FF; */ background: #FFFFE0; font-size: 1em; } @@ -278,6 +286,15 @@ tr.externalaward { color: #0000AA; } +.safety_questions tr { + width: 20px; + overflow: scroll; +} + +.safety_questions>* { + font-size: 1.5em; +} + .adminconfigtable td { text-align: center; @@ -314,7 +331,7 @@ tr.externalaward { margin-left: 30px; margin-right: 30px; font-size: 0.8em; - + } .fundraisingtable th { @@ -328,7 +345,7 @@ tr.externalaward { text-align: left; } -.fundraisingtable th a{ +.fundraisingtable th a { color: white; font-weight: normal; } @@ -371,7 +388,7 @@ div.notice_area div.error { } div.notice_area div.happy { -/* border: 2px solid white; + /* border: 2px solid white; color: green; background-color: #99FF99;*/ color: white; @@ -379,7 +396,7 @@ div.notice_area div.happy { } .date { - width: 80px; + width: 80px; } @@ -401,8 +418,8 @@ div.notice_area div.happy { /* Override the titlebar padding, it's too big, make the font * a happy size */ -.ui-dialog .ui-dialog-titlebar { - padding: 0.2em 0.5em 0.2em .5em ; +.ui-dialog .ui-dialog-titlebar { + padding: 0.2em 0.5em 0.2em .5em; font-size: 1.2em; font-weight: bold; text-align: center; @@ -441,7 +458,7 @@ div.ui-tabs ul.ui-tabs-nav { } .ui-datepicker { - z-index: 1003; + z-index: 1003; } .text-link { @@ -464,20 +481,21 @@ div.ui-tabs ul.ui-tabs-nav { color: #c0c0c0; } -.tablesorter-headerRow{ - background:black; +.tablesorter-headerRow { + background: black; } -#registration_list{ - background:black; +#registration_list { + background: black; } -#menu-toggle-button{ + +#menu-toggle-button { display: none; } -#sidebar.active{ +#sidebar.active { display: block; position: fixed; top: 20%; @@ -485,11 +503,11 @@ div.ui-tabs ul.ui-tabs-nav { z-index: 100; } -#sidebar.active ~ #main-content{ - opacity: 0.7; +#sidebar.active~#main-content { + opacity: 0.5; } -#menu-toggle-button:hover{ +#menu-toggle-button:hover { cursor: pointer; } @@ -510,39 +528,39 @@ div.ui-tabs ul.ui-tabs-nav { display: block; height: 25px; width: 25px; - + } - .user-info-table td{ + .user-info-table td { display: block; } - .adminconfigtable tr{ + .adminconfigtable tr { display: grid; grid-template-columns: 1fr 1fr 1fr; } - + } -.thematic-break{ +.thematic-break { display: none; } -@media screen and (max-width: 410px){ +@media screen and (max-width: 410px) { - .adminconfigtable{ + .adminconfigtable { margin: auto; } - - .adminconfigtable tr{ + + .adminconfigtable tr { display: grid; grid-template-columns: 1fr 1fr; } - adminconfigtable - .thematic-break{ + + adminconfigtable .thematic-break { display: block; } -} +} \ No newline at end of file diff --git a/tableeditor.css b/theme/science_ation/tableeditor.css similarity index 96% rename from tableeditor.css rename to theme/science_ation/tableeditor.css index ae58a931..2087ef8e 100644 --- a/tableeditor.css +++ b/theme/science_ation/tableeditor.css @@ -22,11 +22,6 @@ input { border-collapse: collapse; border-spacing: 1px; color: black; - margin-left: 20px; - margin-right: 20px; - border: 0px; - font-size: 0.8em; - ; } .tableview td {