diff --git a/src/static/css/demo.css b/src/static/css/demo.css index b7c85b8..939f88b 100755 --- a/src/static/css/demo.css +++ b/src/static/css/demo.css @@ -1,136 +1,3 @@ -* { - padding:0; - margin:0; - font-family: trebuchet ms; arial; calibri; gill sans; helvetica neue; candara; geneva; verdana; sans-serif; - background-color: black; -} - -a { - text-decoration: none; -} - p { - text-indent: 2em; - } -.nav-grid img { - height: 100%; - width: 100%; -} - -footer { - padding: 1px; - position: absolute; - bottom: 1em; - right: 1em; - width: auto; - text-align: right; - color: #df85a5; - background-color: transparent; -} - -.grid { - height: auto; - width: 100vw; - display: grid; - position: relative; - grid-template-columns: 1fr 60% 1fr; - grid-template-rows: 5% 15% 60% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; -} - -.top-row { - grid-area: 1 / 1 / 2 / 4; - display: flex; - flex-direction:column; - justify-content:center; - align-items: center; -} -.nav-row { - grid-area: 2 / 1 / 3 / 4; -} -.content-row { - grid-area: 3 / 1 / 4 / 4; -} -.latest-row { - grid-area: 4 / 1 / 5 / 4; -} -.nav-grid { - grid-area: 2 / 2 / 3 / 3; - display: flex; - flex-direction: row; - display: grid; - grid-template-columns: minmax(0%,10%) repeat(5, 1fr) minmax(0%,10%); - grid-column-gap: 0px; - grid-row-gap: 0px; - justify-items: center; - text-align: center; - color: red; -} - .nav-left { - grid-area: 1 / 1 / 2 / 2; - } - .nav-right { - grid-area: 1 / 7 / 2 / 8; - } - .nav-home { - grid-area: 1 / 2 / 2 / 3; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .nav-blessfrey { - grid-area: 1 / 3 / 2 / 4; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .nav-lemonland { grid-area: 1 / 4 / 2 / 5; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .nav-diary { grid-area: 1 / 5 / 2 / 6; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .nav-about { grid-area: 1 / 6 / 2/ 7; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .navlink { - font-size: 110%; - font-weight: bold; - } - .navlink a:link { - color: #E6E8EF; - } - .navlink a:visited { - color: #E6E8EF; - } - .navlink a:hover { - color: #f463ad; - } - .navlink a:active { - color: #f463ad; - } - .content-grid { grid-area: 3 / 1 / 4 / 4; display: grid; @@ -169,14 +36,3 @@ footer { .story { grid-area: 5 / 1 / 6 / 2; } .characters { grid-area: 6 / 1 / 7 / 2; } .info { grid-area: 7 / 1 / 8 / 2; } - -/*.footer-content { - text-align: right; - color: white; - - padding: 3em; - background-color: gray; - position: fixed; - bottom: 0em; -}*/ - diff --git a/src/static/css/index.css b/src/static/css/index.css index cb284d2..38ba8b8 100755 --- a/src/static/css/index.css +++ b/src/static/css/index.css @@ -1,152 +1,15 @@ -* { - padding:0; - margin:0; - font-family: trebuchet ms; arial; calibri; gill sans; helvetica neue; candara; geneva; verdana; sans-serif; - background-color: black; -} -html, body {padding:0; margin:0; height:100%;} -footer{position: absolute; bottom: 0; left: 0; right: 0;} - -a { - text-decoration: none; -} -.centered { - text-align: center; -} -#poltics { - height: auto; - width: 100%; - -} -.nav-grid img { - height: 100%; - width: 100%; -} - -.grid { - height: 95vh; - width: 100vw; - display: grid; - grid-template-columns: 1fr 60% 1fr; - grid-template-rows: 5% 15% 60% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; -} - -.top-row { - grid-area: 1 / 1 / 2 / 4; - display: flex; - flex-direction:column; - justify-content:center; - align-items: center; -} -.nav-row { - grid-area: 2 / 1 / 3 / 4; -} -.content-row { - grid-area: 3 / 1 / 4 / 4; -} -.latest-row { - grid-area: 4 / 1 / 5 / 4; -} -.nav-grid { - grid-area: 2 / 2 / 3 / 3; - display: flex; - flex-direction: row; - display: grid; - grid-template-columns: minmax(0%,10%) repeat(5, 1fr) minmax(0%,10%); - grid-column-gap: 0px; - grid-row-gap: 0px; - justify-items: center; - text-align: center; - color: red; -} - .nav-left { - grid-area: 1 / 1 / 2 / 2; - } - .nav-right { - grid-area: 1 / 7 / 2 / 8; - } - .nav-home { - grid-area: 1 / 2 / 2 / 3; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .nav-blessfrey { - grid-area: 1 / 3 / 2 / 4; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .nav-lemonland { grid-area: 1 / 4 / 2 / 5; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .nav-diary { grid-area: 1 / 5 / 2 / 6; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .nav-about { grid-area: 1 / 6 / 2/ 7; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .navlink { - font-size: 110%; - font-weight: bold; - color: #E6E8EF; - } - .navlink a:link { - color: #E6E8EF; - } - .navlink a:visited { - color: #E6E8EF; - } - .navlink a:hover { - color: #f463ad; - } - .navlink a:active { - color: #f463ad; - } - .content-grid { grid-area: 3 / 1 / 4 / 4; display: grid; - grid-template-columns: 25% 75%; + grid-template-columns: 50% 50%; grid-template-rows: auto; grid-column-gap: 0px; grid-row-gap: 0px; } .content-left { grid-area: 1 / 1 / 2 / 2; - display: grid; - grid-template-columns: 1fr; - grid-template-rows: repeat(3, 1fr); - grid-column-gap: 0px; - grid-row-gap: 0px; - } - .contentlogo { - grid-area: 2 / 1 / 3 / 2; background-image: url(../img/prom/BlessFREY_logo.png); - background-size: contain; + background-size: 70%; background-repeat: no-repeat; background-position: right; } @@ -156,43 +19,6 @@ a { background-size: contain;/*80% auto;*/ background-repeat: no-repeat; background-position: center; - } - /*display: grid; - grid-template-columns: repeat(3, 1fr); - grid-template-rows: repeat(2, 1fr); - grid-column-gap: 0px; - grid-row-gap: 0px; - } - .weaponmaster { - grid-area: 1 / 1 / 2 / 2; - background-color: red; - background-image: url(../img/prom/w_thumb.png); - } - .tamer { - grid-area: 1 / 2 / 2 / 3; - background-color: yellow; - background-image: url(../img/prom/t_thumb.png); - } - .disciple { - grid-area: 1 / 3 / 2 / 4; - background-color: orange; - background-image: url(../img/prom/d_thumb.png); - } - .streetfighter { - grid-area: 2 / 1 / 3 / 2; - background-color: green; - background-image: url(../img/prom/s_thumb.png); - } - .hacker { - grid-area: 2 / 2 / 3 / 3; - background-color: blue; - background-image: url(../img/prom/h_thumb.png); - } - .chemist { - grid-area: 2 / 3 / 3 / 4; - background-color: purple; - background-image: url(../img/prom/c_thumb.png); - } */ .latest, .latest-grid { background-color: #C0AAC0; } diff --git a/src/static/css/me.css b/src/static/css/me.css index 5db940d..28a9069 100755 --- a/src/static/css/me.css +++ b/src/static/css/me.css @@ -1,139 +1,3 @@ -* { - padding:0; - margin:0; - font-family: trebuchet ms; arial; calibri; gill sans; helvetica neue; candara; geneva; verdana; sans-serif; - background-color: black; -} -/*html, body {padding:0; margin:0; height:100%;}*/ -.footer{ - position: relative; bottom: 0px; left: 0px; right: 0px; - color: white; - padding-top: 5px; - text-align: right; - overflow: hidden; - box-shadow: 0 100vh 0 100vh black; -} - -a { - text-decoration: none; -} -.centered { - text-align: center; -} -#poltics { - height: auto; - width: 100%; - -} -.nav-grid img { - height: 100%; - width: 100%; -} - -.grid { - height: 95vh; - width: 100vw; - display: grid; - grid-template-columns: 1fr 60% 1fr; - grid-template-rows: 5% 15% 60% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; -} - -.top-row { - grid-area: 1 / 1 / 2 / 4; - display: flex; - flex-direction:column; - justify-content:center; - align-items: center; -} -.nav-row { - grid-area: 2 / 1 / 3 / 4; -} -.content-row { - grid-area: 3 / 1 / 4 / 4; -} -.latest-row { - grid-area: 4 / 1 / 5 / 4; -} -.nav-grid { - grid-area: 2 / 2 / 3 / 3; - display: flex; - flex-direction: row; - display: grid; - grid-template-columns: minmax(0%,10%) repeat(5, 1fr) minmax(0%,10%); - grid-column-gap: 0px; - grid-row-gap: 0px; - justify-items: center; - text-align: center; - color: red; -} - .nav-left { - grid-area: 1 / 1 / 2 / 2; - } - .nav-right { - grid-area: 1 / 7 / 2 / 8; - } - .nav-home { - grid-area: 1 / 2 / 2 / 3; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .nav-blessfrey { - grid-area: 1 / 3 / 2 / 4; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .nav-lemonland { grid-area: 1 / 4 / 2 / 5; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .nav-diary { grid-area: 1 / 5 / 2 / 6; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .nav-about { grid-area: 1 / 6 / 2/ 7; - display: grid; - grid-template-columns: 100%; - grid-template-rows: 80% 20%; - grid-column-gap: 0px; - grid-row-gap: 0px; - flex-direction: column; - } - .navlink { - font-size: 110%; - font-weight: bold; - color: #E6E8EF; - } - .navlink a:link { - color: #E6E8EF; - } - .navlink a:visited { - color: #E6E8EF; - } - .navlink a:hover { - color: #f463ad; - } - .navlink a:active { - color: #f463ad; - } - .content-grid { grid-area: 3 / 1 / 4 / 4; display: grid; @@ -181,10 +45,7 @@ a { } .content-right h1, h2, ul, li, b, i, p, img, a { - background-color: #C0AAC0; - } - p { - text-indent: 2em; + background-color: transparent; } .content-right a:link { color: #305285; @@ -204,11 +65,3 @@ a { .content-right li { padding-left: 5%; } - -/*.footer-content { - color: white; - padding-top: 5px; - text-align: right; - overflow: hidden; - box-shadow: 0 100vh 0 100vh black; -}*/ diff --git a/src/static/img/prom/runebless.png b/src/static/img/prom/runebless.png index e542f51..d889ea9 100644 Binary files a/src/static/img/prom/runebless.png and b/src/static/img/prom/runebless.png differ diff --git a/src/views/frame.tpl b/src/views/frame.tpl index 6c99f9f..32d6607 100644 --- a/src/views/frame.tpl +++ b/src/views/frame.tpl @@ -2,6 +2,143 @@
+ + % include('header.tpl')