From bc537f0ffd5777e50499b551d6cb3ff83c9c3f20 Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Sat, 22 Mar 2014 22:32:54 +0100
Subject: [PATCH] merge

---
 views/html/questgroups/questgroup.tpl |  8 +++++---
 www/css/desktop.css                   | 13 ++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/views/html/questgroups/questgroup.tpl b/views/html/questgroups/questgroup.tpl
index a80ec0ae..b7c8d9e2 100644
--- a/views/html/questgroups/questgroup.tpl
+++ b/views/html/questgroups/questgroup.tpl
@@ -13,9 +13,10 @@
 <h3><?=$hierarchy['title_plural']?></h3>
 <ul class="qg">
 	<?php foreach($hierarchy['questgroups'] as &$group) : ?>
-	<li>
+	<li class="cf">
 		<?php if(!array_key_exists('access', $group) || $group['access']) : ?>
-		<div class="qgtitle"><a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$group['url']))?>"><i class="fa fa-square-o fa-fw"></i><?=$group['title']?></a></div>
+		<span class="qgicon"><i class="fa fa-check-square-o"></i></span>
+		<div class="qgtitle"><a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$group['url']))?>"><?=$group['title']?></a></div>
 		<div class="qgprogress cf">
 			<div class="xpbar">
 				<span style="width:<?=round($group['character_xps']/$group['xps']*100)?>%"></span>
@@ -23,7 +24,8 @@
 			<p class="xpnumeric"><?=$group['character_xps']?> / <?=$group['xps']?> XP</p>
 		</div>
 		<?php else : ?>
-		<div class="qgtitle"><i class="fa fa-square-o fa-fw"></i><?=$hierarchy['title_singular']?> <?=_('locked')?></div>
+		<span class="qgicon locked"><i class="fa fa-square-o"></i></span>
+		<div class="qgtitle"><?=$hierarchy['title_singular']?> <?=_('locked')?></div>
 		<?php endif ?>
 	</li>
 	<?php endforeach?>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index 91bc3e38..94ca2e64 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -84,7 +84,9 @@ article{padding:70px 0 30px}
 .questgroups img{display:block}
 .questgroups section{padding:20px;background:#fff}
 
-.qg li{margin:0 0 25px 0}
+.qg li{margin-left:10px;padding:0 0 25px 30px;border:2px solid #dbd9d5;border-width:0 0 0 2px}
+.qgicon{margin:17px 0 0 -39px;background:#f7f5f2;font-size:1.25em;float:left}
+.qgicon.locked{margin-top:-2px}
 .qgtitle a{background:#5cb6bd;border-radius:3px 3px 0 0;display:block;padding:20px;color:#fff;font-weight:700}
 .qgprogress,.qghidden{margin-bottom:4px;padding:20px 20px 4px 20px;background:#fff;border-radius:0 0 3px 3px}
 
@@ -98,8 +100,9 @@ article{padding:70px 0 30px}
 .xpbar span{display:block;height:100%;border-radius:20px;background:#bcd75e;position:relative;overflow:hidden}
 .xpnumeric{float:right;color:#869845}
 
-.cta{display:inline-block;margin-top:10px;color:#fff;font-weight:700;padding:7px 20px;border-radius:4px}
-.orange{text-shadow:1px 2px #d4701a;background:#f5821f;border:solid #d4701a;border-width:0 0 3px 0}
+.cta,input[type="submit"]{display:inline-block;margin-top:10px;color:#fff;font-weight:700;padding:7px 20px;border-radius:4px}
+.orange,input[type="submit"]{text-shadow:1px 2px #d4701a;background:#f5821f;border:solid #d4701a;border-width:0 0 3px 0}
+input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;border-color:#d48c4e}
 
 .qtextbox{font-size:0.875em;background:#fff;height:200px;padding:0 20px;margin:0;border:20px solid #fff;border-width:20px 0 10px;border-radius:3px 3px 0 0;overflow-y:scroll;-webkit-overflow-scrolling:touch}
 .qtexticon{background:#fff;background:linear-gradient(to bottom, rgba(255,255,255,1) 0%,rgba(247,245,242,1) 100%);padding-bottom:5px;border-radius:0 0 3px 3px;text-align:center}
@@ -111,6 +114,10 @@ article{padding:70px 0 30px}
 .questgroups li:nth-child(even){float:right}
 }
 
+@media only screen and (min-width:768px){
+
+}
+
 @media only screen and (min-width:1024px){
 header{position:fixed;left:0;top:0;bottom:0;width:300px;margin:0}
 header nav{margin:0 10%}