From 354ea4052dd21263e34cd8365af1b90b39fd598c Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 23 Mar 2014 02:09:43 +0100 Subject: [PATCH] mood pic styling & example for all resolutions --- views/html/html.tpl | 1 - views/html/menu/index.tpl | 1 + views/html/questgroups/questgroup.tpl | 6 +++++- www/css/desktop.css | 16 ++++++++++++---- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/views/html/html.tpl b/views/html/html.tpl index cc7bcb76..5ade1521 100644 --- a/views/html/html.tpl +++ b/views/html/html.tpl @@ -32,7 +32,6 @@
-

The Legend of Z

diff --git a/views/html/menu/index.tpl b/views/html/menu/index.tpl index 470912e8..11806da4 100644 --- a/views/html/menu/index.tpl +++ b/views/html/menu/index.tpl @@ -1,5 +1,6 @@
  • +
  • The Legend of Z
  • Gilden
  • diff --git a/views/html/questgroups/questgroup.tpl b/views/html/questgroups/questgroup.tpl index 2a92b76c..7ec11160 100644 --- a/views/html/questgroups/questgroup.tpl +++ b/views/html/questgroups/questgroup.tpl @@ -1,7 +1,11 @@ +
    + +
    + +

    -

    :

    diff --git a/www/css/desktop.css b/www/css/desktop.css index 716990ca..a12b7a3c 100644 --- a/www/css/desktop.css +++ b/www/css/desktop.css @@ -77,6 +77,9 @@ menu a,#profile{display:block;padding:15px 0;color:#fff} article{padding:70px 0 30px} +.moodpic{margin:-15px -5.5% 0 -5.5%;overflow:hidden} +.moodpic img{width:100vw} + .breadcrumbs li{display:block;font-size:.875em} .breadcrumbs .fa{padding-right:5px;font-size:.75em} @@ -128,11 +131,16 @@ menu{display:block;opacity:1;position:relative} menu a{padding:10px 0} #profile{float:none;margin:30px 0 15px 12px} #toggle,.toggle{display:none} -.wrap{margin:0 20px 0 340px} -article{padding-top:20px} +.wrap{margin:0 0 0 300px} +article{padding:20px 40px 30px 40px} +.moodpic{margin:-20px -40px} .breadcrumbs li{display:inline;padding-right:10px} } -@media only screen and (min-width:1200px){ -.wrap{width:860px;max-width:860px} +@media only screen and (min-width:1366px){ +body{background:#eae8e4} +.wrap{width:800px;max-width:800px} +article{background:#f7f5f2} +.moodpic{margin:-20px 0 0 -40px;width:880px;height:230px} +.moodpic img{width:auto} } \ No newline at end of file