Browse Source

[#388] move folder popup is now in light background

Skylsmoi 6 years ago
parent
commit
7d9ead3a4e

+ 10 - 2
tracim/tracim/public/assets/css/dashboard.css View File

125
   font-size: 16px;
125
   font-size: 16px;
126
 }
126
 }
127
 .header__navbar__switch-mode.switch-work-mode {
127
 .header__navbar__switch-mode.switch-work-mode {
128
-    background-color: #eee;
129
-    color: #333;
128
+  background-color: #eee;
129
+  color: #333;
130
+}
131
+
132
+#move_folder_popup .sidebarleft {
133
+  border: 1px solid #ddd;
134
+  border-top-width: 0;
135
+}
136
+#move_folder_popup .sidebarleft__menu__item__link {
137
+  color: #333;
130
 }
138
 }
131
 
139
 
132
 /*
140
 /*

+ 2 - 2
tracim/tracim/templates/folder/forms.mak View File

51
                     <li role="presentation"><a href="#move-to-another-workspace" aria-controls="move-to-another-workspace" role="tab" data-toggle="tab">${_('to another workspace')}</a></li>
51
                     <li role="presentation"><a href="#move-to-another-workspace" aria-controls="move-to-another-workspace" role="tab" data-toggle="tab">${_('to another workspace')}</a></li>
52
                 </ul>
52
                 </ul>
53
                 <div class="tab-content">
53
                 <div class="tab-content">
54
-                    <div role="tabpanel" class="tab-pane active bg-primary" id="move-to-same-workspace"></div>
54
+                    <div role="tabpanel" class="tab-pane active" id="move-to-same-workspace"></div>
55
                     <%
55
                     <%
56
                       selected_id = 'workspace_{}__folder_{}'.format(item.workspace.id, item.folder.id if item.folder else '')
56
                       selected_id = 'workspace_{}__folder_{}'.format(item.workspace.id, item.folder.id if item.folder else '')
57
                       apiPath = tg.url('/workspaces/treeview_root')
57
                       apiPath = tg.url('/workspaces/treeview_root')
60
                       apiChildParameters = tg.url('', dict(ignore_id=item.id, allowed_content_types='folder'))
60
                       apiChildParameters = tg.url('', dict(ignore_id=item.id, allowed_content_types='folder'))
61
                     %>
61
                     %>
62
                     ${LEFT_MENU.TREEVIEW('move-to-same-workspace', apiPath, apiParameters, apiChildPath, apiChildParameters, 'True')}
62
                     ${LEFT_MENU.TREEVIEW('move-to-same-workspace', apiPath, apiParameters, apiChildPath, apiChildParameters, 'True')}
63
-                    <div role="tabpanel" class="tab-pane bg-primary" id="move-to-another-workspace"></div>
63
+                    <div role="tabpanel" class="tab-pane" id="move-to-another-workspace"></div>
64
                     <%
64
                     <%
65
                       apiPath = tg.url('/workspaces/treeview_root')
65
                       apiPath = tg.url('/workspaces/treeview_root')
66
                       apiParameters = tg.url('', dict(current_id=None, all_workspaces=1, folder_allowed_content_types='folder', ignore_id=item.id, ignore_workspace_id=item.workspace.id))
66
                       apiParameters = tg.url('', dict(current_id=None, all_workspaces=1, folder_allowed_content_types='folder', ignore_id=item.id, ignore_workspace_id=item.workspace.id))