Browse Source

Styling changes to buttons on warnings list. #37

Rafał Pitoń 11 years ago
parent
commit
ce71a9428b

+ 3 - 0
static/cranefly/css/cranefly.css

@@ -991,7 +991,10 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{color:#333;text-decoration:n
 .user-profile .content-list.user-warnings .media .warning-icon .warning-active{color:#cf402e}
 .user-profile .content-list.user-warnings .media .warning-icon .warning-active{color:#cf402e}
 .user-profile .content-list.user-warnings .media .warning-icon .warning-expired{color:#999}
 .user-profile .content-list.user-warnings .media .warning-icon .warning-expired{color:#999}
 .user-profile .content-list.user-warnings .media .warning-icon .warning-canceled{margin-bottom:0;position:relative;bottom:5px;color:#999;font-size:43.75px}
 .user-profile .content-list.user-warnings .media .warning-icon .warning-canceled{margin-bottom:0;position:relative;bottom:5px;color:#999;font-size:43.75px}
+.user-profile .content-list.user-warnings .media .media-body .warning-reason>:first-child{margin-top:0;padding-top:0}
 .user-profile .content-list.user-warnings .media .media-body .warning-reason>:last-child{margin-bottom:0;padding-bottom:0}
 .user-profile .content-list.user-warnings .media .media-body .warning-reason>:last-child{margin-bottom:0;padding-bottom:0}
+.user-profile .content-list.user-warnings .media .media-footer{overflow:auto}.user-profile .content-list.user-warnings .media .media-footer form,.user-profile .content-list.user-warnings .media .media-footer p{float:left;margin:0}
+.user-profile .content-list.user-warnings .media .media-footer form{padding:0;margin-top:-3px;margin-right:14px}
 .forum-subforums-list{background-color:#fff;border:1px solid #d5d5d5;border-radius:2px;-webkit-box-shadow:0 0 0 3px #eee;-moz-box-shadow:0 0 0 3px #eee;box-shadow:0 0 0 3px #eee;margin-bottom:20px}.forum-subforums-list .header{background-color:#fbfbfb;border:1px solid #d5d5d5;border-radius:2px 2px 0 0;margin:-1px;margin-bottom:0;padding:3.966666666666667px 9.9px}.forum-subforums-list .header h2{margin:0;padding:0;color:#333;font-size:11.9px;font-weight:bold;line-height:20px;text-align:left}.forum-subforums-list .header h2 small{margin-left:7px;color:#999;font-size:11.9px}
 .forum-subforums-list{background-color:#fff;border:1px solid #d5d5d5;border-radius:2px;-webkit-box-shadow:0 0 0 3px #eee;-moz-box-shadow:0 0 0 3px #eee;box-shadow:0 0 0 3px #eee;margin-bottom:20px}.forum-subforums-list .header{background-color:#fbfbfb;border:1px solid #d5d5d5;border-radius:2px 2px 0 0;margin:-1px;margin-bottom:0;padding:3.966666666666667px 9.9px}.forum-subforums-list .header h2{margin:0;padding:0;color:#333;font-size:11.9px;font-weight:bold;line-height:20px;text-align:left}.forum-subforums-list .header h2 small{margin-left:7px;color:#999;font-size:11.9px}
 .forum-subforums-list .forum{border-bottom:1px solid #d5d5d5;height:21px;overflow:visible;padding:14.75px 9.9px}.forum-subforums-list .forum.last{border-bottom:none}
 .forum-subforums-list .forum{border-bottom:1px solid #d5d5d5;height:21px;overflow:visible;padding:14.75px 9.9px}.forum-subforums-list .forum.last{border-bottom:none}
 .forum-subforums-list .forum .forum-icon{float:left;position:relative;bottom:1px;width:36px;color:#d5d5d5;font-size:24px;text-align:center}.forum-subforums-list .forum .forum-icon.forum-icon-new{color:#cf402e}
 .forum-subforums-list .forum .forum-icon{float:left;position:relative;bottom:1px;width:36px;color:#d5d5d5;font-size:24px;text-align:center}.forum-subforums-list .forum .forum-icon.forum-icon-new{color:#cf402e}

+ 20 - 0
static/cranefly/css/cranefly/profiles.less

@@ -251,12 +251,32 @@
 
 
         .media-body {
         .media-body {
           .warning-reason {
           .warning-reason {
+            &>:first-child {
+              margin-top: 0px;
+              padding-top: 0px;
+            }
+
             &>:last-child {
             &>:last-child {
               margin-bottom: 0px;
               margin-bottom: 0px;
               padding-bottom: 0px;
               padding-bottom: 0px;
             }
             }
           }
           }
         }
         }
+
+        .media-footer {
+        	overflow: auto;
+
+        	form, p {
+        		float: left;
+        		margin: 0px;
+        	}
+
+        	form {
+        		padding: 0px;
+        		margin-top: -3px;
+        		margin-right: @baseFontSize;
+        	}
+        }
       }
       }
     }
     }
   }
   }

+ 9 - 3
templates/cranefly/profiles/warnings.html

@@ -43,7 +43,7 @@
     <div class="pull-left">
     <div class="pull-left">
       <div class="warning-icon ">
       <div class="warning-icon ">
         {% if item.canceled %}
         {% if item.canceled %}
-        <i class="icon-remove warning-canceled tooltip-top" title="{% trans %}This warning has been canceled.{% endtrans %}"></i>
+        <i class="icon-ban warning-canceled tooltip-top" title="{% trans %}This warning has been canceled.{% endtrans %}"></i>
         {% elif warnings_tracker.is_warning_expired(item) %}
         {% elif warnings_tracker.is_warning_expired(item) %}
         <i class="icon-warning-sign warning-expired tooltip-top" title="{% trans %}This warning has expired.{% endtrans %}"></i>
         <i class="icon-warning-sign warning-expired tooltip-top" title="{% trans %}This warning has expired.{% endtrans %}"></i>
         {% else %}
         {% else %}
@@ -61,11 +61,16 @@
       </div>
       </div>
       <div class="media-footer">
       <div class="media-footer">
         {% if acl.warnings.can_cancel_warning(user, item) and not warnings_tracker.is_warning_expired(item) %}
         {% if acl.warnings.can_cancel_warning(user, item) and not warnings_tracker.is_warning_expired(item) %}
-        CANCEL
+        <form>
+          <button type="submit" class="btn btn-small"><i class="icon-ban"></i> {% trans %}Cancel{% endtrans %}</button>
+        </form>
         {% endif %}
         {% endif %}
         {% if acl.warnings.can_delete_warnings() %}
         {% if acl.warnings.can_delete_warnings() %}
-        DELETE
+        <form>
+          <button type="submit" class="btn btn-small"><i class="icon-remove"></i> {% trans %}Delete{% endtrans %}</button>
+        </form>
         {% endif %}
         {% endif %}
+        <p>
         {% if acl.users.can_see_users_trails() %}
         {% if acl.users.can_see_users_trails() %}
         {% trans user=warning_giver(item), date=item.given_on|reltimesince|low, ip=item.giver_ip %}Given by {{ user }} {{ date }} from ip {{ ip }}.{% endtrans %}
         {% trans user=warning_giver(item), date=item.given_on|reltimesince|low, ip=item.giver_ip %}Given by {{ user }} {{ date }} from ip {{ ip }}.{% endtrans %}
         {% else %}
         {% else %}
@@ -78,6 +83,7 @@
           {% trans user=warning_canceler(item), date=item.canceled_on|reltimesince|low %}Canceled by {{ user }} {{ date }}.{% endtrans %}
           {% trans user=warning_canceler(item), date=item.canceled_on|reltimesince|low %}Canceled by {{ user }} {{ date }}.{% endtrans %}
           {% endif %}
           {% endif %}
         {% endif %}
         {% endif %}
+        </p>
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>