From: Dave Page Date: Wed, 24 Jun 2020 15:19:04 +0000 (+0100) Subject: Update the website to the new project design. X-Git-Url: http://git.postgresql.org/gitweb/edit?a=commitdiff_plain;h=4f7c57c2722764a98c564f60127f8e6f8d4db46a;p=pgcac-website.git Update the website to the new project design. --- diff --git a/static/css/base.css b/static/css/base.css deleted file mode 100644 index 66eec85..0000000 --- a/static/css/base.css +++ /dev/null @@ -1,7 +0,0 @@ -@import url("global.css"); -@import url("layout.css"); -@import url("text.css"); -@import url("navigation.css"); -@import url("table.css"); - -@import url("iefixes.css"); diff --git a/static/css/geckofixes.css b/static/css/geckofixes.css deleted file mode 100644 index 96313fc..0000000 --- a/static/css/geckofixes.css +++ /dev/null @@ -1,21 +0,0 @@ -/* Gecko is broken with pre,tt,code sizes */ - -#pgContainer code, #pgContainer pre, #pgContainer tt { - font-size: 1.2em; -} - -#docContainer tt, #docContainer pre, #docContainer code { - font-size: 1.4em; -} - -#docContainer tt tt, #docContainer tt code, #docContainer tt pre { - font-size: 1.0em; -} - -#docContainer pre code, #docContainer pre tt, #docContainer pre pre { - font-size: 1.0em; -} - -#docContainer code code, #docContainer code tt, #docContainer code pre { - font-size: 1.0em; -} diff --git a/static/css/global.css b/static/css/global.css deleted file mode 100644 index 16ec0ac..0000000 --- a/static/css/global.css +++ /dev/null @@ -1,80 +0,0 @@ -/* - PostgreSQL.org - Global Styles -*/ - -body { - margin: 0; - padding: 0; - font-family: verdana, sans-serif; - font-size: 69%; - color: #000; - background-color: #fff; -} - -h1 { - font-size: 1.4em; - font-weight: bold; - margin-top: 0em; - margin-bottom: 0em; -} - -h2 { - font-size: 1.2em; - margin: 1.2em 0em 1.2em 0em; - font-weight: bold; -} - -h3 { - font-size: 1.0em; - margin: 1.2em 0em 1.2em 0em; - font-weight: bold; -} - -h4 { - font-size: 0.95em; - margin: 1.2em 0em 1.2em 0em; - font-weight: normal; -} - -h5 { - font-size: 0.9em; - margin: 1.2em 0em 1.2em 0em; - font-weight: normal; -} - -h6 { - font-size: 0.85em; - margin: 1.2em 0em 1.2em 0em; - font-weight: normal; -} - -img { - border: 0; -} - -ol, ul, li {/* - list-style: none;*/ - font-size: 1.0em; - line-height: 1.2em; - margin-top: 0.2em; - margin-bottom: 0.1em; -} - -p { - font-size: 1.0em; - line-height: 1.2em; - margin: 1.2em 0em 1.2em 0em; -} - -li > p { - margin-top: 0.2em; -} - -pre { - font-family: monospace; - font-size: 1.0em; -} - -strong, b { - font-weight: bold; -} diff --git a/static/css/iefixes.css b/static/css/iefixes.css deleted file mode 100644 index 8601bc1..0000000 --- a/static/css/iefixes.css +++ /dev/null @@ -1,138 +0,0 @@ -/* - PostgreSQL.org - Fixes for Internet Explorer -*/ - -/*Win IE fix \*/ -* html #pgHeaderContainer { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgHeader { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgTopNav { height: 1%; margin-top: 0px; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgTopNavLeft { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgTopNavRight { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgTopNavList { height: 1%; margin-bottom: -2px; } -* html #pgTopNavList li { margin: 0 0.5em 0 -0.5em; } - -/*End Win IE fix*/ - - -/*Win IE fix \*/ -* html #pgSearchNavList { height: 1%; margin-right: 0.5em; } -* html #pgSearchNavList li { margin: 0 0 0 0.5em; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgContent { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontContainer { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontMain { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontFeature { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontFeatureLink { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontNewsEventsContainer { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontNews { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontEvents { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html .pgNewsEventsList { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontUSSContainer { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontUser { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontSupportUs { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontShortcuts { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontShortcutsWrap { height: 1%; margin-top: 7px; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontShortcutsList { height: 1%; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgFrontNewsEventsContainer h3 img { height: 1%; margin-bottom: 4px; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgSideWrap { /* margin-top: 11px; */ } -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgContentWrap {margin-left: 165px; /* margin-top: 11px; */ } -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #pgSideNav { height: 1%; position: static; } - -/*End Win IE fix*/ - -/*Win IE fix \*/ -* html #txtArchives pre { font-size: 100%; } -/*End Win IE fix*/ diff --git a/static/css/layout.css b/static/css/layout.css deleted file mode 100644 index 545b380..0000000 --- a/static/css/layout.css +++ /dev/null @@ -1,296 +0,0 @@ -/* - PostgreSQL.org - Layout Styles -*/ - -/* Container Definitions */ - -/* Page Container */ - -#pgContainerWrap { - text-align: center; /* Win IE5 */ -} - -#pgContainer { - margin: 0em auto; - width: 765px; - padding: 0; - padding-top: 4px; - padding-bottom: 10px; - text-align: left; /* Win IE5 */ -} - - -/* Header Container */ -#pgHeaderContainer { - padding-bottom: 2px; -} - -#pgHeader { - position: relative; - background: url("/static/img/layout/hdr_fill.png") repeat-x; - height: 80px; - margin: 0; - padding: 0; - clear: both; -} - -#pgHeaderLogoLeft { - position: relative; - width: 230px; - height: 80px; - border: 0px; - padding: 0px; - margin: 0px; - float: left; -} - -#pgHeaderLogoLeft img { - border: 0px; -} - -#pgHeaderLogoRight { - position: relative; - width: 210px; - height: 80px; - border: 0px; - padding: 0px; - margin: 0px; - float: right; -} - -#pgHeaderLogoRight img { - border: 0px; -} - -#pgSearch { - position: relative; - text-align: right; - padding: 0; - margin: 0; - color: #666; -} - -#pgSearch form { - position: relative; - top: 5px; - right: 0; - margin: 0; /* need for IE Mac */ - text-align: right; /* need for IE Mac */ - white-space: nowrap; /* for Opera */ -} - -#pgSearch form label { - color: #666; - font-size: 0.8em; -} - -#pgSearch form input { - font-size: 0.8em; -} - -#pgSearch form #submit { - font-size: 0.8em; - background: #FFFFFF; - color: #000000; - border-right: 1px solid #7A7A7A; - border-bottom: 1px solid #7A7A7A; - border-top: 1px solid #7A7A7A; - border-left: 1px solid #7A7A7A; - padding: 1px 4px; -} - -#pgSearch form #q { - font-size: 0.8em; - width: 140px; - border: 1px solid #7A7A7A; - background: #FFFFFF; - color: #000000; - padding: 2px; -} - -/* Content Container */ -#pgContent { - clear: both; - display: block; -} - -/* Front page specific */ -#pgFrontRight { - float: right; - width: 200px; - padding-left: 15px; - border-left: 1px solid #7A7A7A; - margin-top: 10px; -} - -#pgFrontLeft { - margin-right: 230px; - margin-top: 10px; -} - -#pgFrontLeft h1 { - font-size: 1.8em; -} - -.pgFrontBox { - margin-bottom: 25px; -} - -.pgFrontBox p { - margin-top: 0.2em; -} - -#pgFrontNews h1 { - margin-bottom: 0px; -} - -.pgFrontNewsItem h3 { - margin: 0px 0px; -} - -.pgFrontNewsItem h2 { - margin-bottom: 0.2em; - margin-top: 0.2em; - font-size: 1.5em; -} - -/* Uncomment when IE/Validator supports last-child - -.pgRSSBottomList li:last-child { - border-right: 0; - padding-right: 0; -} - -*/ - -/* Secondary Pages */ - -#pgSideWrap { - float: left; - width: 166px; - margin-top: 10px; - margin-right: -165px; -} - -#pgContentWrap { - margin-left: 165px; - padding-top: 10px; -} - -#pgAdminWrap { - padding-top: 10px; - padding-bottom: 10px; -} - -#pgCommunityWrap { - margin-right: -420px; - float: left; - width: 100%; -} - -#pgCommunity { - margin-right: 210px; -} - -/* Footer Container */ -#pgFooter { - font-size: 0.9em; - color: #666; - line-height: 1.3em; - padding-top: 5px; - clear: both; -} - -/* Misc Classes */ - -.pgClearBoth { - clear: both; - margin: 0; - padding: 0; -} - -.pgBlockHide { - display: none; - height: 0; - width: 0; - overflow: hidden; - position: absolute; /* IE5 Mac */ -} - -img { - border: 0; -} - -/* Registration pages */ -#feedback_table tr td ul li { - display: inline; -} - -#feedback_table tr { - vertical-align: top; -} - -div.feedbackRow { - vertical-align: top; - clear: both; -} -div.feedbackRow div { - float: left; - vertical-align: top; - margin-bottom: 10px; -} -div.feedbackRow div.feedbackRowHead { - width: 250px; - font-weight: bold; -} -div.feedbackRow div.feedbackRowField ul li { - display: inline; -} - -ul.errorlist { - display: inline; - list-style-type: none; -} - -ul.errorlist li { - display: inline; - font-weight: bolder !important; - color: red; -} - - -/* Elections */ -div.electionResultRow { - padding: 2px 2px 2px 2px; -} -div.electionHeaderRow { - font-weight: bold; - text-decoration: underline; - padding: 2px 2px 2px 2px; -} -div.electionResultCol1 { - display: inline-block; - width: 150px; -} -div.electionResultCol2 { - display: inline-block; - width: 50px; - text-align: right; -} -div.electionResultCol3 { - display: inline-block; - background-color: #0091c1; -} -div.electionResultCol3Hdr { - display: inline-block; - width: 300px; -} -div.electionSeparator { - display: inline-block; - background-color: red; - height: 2px; - width: 510px; -} -tr.electionError { - background-color: #ffb6b6; -} diff --git a/static/css/navigation.css b/static/css/navigation.css deleted file mode 100644 index c2f803f..0000000 --- a/static/css/navigation.css +++ /dev/null @@ -1,237 +0,0 @@ -/* - PostgreSQL.org - Navigation (and List) Styles -*/ - -/* Site Navigation */ - -#pgTopNav { - text-align: left; - color: #666; - font-size: 0.9em; - margin: 0; - padding: 0; - height: 23px; - background: #B7B7B7 url("/static/img/layout/nav_fill.png") top left repeat-x; - overflow: visible; - margin-top: 2px; -} - -#pgTopNavLeft { - width: 7px; - height: 23px; - border: 0px; - padding-right: 10px; - margin: 0px; - float: left; -} - -#pgTopNavLeft img { - border: 0px; - margin: 0; - padding: 0; -} - -#pgTopNavRight { - width: 7px; - height: 23px; - border: 0px; - padding: 0px; - margin: 0px; - float: right; -} - -#pgTopNavRight img { - border: 0px; - margin: 0; - padding: 0; -} - -#pgTopNavList { - list-style: none; - margin: 0; - padding: 0; - - height: 23px; - padding-top: 5px; -} - -#pgTopNavList li { - padding: 0 1em 0 1.2em; - display: inline; - border-left: 1px solid #C8C8C8; -} - -#pgTopNavList li a { - color: #fff; - font-weight: bold; - text-decoration: none; -} - -#pgTopNavList li:first-child { - border-left: 0; - padding-left: 0; -} - -#pgLoginLink { - margin: 0; - padding: 0; -} -#pgLoginlink a { - float: right; - color: #fff; - font-weight: bold; - text-decoration: none; - padding: 5px 1em 0 1.2em; - margin: 0; - height: 23px; -} - -/* The search navigation is the list of links next to the search box. */ - -#pgSearchNav { - position: relative; - float: right; - text-align: right; - color: #666; - font-size: 0.9em; - margin: 0px 0px 0px 0px; - top: -11px; - right: 209px; - padding: 0; -} - -#pgSearchNavList { - list-style: none; - margin: 0; - padding: 0; -} - -#pgSearchNavList li { - padding: 0 0.5em 0 0.5em; - display: inline; - border-right: 1px solid #C8C8C8; -} - -#pgSearchNavList li a { - color: #666; - text-decoration: none; -} - -#pgSearchNavList li a:hover { - color: #000; -} - -/* Category Navigation */ - -#pgSideNav:before { - line-height: 0.1; - font-size: 1px; - margin: 0; - display: block; -} - -#pgSideNav:after { - line-height: 0.1; - font-size: 1px; - margin: 0; - display: block; -} - -#pgSideNav, #pgSideNav ul, #pgSideNav ul ul { - margin: 0; - padding: 0; - list-style: none; - font-size: 1.0em; -} - -#pgSideNav { - width: 150px; - background-color: #F5F5F5; - background-image: url(/static/img/layout/nav_tbl_top.png); - background-position: top right; - background-repeat: no-repeat; -} - -#pgSideNav ul { - background-image: url(/static/img/layout/nav_tbl_btm.png); - background-position: bottom left; - background-repeat: no-repeat; - padding: 10px 0 10px 0; -} - -#pgSideNav ul ul { - background: none; - background-color: #F5F5F5; - margin: 0; - padding: 0; - list-style: none; -} - -#pgSideNav ul ul li { - background: none; - border: none; -} - -#pgSideNav ul li { - border-bottom: 1px solid #EFEFEF; - margin: 0; - padding-left: 12px; - background-image: url(/static/img/layout/blt_gry_arrow.png); - background-repeat: no-repeat; - background-position: 12px 0.65em; -} - -/* Uncomment when IE/Validator supports last-child - -#pgSideNav ul li:last-child { - border-bottom: 1px solid #F5F5F5; -} - -*/ - -#pgSideNav ul li.last-child { - border-bottom: 1px solid #F5F5F5; -} - -#pgSideNav ul li.active { - font-weight: bold; -} - -#pgSideNav ul li.active span { - display: none; -} - -#pgSideNav ul li a { - display: block; - color: #666; - text-decoration: none; - padding: 3px 5px 3px 15px; - margin: 0; -} - -#pgSideNav ul ul li a.active { - font-weight: bold; -} - -/* Uncomment when IE/Validator supports last-child - -#pgSideNav ul ul li:last-child { - border-bottom: none; -} - -*/ - -#pgSideNav ul ul li.last-child { - border-bottom: none; -} - -#pgSideNav ul ul li a { - display: block; - /* padding: 3px 5px 3px 12px; */ - padding-left: 12px; - margin: 0; -} - -#pgSideNav ul li a:hover { - color: #333; -} diff --git a/static/css/pgcac.css b/static/css/pgcac.css new file mode 100644 index 0000000..f4ed196 --- /dev/null +++ b/static/css/pgcac.css @@ -0,0 +1,181 @@ +/** CUSTOM FONTS */ +@import url('https://fonts.googleapis.com/css?family=Open+Sans'); +@import url('https://fonts.googleapis.com/css?family=Maven+Pro'); + +body { + padding-top: 4rem; + + font-family: 'Open Sans', sans-serif; + font-weight: 400; + color: #515151; + font-size: 11.5pt; +} + +h1, h2, h3, h4, h5, h6 { + font-family: 'Maven Pro', sans-serif; + font-weight: 700; + text-transform: uppercase; + color: #515151; + margin-top: 0.5em; +} + +a { + color: #336791; + font-weight: 600; + text-decoration: none; + -moz-transition: color .2s ease-in-out; + -webkit-transition: color .2s ease-in-out; + -ms-transition: color .2s ease-in-out; + transition: color .2s ease-in-out; +} + +.navbar { + box-shadow: 0px 3px 15px rgba(0,0,0,0.2); +} + +.navbar img.logo { + height: 2rem; + margin-left: 0; + margin-bottom: 0; +} + +#footer { + text-align: center; + padding: 5em 0 2em 0; + display: block; +} + +#sidenav { + padding: 1em; +} + +#sidenav h2 { + font-size: 2em; + display: flex; + flex-direction: row; +} + +#sidenav h2:after { + background-color: #e7eae8; + content: '\a0'; + flex-grow: 1; + height: 2px; + position: relative; + margin: .5em 0 .5em .75em; +} + +div.contentwrap h2 { + font-size: 2em; + display: flex; + flex-direction: row; +} +div.contentwrap h2:after { + background-color: #e7eae8; + content: '\a0'; + flex-grow: 1; + height: 2px; + position: relative; + margin: .5em 0 .5em .75em; +} + + +/* Elections */ +div.electionResultRow { + padding: 2px 2px 2px 2px; +} +div.electionHeaderRow { + font-weight: bold; + padding: 2px 2px 2px 2px; +} +div.electionResultCol1 { + display: inline-block; + width: 150px; +} +div.electionResultCol2 { + display: inline-block; + width: 50px; + text-align: right; +} +div.electionResultCol3 { + display: inline-block; + background-color: #0091c1; +} +div.electionResultCol3Hdr { + display: inline-block; + width: 300px; +} +div.electionSeparator { + display: inline-block; + background-color: red; + height: 2px; + width: 510px; +} +tr.electionError { + background-color: #ffb6b6; +} + +div#eventCarousel div.carousel-inner div.carousel-item img { + border-radius: 15px; +} +div.eventCarouselCaption { + top: 20px; + color: red; +} +div.eventCarouselCaption div.info { + background: rgba(255,255,255,0.8); + border-radius: 15px; + padding: 0.5rem; +} +div.eventCarouselBadge { + background: rgba(0,0,255,0.4); + display: block; + right: 30%; + left: 30%; + padding: 2px 2px 2px 2px; + border-radius: 5px; +} +div.eventCarouselRegBadge { + bottom: 7rem; +} +div.eventCarouselCfpBadge { + bottom: 5rem; +} +div.eventCarouselCfsBadge { + bottom: 3rem; +} + +.eventCarouselBadge a { + text-decoration: none; + color: white; +} + +h2 a, h3 a { + text-decoration: none; + color: #515151; +} + +span.nobr { + white-space:nowrap; +} + +small { + font-size: 0.85em; +} + +div.newscontent h1, +div.newscontent h2, +div.newscontent h3, +div.newscontent h4, +div.newscontent h5, +div.newscontent h6 +{ + font-size: small; +} + +dl.eventlist { + padding-left: 1em; +} +dl.eventlist dd { + padding-left: 1em; + margin-bottom: 1em; +} diff --git a/static/css/showdown_preview.css b/static/css/showdown_preview.css deleted file mode 100644 index ba7a5dd..0000000 --- a/static/css/showdown_preview.css +++ /dev/null @@ -1,12 +0,0 @@ -div.markdownpreview { - margin-top: 2px; - border: 1px solid black; - float: left; - overflow: auto; -} - -div.markdownpreview p { - margin-left: 0px !important; - padding-left: 0px !important; -} - diff --git a/static/css/table.css b/static/css/table.css deleted file mode 100644 index a0f0b95..0000000 --- a/static/css/table.css +++ /dev/null @@ -1,100 +0,0 @@ -/* - PostgreSQL.org - Table Styles -*/ - -div.tblBasic h2 { - margin: 25px 0 .5em 0; -} - -div.tblBasic table { - background: #F5F5F5 url(/static/img/layout/gnav_tbl_top_lft.png) top left no-repeat; - margin-bottom: 15px; -} - -div.tblBasic table th { - padding-top: 20px; - border-bottom: 1px solid #EFEFEF; - vertical-align: bottom; -} - -div.tblBasic table td { - border-bottom: 1px solid #EFEFEF; -} - -div.tblBasic table th, -div.tblBasic table td { - padding: 8px 11px; - color: #555555; -} - -div.tblBasic table td.indented { - text-indent: 30px; -} - -div.tblBasic table.tblCompact td { - padding: 3px 3px; -} - -div.tblBasic table tr.lastrow td { - border-bottom: none; - padding-bottom: 13px; -} - -div.tblBasic table.tblCompact tr.lastrow td { - padding-bottom: 3px; -} - -div.tblBasic table tr.lastrow td.colFirstT, -div.tblBasic table tr.lastrow td.colFirst { - background: url(/static/img/layout/gnav_tbl_btm_lft.png) bottom left no-repeat; -} - -div.tblBasic table.tblBasicGrey th.colLast, -div.tblBasic table.tblCompact th.colLast { - background: #F5F5F5 url(/static/img/layout/gnav_tbl_top_rgt.png) top right no-repeat; -} - -div.tblBasic table.tblBasicGrey tr.lastrow td.colLastT, -div.tblBasic table.tblBasicGrey tr.lastrow td.colLast, -div.tblBasic table.tblCompact tr.lastrow td.colLast, -div.tblBasic table.tblCompact tr.lastrow td.colLastT{ - background: #F5F5F5 url(/static/img/layout/gnav_tbl_btm_rgt.png) bottom right no-repeat; -} - -div.tblBasic table.tblBasicGrey tr.firstrow td.colLastT, -div.tblBasic table.tblBasicGrey tr.firstrow td.colLast, -div tblBasic table.tblCompact tr.firstrow td.colLast { - background: #F5F5F5 url(/static/img/layout/gnav_tbl_top_rgt.png) top right no-repeat; -} - -div.tblBasic table th.colMid, -div.tblBasic table td.colMid, -div.tblBasic table th.colLast, -div.tblBasic table td.colLast { - background-color: #F5F5F5 ; -} - -div.tblBasic table th.colLastC, -div.tblBasic table td.colFirstC, -div.tblBasic table td.colLastC { - text-align: center; -} - -div.tblBasic table th.colLastR, -div.tblBasic table td.colFirstR, -div.tblBasic table td.colLastR { - text-align: right; -} - -div.tblBasic table td.colFirstT, -div.tblBasic table td.colMidT, -div.tblBasic table td.colLastT { - vertical-align: top; -} - -div.tblBasic table th.colLastRT, -div.tblBasic table td.colFirstRT, -div.tblBasic table td.colLastRT { - text-align: right; - vertical-align: top; -} diff --git a/static/css/text.css b/static/css/text.css deleted file mode 100644 index 902a118..0000000 --- a/static/css/text.css +++ /dev/null @@ -1,162 +0,0 @@ -/* - PostgreSQL.org - Text Styles -*/ - -/* Heading Definitions */ - -h1 { - color: #EC5800; -} - -h2 { - color: #666; -} - -h3 { - color: #666; -} - -h4 { - color: #666; -} - -/* Text Styles */ - -.txtColumn1 { - width: 50%; - line-height: 1.3em; -} - -.txtColumn2 { - width: 50%; - line-height: 1.5em; -} - -.txtCurrentLocation { - font-weight: bold; -} - -.txtDivider { - font-size: 0.8em; - color: #E1E1E1; - padding-left: 4px; - padding-right: 4px; -} - -.txtNewsEvent { - font-size: 0.9em; - color: #0094C7; -} - -.txtDate { - font-size: 0.9em; - color: #666; -} - -.txtMediumGrey { - color: #666; -} - -.txtFormLabel { - color: #666; - font-weight: bold; - text-align: right; - vertical-align: top; -} - -.txtRequiredField { - color: #EC5800; -} - -.txtImportant { - color: #EC5800; -} - -.txtOffScreen { - position: absolute; - left: -1999px; - width: 1990px; -} - -#txtFrontFeatureHeading { - padding-bottom: 1.1em; -} - -#txtFrontFeatureLink a { - font-size: 1.2em; - font-weight: bold; - padding-left: 5px; -} - -#txtFrontUserText { - font-size: 1.0em; - color: #666; - margin-top: 12px; -} - -#txtFrontUserName { - font-size: 0.9em; - color: #666; - margin-top: 9px; - font-weight: bold; -} - -#txtFrontUserLink { - font-size: 0.9em; - color: #666; - margin-top: 11px; - margin-left: 1px; -} - -#txtFrontUserLink img { - padding-right: 5px; -} - -#txtFrontSupportUsText { - font-size: 1.0em; - margin-top: 9px; -} - -#txtFrontSupportUsLink { - font-size: 0.9em; - margin-top: 6px; -} - -#txtFrontSupportUsLink img { - padding-right: 7px; -} - -/* Link Styles */ - -a:link { color:#0085B0; text-decoration: underline; } -a:visited { color:#004E66; text-decoration: underline; } -a:active { color:#0085B0; text-decoration: underline; } -a:hover { color:#000000; text-decoration: underline; } - -#pgFooter a:link { color:#666; text-decoration: underline; } -#pgFooter a:visited { color:#666; text-decoration: underline; } -#pgFooter a:active { color:#666; text-decoration: underline; } -#pgFooter a:hover { color:#000000; text-decoration: underline; } - -#txtFrontUserName a:link { color:#666; text-decoration: underline; } -#txtFrontUserName a:visited { color:#666; text-decoration: underline; } -#txtFrontUserName a:active { color:#666; text-decoration: underline; } -#txtFrontUserName a:hover { color:#000; text-decoration: underline; } - -#txtArchives a:visited { color:#00536E; text-decoration: underline; } -#txtArchives pre { word-wrap: break-word; font-size: 150%; } -#txtArchives tt { word-wrap: break-word; font-size: 150%; } - -#pgFrontUSSContainer h2, #pgFrontUSSContainer h3 { - margin: 0; - padding: 0; -} - -#pgFrontNewsEventsContainer h2, #pgFrontNewsEventsContainer h3 { - margin: 0; - padding: 0; -} - -#pgFrontNewsEventsContainer h3 img { - margin-bottom: 10px; -} diff --git a/static/img/elephant.png b/static/img/elephant.png new file mode 100644 index 0000000..d765318 Binary files /dev/null and b/static/img/elephant.png differ diff --git a/static/img/layout/blt_blu_arrow.png b/static/img/layout/blt_blu_arrow.png deleted file mode 100644 index 32ae5e3..0000000 Binary files a/static/img/layout/blt_blu_arrow.png and /dev/null differ diff --git a/static/img/layout/blt_gry_arrow.png b/static/img/layout/blt_gry_arrow.png deleted file mode 100644 index ce9b38e..0000000 Binary files a/static/img/layout/blt_gry_arrow.png and /dev/null differ diff --git a/static/img/layout/box_bottom.gif b/static/img/layout/box_bottom.gif deleted file mode 100644 index 5d29384..0000000 Binary files a/static/img/layout/box_bottom.gif and /dev/null differ diff --git a/static/img/layout/box_top.gif b/static/img/layout/box_top.gif deleted file mode 100644 index a4d927d..0000000 Binary files a/static/img/layout/box_top.gif and /dev/null differ diff --git a/static/img/layout/hdr_fill.png b/static/img/layout/hdr_fill.png deleted file mode 100644 index ed2e57c..0000000 Binary files a/static/img/layout/hdr_fill.png and /dev/null differ diff --git a/static/img/layout/hdr_left.png b/static/img/layout/hdr_left.png deleted file mode 100644 index c483920..0000000 Binary files a/static/img/layout/hdr_left.png and /dev/null differ diff --git a/static/img/layout/hdr_right.png b/static/img/layout/hdr_right.png deleted file mode 100644 index d3de11c..0000000 Binary files a/static/img/layout/hdr_right.png and /dev/null differ diff --git a/static/img/layout/nav_fill.png b/static/img/layout/nav_fill.png deleted file mode 100644 index 124a783..0000000 Binary files a/static/img/layout/nav_fill.png and /dev/null differ diff --git a/static/img/layout/nav_lft.png b/static/img/layout/nav_lft.png deleted file mode 100644 index f0aa5ff..0000000 Binary files a/static/img/layout/nav_lft.png and /dev/null differ diff --git a/static/img/layout/nav_rgt.png b/static/img/layout/nav_rgt.png deleted file mode 100644 index 4eadb0a..0000000 Binary files a/static/img/layout/nav_rgt.png and /dev/null differ diff --git a/static/img/layout/nav_tbl_btm.png b/static/img/layout/nav_tbl_btm.png deleted file mode 100644 index ec897af..0000000 Binary files a/static/img/layout/nav_tbl_btm.png and /dev/null differ diff --git a/static/img/layout/nav_tbl_top.png b/static/img/layout/nav_tbl_top.png deleted file mode 100644 index 3a22368..0000000 Binary files a/static/img/layout/nav_tbl_top.png and /dev/null differ diff --git a/static/img/layout/usr_tbl_btm.png b/static/img/layout/usr_tbl_btm.png deleted file mode 100644 index b62d0c1..0000000 Binary files a/static/img/layout/usr_tbl_btm.png and /dev/null differ diff --git a/static/img/layout/usr_tbl_top.png b/static/img/layout/usr_tbl_top.png deleted file mode 100644 index 42eaab0..0000000 Binary files a/static/img/layout/usr_tbl_top.png and /dev/null differ diff --git a/templates/base.html b/templates/base.html index 762b12d..69a8e30 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,49 +1,102 @@ - - - - {%block title%}{%endblock%} - PostgreSQL Community Association of Canada - - - - -{# - - -#} + + + + + + + + + + + + {%block title%}{%endblock%} - PostgreSQL Community Association of Canada {%block extrahead%}{%endblock%} - - -
-
-
-
-
- PostgreSQL Community Association of Canada -
-
- PostgreSQL Community Association of Canada -
-
- -
-
-
- -
-
-
-{%block layoutblock%}{%endblock%} -
-
-
- Privacy Policy | - About the website
- Copyright © 2012-2015 PostgreSQL Community Association of Canada -
-
-
- + + +
+ + +
+
+ +
+
+ + + +
+
+ + +
+
+
+

Quick Links

+ +
+
+
+ + + +
+
+ + +
+
+ {% block maincontent %}{% endblock %} +
+ + + +
+ {% block relatedinfo %}{% endblock %} +
+ + +
+ + + +
+
+
+
+ + + + + + + +{%block jquery%} + +{%endblock%} + +{%block pagescript%} +{%endblock%} + diff --git a/templates/pages/about/privacypolicy.html b/templates/pages/about/privacypolicy.html index 67632f5..573357a 100644 --- a/templates/pages/about/privacypolicy.html +++ b/templates/pages/about/privacypolicy.html @@ -1,6 +1,6 @@ {%extends "base.html" %} {%block title%}Privacy Policy{%endblock%} -{%block layoutblock%} +{%block maincontent%}

Privacy policy

diff --git a/templates/pages/about/website.html b/templates/pages/about/website.html index 721d9c9..3ff0c32 100644 --- a/templates/pages/about/website.html +++ b/templates/pages/about/website.html @@ -1,6 +1,6 @@ {%extends "base.html" %} {%block title%}Website{%endblock%} -{%block layoutblock%} +{%block maincontent%}

About the website

diff --git a/templates/pages/index.html b/templates/pages/index.html index 0a27eb7..d57b409 100644 --- a/templates/pages/index.html +++ b/templates/pages/index.html @@ -1,17 +1,17 @@ -{%extends "base.html" %} -{%block title%}Welcome{%endblock%} -{%block layoutblock%} +{% extends "base.html" %} +{% block title %}Welcome{% endblock %} +{% block relatedinfo %}
-

Help us out!

+

Help us out!

In the future you will be able to help PostgreSQL Canada by donating, but in the meantime why not help out in the PostgreSQL community.

-

Other usergroups

+

Other usergroups

-

Related organisations

+

Related organisations

+{% endblock %} +{% block maincontent %}

Welcome to PostgreSQL Canada

@@ -60,5 +62,5 @@ future to see how we're getting on.
-{%endblock%} +{% endblock %}