Browse Source

Extra tweaks and polish. #208

Rafał Pitoń 11 years ago
parent
commit
f78696de8a

+ 1 - 1
misago/apps/threads/forms.py

@@ -148,7 +148,7 @@ class ThreadPrefixMixin(object):
             self.add_field('thread_prefix',
                            forms.TypedChoiceField(label=_("Thread Prefix"),
                                                   choices=[(0, _("No prefix"))] + [(p.pk, _(p.name)) for p in self.prefixes.values()],
-                                                  coerce=int, required=False, empty_value=0))
+                                                  coerce=int, required=False, empty_value=0, initial=self.thread.prefix_id))
 
 
 class NewThreadForm(NewThreadFormBase, PollFormMixin, ThreadPrefixMixin):

+ 1 - 0
misago/apps/threads/posting.py

@@ -79,6 +79,7 @@ class PrefixFormMixin(object):
             self.thread.prefix = None
         self.thread.save()
 
+
 class NewThreadView(NewThreadBaseView, TypeMixin, PollFormMixin, PrefixFormMixin):
     form_type = NewThreadForm
 

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

@@ -985,7 +985,7 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{color:#333;text-decoration:n
 .forum-subforums-list.forum-subforums-info .header{background-color:#3c85a3;border:1px solid #2e677e}.forum-subforums-list.forum-subforums-info .header h2{color:#fff;text-shadow:0 1px 0 #1a3946}.forum-subforums-list.forum-subforums-info .header h2 small{color:#1a3946;text-shadow:none}
 .forum-threads-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-threads-list .threads-list-empty{padding:28px 0;color:#999;font-size:26.25px;text-align:center}.forum-threads-list .threads-list-empty .thread-prefix{position:relative;bottom:5px}
 .forum-threads-list>ul{list-style:none;margin:0}.forum-threads-list>ul>li{border-bottom:1px solid #d5d5d5;padding:9.9px 0;overflow:auto}.forum-threads-list>ul>li .thread-icon{float:left;margin-bottom:-2px;position:relative;bottom:1px;height:22px;width:39.5px;font-size:22px;text-align:center}.forum-threads-list>ul>li .thread-icon a:link,.forum-threads-list>ul>li .thread-icon a:active,.forum-threads-list>ul>li .thread-icon a:visited,.forum-threads-list>ul>li .thread-icon a:hover{color:#d5d5d5;text-decoration:none}
-.forum-threads-list>ul>li .thread-body{margin:-9.9px 0;margin-left:39.5px;padding:9.9px 0}.forum-threads-list>ul>li .thread-body .thread-prefix{position:relative;bottom:2px}
+.forum-threads-list>ul>li .thread-body{margin:-9.9px 0;margin-left:39.5px;padding:9.9px 0}.forum-threads-list>ul>li .thread-body .thread-prefix{margin-right:7px;position:relative;bottom:2px}
 .forum-threads-list>ul>li .thread-body .thread-title{display:block}.forum-threads-list>ul>li .thread-body .thread-title a:link,.forum-threads-list>ul>li .thread-body .thread-title a:active,.forum-threads-list>ul>li .thread-body .thread-title a:visited,.forum-threads-list>ul>li .thread-body .thread-title a:hover{color:#555;font-size:17.5px}
 .forum-threads-list>ul>li .thread-body .thread-activity{float:right;list-style:none;margin:0;margin-top:-9.9px;margin-bottom:-6px;padding:6px 0;padding-right:8px;overflow:auto;position:relative;top:1px;z-index:2}.forum-threads-list>ul>li .thread-body .thread-activity li{float:left;margin:0;margin-left:10px;padding:0}.forum-threads-list>ul>li .thread-body .thread-activity li.thread-replies,.forum-threads-list>ul>li .thread-body .thread-activity li.thread-replies-reported,.forum-threads-list>ul>li .thread-body .thread-activity li.thread-replies-moderated{position:relative;top:2px;color:#555;font-size:17.5px;font-weight:bold}
 .forum-threads-list>ul>li .thread-body .thread-activity li.thread-replies-reported{color:#cf402e}
@@ -1013,13 +1013,13 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{color:#333;text-decoration:n
 .forum-threads-list .threads-actions{background-color:#fbfbfb;border-top:1px solid #d5d5d5;border-radius:0 0 2px 2px;overflow:auto;padding:4px;color:#999;font-size:11.9px}.forum-threads-list .threads-actions form{margin-bottom:0}
 .forum-threads-extra{overflow:auto}.forum-threads-extra.extra-top{margin-bottom:20px}
 .forum-threads-extra .threads-signin-message{float:right}.forum-threads-extra .threads-signin-message a:link,.forum-threads-extra .threads-signin-message a:visited{color:#333}
-.form-prefix{margin:0;padding:0}.form-prefix .btn{background-color:#d4d4d4;border-color:#a2a2a2;opacity:.9;filter:alpha(opacity=90);outline:none;color:#555;text-shadow:none}.form-prefix .btn.btn-active{background-color:#555;border-color:#222;color:#fff;text-shadow:0 1px 1px #222}
+.form-prefix{margin:0;padding:0}.form-prefix .btn{background-color:#d4d4d4;border-color:#a2a2a2;margin:0 2px;padding:2px 8px;position:relative;top:1px;opacity:.9;filter:alpha(opacity=90);outline:none;color:#555;font-size:14px;text-shadow:none}.form-prefix .btn.btn-active{background-color:#555;border-color:#222;color:#fff;text-shadow:0 1px 1px #222}
 .form-prefix .btn.btn-cancel{background-color:#fff;border-color:#b3b3b3}.form-prefix .btn.btn-cancel:hover,.form-prefix .btn.btn-cancel:active{background-color:#555;border-color:#222;color:#fff;text-shadow:0 1px 1px #222}
 .form-prefix .btn.btn-success,.form-prefix .btn.btn-success:hover,.form-prefix .btn.btn-success:active{background-color:#cdeacd;border-color:#86cb86;color:#46a546}
 .form-prefix .btn.btn-success.btn-active{background-color:#46a546;border-color:#285d28;color:#fff;text-shadow:0 1px 1px #285d28}
 .form-prefix .btn.btn-info,.form-prefix .btn.btn-info:hover,.form-prefix .btn.btn-info:active{background-color:#ade6fe;border-color:#49c7fc;color:#049cdb}
 .form-prefix .btn.btn-info.btn-active{background-color:#049cdb;border-color:#025577;color:#fff;text-shadow:0 1px 1px #025577}
-.form-prefix .btn.btn-warning,.form-prefix .btn.btn-warning:hover,.form-prefix .btn.btn-warning:active{background-color:#fee9cc;border-color:#fbbf69;color:#f89406}
+.form-prefix .btn.btn-warning,.form-prefix .btn.btn-warning:hover,.form-prefix .btn.btn-warning:active{background-color:#fee9cc;border-color:#fbbf69;color:#df8505}
 .form-prefix .btn.btn-warning.btn-active{background-color:#f89406;border-color:#945904;color:#fff;text-shadow:0 1px 1px #945904}
 .form-prefix .btn.btn-important,.form-prefix .btn.btn-important:hover,.form-prefix .btn.btn-important:active{background-color:#f5d7d4;border-color:#e38b80;color:#cf402e}
 .form-prefix .btn.btn-important.btn-active{background-color:#cf402e;border-color:#7c261b;color:#fff;text-shadow:0 1px 1px #7c261b}

+ 7 - 1
static/cranefly/css/cranefly/forum.less

@@ -350,6 +350,7 @@
         padding: (@fontSizeSmall - 2px) 0px;
 
         .thread-prefix {
+          margin-right: @baseFontSize / 2;
           position: relative;
           bottom: 2px;
         }
@@ -611,10 +612,15 @@
   .btn {
     background-color: lighten(@gray, 50%);
     border-color: lighten(@gray, 30%);
+    margin: 0px 2px;
+    padding: 2px 8px;
+    position: relative;
+    top: 1px;
     .opacity(90);
     outline: none;
 
     color: @gray;
+    font-size: @baseFontSize;
     text-shadow: none;
 
     &.btn-active {
@@ -677,7 +683,7 @@
         background-color: lighten(@orange, 40%);
         border-color: lighten(@orange, 20%);
 
-        color: @orange;
+        color: darken(@orange, 5%);
       }
 
       &.btn-active {