- change badges view and related pages
- bugfixes

forum/skins/light/media/style/style.css

@@ -87,12 +87,12 @@ a:hover {
     text-align: right;
 }
 
-.spacer3 {
+/*.spacer3 {
     clear: both;
     height: 30px;
     line-height: 30px;
     visibility: hidden;
-}
+}*/
 
 h1 {
     font-size: 160%;
@@ -407,13 +407,13 @@ padding-top: 4px;
 }
 
 #room {
-    background-color: #FFFFFF;
-    border-bottom: 1px solid #777777;
+    border: 1px solid #DD4814;
+    background-color: #E7E7E7;
+    padding: 5px;
 }
 
 #CALeft {
     float: left;
-    position: relative;
     width: 84%;
 }
 
@@ -425,8 +425,6 @@ padding-top: 4px;
 #CAFull {
     float: left;
     width: 100%;
-    border: 1px solid #DD4814;
-    background-color: #E7E7E7;
 }
 
 #ground {
@@ -566,12 +564,12 @@ padding-top: 4px;
 }
 
 .boxC {
-    background: none repeat scroll 0 0 #E5EBF8;
-    border-color: #EEEEEC #A9ACA5 #BABDB6 #EEEEEC;
-    border-style: solid;
-    border-width: 1px;
-    margin-bottom: 8px;
+    background-color: #D7D7D7;
+    border-left: 1px solid #DD4814;
+    border-bottom: 1px solid #DD4814;
     padding: 10px;
+    margin-right: -5px;
+    margin-top: -5px;
 }
 
 .boxC p {
@@ -688,11 +686,8 @@ padding-top: 4px;
 }
 
 .medal {
-    background: none repeat scroll 0 0 #FFFFCD;
-    border-color: #EEEEEE #CCCCCC #CCCCCC #EEEEEE;
-    border-left: 1px solid #EEEEEE;
-    border-style: solid;
-    border-width: 1px;
+    background: none repeat scroll 0 0 #DD4818;
+    border: #DD4818 solid 1px;
     color: #333333;
     font-size: 14px;
     font-weight: bold;
@@ -702,16 +697,14 @@ padding-top: 4px;
 
 a.medal {
     text-decoration: none;
-    color: #333333;
+    color: white;
 }
 
 a.medal:hover {
-    background: url("../images/medala_on.gif") no-repeat scroll 0 0 transparent;
-    border-color: #E7E296 #D1CA3D #D1CA3D #E7E296;
-    border-left: 1px solid #E7E296;
-    border-style: solid;
-    border-width: 1px;
-    color: #333333;
+    /*background: url("../images/medala_on.gif") no-repeat scroll 0 0 transparent;*/
+    background-color: white;
+    border: #DD4818 solid 1px;
+    color: #DD4818;
     text-decoration: none;
 }
 
@@ -765,7 +758,7 @@ a.medal:hover {
 }
 
 .tabsA a:hover {
-    background: none repeat scroll 0 0 #356FCB;
+    background: none repeat scroll 0 0 #DD4818;
     color: #FFFFFF;
 }
 
@@ -939,11 +932,15 @@ div.question-body p, div.answer-body p {
 }
 
 .badge-list a {
-    color: #3060A8;
+    color: #DD4818;
 }
 
 .badge-list a.medal {
-    color: #333333;
+    color: white;
+}
+
+.badge-list a.medal:hover {
+    color: #DD4818;
 }
 
 #medalList .badgeListDescription {
@@ -1282,16 +1279,13 @@ ins {
     margin-left: 0px;
 }
 
-#subheader .silver, .badge2 {
-    float: left;
+#top .bronze, .badge3, #top .silver, .badge2 {
     line-height: 40px;
     margin-left: 0px;
 }
 
-#subheader .bronze, .badge3 {
+#top .bronze, #top .silver {
     float: left;
-    line-height: 40px;
-    margin-left: 0px;
 }
 
 #subheader .badgecount {
@@ -1931,8 +1925,8 @@ div.dialog, .context-menu-dropdown {
     background-color: #EEEEEE;
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
-    -moz-box-shadow: 2px 2px 5px #3060A8;
-    -webkit-box-shadow: 2px 2px 5px #3060A8;
+    -moz-box-shadow: 2px 2px 5px #DD4818;
+    -webkit-box-shadow: 2px 2px 5px #DD4818;
 }
 
 .context-menu-dropdown {
@@ -1964,7 +1958,7 @@ div.dialog, .context-menu-dropdown {
 }
 
 .context-menu-dropdown li.item:hover {
-    background-color: #3060A8;
+    background-color: #DD4818;
     color: white;
 }
 
@@ -1999,7 +1993,7 @@ div.dialog .dialog-buttons {
     margin: 0 3px 5px 3px;
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
-    background-color: #3060A8;
+    background-color: #DD4818;
     color: white;
     line-height: 20px;
     vertical-align: baseline;

forum/skins/light/media/style/user.css

@@ -16,8 +16,8 @@
     background-color: #EEEEEE;
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
-    -moz-box-shadow: 2px 2px 5px #3060A8;
-    -webkit-box-shadow: 2px 2px 5px #3060A8;
+    -moz-box-shadow: 2px 2px 5px #DD4818;
+    -webkit-box-shadow: 2px 2px 5px #DD4818;
 }
 
 div.dialog.award-rep-points table {

forum/skins/light/templates/badge.html

@@ -14,7 +14,8 @@
         </script>
 {% endblock %}
 {% block content %}
-<div id="main-bar" class="headNormal">
+<div id="mainbar-full">
+<div class="headUser">
 	{% trans "Badge" %}
 </div>
 <div id="main-body" style="width:100%;margin-bottom:20px">
@@ -32,7 +33,7 @@
         <p style="width:220px;float:left">{% user_signature award.user "badges" %}<span class="tag-number"> &#215; {{ award.count|intcomma }}</span></p>
         {% endfor %}
     </div>
-
+</div>
 </div>
 {% endblock %}
 <!-- end template badge.html -->

forum/skins/light/templates/badges.html

@@ -5,8 +5,8 @@
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Badges summary" %}{% endspaceless %}{% endblock %}
 {% block content %}
-<div class="headlineA">
-        <span class="headMedals">{% trans "Badges" %}</span>
+<div class="headUser">
+    {% trans "Badges" %}
 </div>
 <div class="badges" id="main-body" style="width:100%">
     <p>

forum/skins/light/templates/base_content.html

@@ -95,7 +95,7 @@
                     {% endblock %}
                 </div>
             </div>
-            <div class="spacer3"></div>
+            <!--<div class="spacer3"></div>-->
         </div>
         {% endblock %}
         {% if settings.USE_CUSTOM_FOOTER|or_preview:request %}

forum/skins/light/templates/user.html

@@ -26,11 +26,6 @@
         <link rel="stylesheet" href="http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css" type="text/css" media="all" />
         <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/user.css" %}"/>
     {% endif %}
-    <style type="text/css">
-        #room {
-            border: 0;
-        }
-    </style>
     {% block userjs %}{% endblock %}
 {% endblock %}
 {% block content %}

forum/skins/light/templates/users/edit.html

@@ -30,7 +30,7 @@
 {% endblock %}
 {% block content %}
 <div id="mainbar-full">
-<div id="subheader" class="headUser">
+<div class="headUser">
     {{ user.username }} - {% trans "edit profile" %}
 </div>
 <div id="main-body" style="width:100%">

forum/skins/light/templates/users/info.html

@@ -7,7 +7,7 @@
 {% load markup %}
 {% load user_tags %}
 
-<div id="subheader" class="headUser{% if view_user.is_suspended %} suspended-user{% endif %}">
+<div class="headUser{% if view_user.is_suspended %} suspended-user{% endif %}">
     {{view_user.decorated_name}}
 </div>
 <table class="user-info-table" width="100%">

forum/skins/light/templates/users/users.html

@@ -20,7 +20,7 @@
 {% endblock %}
 {% block content %}
 <div class="tabBar">
-    <div class="headUsers">{% trans "Users" %}</div>
+    <div class="headUser">{% trans "Users" %}</div>
     {{ users.paginator.sort_tabs }}
 </div>
 <div id="main-body" style="width:100%">