浏览代码

fix design btn mark as read

Skylsmoi 8 年前
父节点
当前提交
dd2f5a87a4

+ 10 - 1
tracim/tracim/public/assets/css/dashboard.css 查看文件

241
     margin-bottom: 0;
241
     margin-bottom: 0;
242
 }
242
 }
243
 
243
 
244
-#sidebar-right, a.btn { font-size: 1.2em; text-align: left;}
244
+#sidebar-right { font-size: 1.2em; text-align: left;}
245
+#sidebar-right .btn { text-align: left; }
245
 #sidebar-right .btn-group-vertical { width: 100%; }
246
 #sidebar-right .btn-group-vertical { width: 100%; }
246
 
247
 
247
 th { text-align: center; }
248
 th { text-align: center; }
461
 .workspace__detail__wrapper {
462
 .workspace__detail__wrapper {
462
   padding: 0 15px;
463
   padding: 0 15px;
463
 }
464
 }
465
+.workspace__detail__wrapper__btnTagAsRead {
466
+  float: right;
467
+  font-size: 14px;
468
+}
464
 
469
 
465
 .content__detail {
470
 .content__detail {
466
   padding: 0 15px;
471
   padding: 0 15px;
590
   background-color: #bce8f1;
595
   background-color: #bce8f1;
591
   color: #31708f;
596
   color: #31708f;
592
 }
597
 }
598
+.content__home__tab__content-unread {
599
+    float: right;
600
+  margin-bottom: 15px;
601
+}
593
 
602
 
594
 @media (max-width: 999px) {
603
 @media (max-width: 999px) {
595
   body {
604
   body {

+ 4 - 1
tracim/tracim/templates/home.mak 查看文件

96
                 % if fake_api.last_unread.nb <= 0:
96
                 % if fake_api.last_unread.nb <= 0:
97
                     ${P.EMPTY_CONTENT(_('No new content.'))}
97
                     ${P.EMPTY_CONTENT(_('No new content.'))}
98
                 % else:
98
                 % else:
99
-                    <a href="${tg.url('/content/mark_all_read')}" class="btn btn-default"> ${_('Mark everything as read')} </a>
99
+                    <a href="${tg.url('/content/mark_all_read')}" class="content__home__tab__content-unread btn btn-default">
100
+                        <i class="fa fa-check-circle-o"></i>
101
+                        ${_('Mark everything as read')}
102
+                    </a>
100
                     <table class="table table-hover">
103
                     <table class="table table-hover">
101
                         % for item in fake_api.last_unread.contents:
104
                         % for item in fake_api.last_unread.contents:
102
                             <tr>
105
                             <tr>

+ 7 - 5
tracim/tracim/templates/workspace/getone.mak 查看文件

54
 
54
 
55
 
55
 
56
 <div class="workspace__detail__wrapper">
56
 <div class="workspace__detail__wrapper">
57
-     %if fake_api.last_unread.nb > 0:
58
-         <% workspace_id = result.workspace.id %>
59
-         <a href="${tg.url('/workspaces/{ws_id}/mark_read'.format(ws_id = workspace_id))}" class="btn btn-default"> ${_('Mark this workspace as read')} </a>
60
-
61
-     %endif
57
+    %if fake_api.last_unread.nb > 0:
58
+        <% workspace_id = result.workspace.id %>
59
+        <a href="${tg.url('/workspaces/{ws_id}/mark_read'.format(ws_id = workspace_id))}" class="workspace__detail__wrapper__btnTagAsRead btn btn-default">
60
+            <i class="fa fa-check-circle-o"></i>
61
+            ${_('Mark this workspace as read')}
62
+        </a>
63
+    %endif
62
 
64
 
63
     ${TITLE.H3(_('Detail'), 'fa-align-justify', 'workspace-members')}
65
     ${TITLE.H3(_('Detail'), 'fa-align-justify', 'workspace-members')}
64
     % if result.workspace.description:
66
     % if result.workspace.description: