diff --git a/mainstyle.css b/mainstyle.css index cef4f30..946044e 100644 --- a/mainstyle.css +++ b/mainstyle.css @@ -60,7 +60,7 @@ A:hover {color:#001c7b; height:125px; width:125px} #titlewrap {position:relative; - top:-120px; + top:-80px; text-align:left; margin-left:25ex; margin-right:4ex; @@ -73,7 +73,7 @@ A:hover {color:#001c7b; } #title {position:relative; z-index:6; - top:15px; + top:-0.5em; } #sidebar {background-color:#1f4ca4; width:170px; @@ -91,6 +91,7 @@ A:hover {color:#001c7b; background-repeat:repeat-x; background-position:bottom left; } +#navblock {display:block} .navhead {font-size:larger; font-weight:bold; font-style:italic; @@ -162,3 +163,28 @@ A:hover {color:#001c7b; vertical-align:top} .patchtable {width:100%;} /*.patchtable TR TD:last-child {width:50%;}*/ + + +/*For mobile and other very small screens*/ +@media screen and (max-width: 799px) { + BODY {background:white} + #intermediate {margin-left:10px} + #sidetext {top:0px;width:100%;display:flex;flex-wrap:wrap} + #sidebar {position:relative;width:100%;} + H1 {font-size: calc(100vw / 22);} + #titlenotif {left:195px;width:220px} + #titlewrap {margin-left: 170px;} + #navblock {display:inline;margin-right:10px;} +} +@media screen and (max-width: 520px) { + #navblock {display:block} + #sidetext {display:grid} + H1 {font-size: calc(100vw / 20);} +} +@media screen and (max-width: 424px) { + .snap {height:112px;width:183px} + #introsnap {left:-90px} + #logo {height:62px;width:62px;top:50px} + #titlewrap {margin-left: 12ex;top:-20px} + #titlenotif {left:16px;} +} diff --git a/news.php b/news.php index ef25704..e55cff2 100644 --- a/news.php +++ b/news.php @@ -4,8 +4,7 @@ // Authors: Elizabeth Liddell, Timothy Pearson, and Calvin Morrison include("globals.php"); - include("header.php"); - include("footer.php"); + include("tde-head-and-foot.php"); doHeader("Trinity News", "Main", "News"); include ("media/news-javascript.php"); diff --git a/newsentry.php b/newsentry.php index c4fe2f4..71389ef 100644 --- a/newsentry.php +++ b/newsentry.php @@ -4,8 +4,7 @@ // Authors: Elizabeth Liddell, Timothy Pearson, and Calvin Morrison include("globals.php"); - include("header.php"); - include("footer.php"); + include("tde-head-and-foot.php"); doHeader("Trinity News", "Main", "News"); ?> diff --git a/tde-head-and-foot.php b/tde-head-and-foot.php index e344bf9..559fd9a 100644 --- a/tde-head-and-foot.php +++ b/tde-head-and-foot.php @@ -3,6 +3,144 @@ // All Rights Reserved // Authors: Elizabeth Liddell, Timothy Pearson, and Calvin Morrison - include("header.php"); - include("footer.php"); + $GLOBALS['permnavcat'] = ""; + $GLOBALS['permnavitem'] = ""; + $GLOBALS['maindir'] = ""; + + # Outputs the Trinity page header, sidebar, and prefatory matter. $pageTitle is the title of the + # page as it will appear in both the top banner and the browser's title bar, and $navCategory + # and $navItem point at the sidebar navigation item that are to be highlighted for this page. + # If the string "_" is passed for $navItem, the top-level navigation category will be highlighted. + # $maindir is the path to the top level site directory. By default, it is empty. + + function doHeader($pageTitle, $navCategory, $navItem, $maindir = "/") { + header('Content-Type: text/html; charset=utf-8'); + + echo ""; + echo "\n"; + echo "\n"; + echo " $pageTitle\n"; + echo " \n"; + if ($navItem == "Screenshots") { + echo " \n"; + echo " \n"; + } + echo " \n"; + echo "\n"; +?> + +
+ \n"; + } + + $GLOBALS['permnavcat'] = $navCategory; + $GLOBALS['permnavitem'] = $navItem; + $GLOBALS['maindir'] = $maindir; +?> +
+ +
+
+ + array("_" => $GLOBALS['maindir'] . "index.php", + "News" => $GLOBALS['maindir'] . "news.php", + "About" => $GLOBALS['maindir'] . "about.php", + "Features" => $GLOBALS['maindir'] . "features.php", + "Screenshots" => $GLOBALS['maindir'] . "screenshots.php", + "Get Involved" => $GLOBALS['maindir'] . "helpwanted.php", + "Donations" => $GLOBALS['maindir'] . "donate.php", + ), + "Get Trinity" => array("_" => $GLOBALS['maindir'] . "releases.php", + "Packages" => $GLOBALS['maindir'] . "releases.php", + "LiveCDs" => "https://wiki.trinitydesktop.org/LiveCDs", + ), + "Documentation" => array("_" => $GLOBALS['maindir'] . "docs/index.php", + "Wiki" => "https://wiki.trinitydesktop.org/", + "Installation" => "https://wiki.trinitydesktop.org/Category:Documentation#Installing_from_a_Package_Manager", + "Applications" => $GLOBALS['maindir'] . "applications.php", + "FAQ" => $GLOBALS['maindir'] . "faq/index.php", + ), + "Support" => array("_" => $GLOBALS['maindir'] . "support.php", + "Bugs" => "https://bugs.trinitydesktop.org/buglist.cgi?quicksearch=ALL", + "Mailing Lists" => $GLOBALS['maindir'] . "mailinglist.php", + "Service Alerts" => $GLOBALS['maindir'] . "servicealerts/", + "Contact" => $GLOBALS['maindir'] . "support.php", + ), + "Development" => array("_" => $GLOBALS['maindir'] . "development.php", + "GIT" => "http://mirror.git.trinitydesktop.org/cgit/", + "Translations" => "https://mirror.git.trinitydesktop.org/weblate", + "Commit History" => $GLOBALS['maindir'] . "patches", + "Resources" => $GLOBALS['maindir'] . "devresources.php", + + ), + ); + + + echo(' '."\n"); + date_default_timezone_set('UTC'); #else the interpreter whines + echo(' '."\n"); + +?> +
+
+ + +
+
+ +
+ + + +