##// END OF EJS Templates
files view changes: moved add file, download and search to the right, added paddings and margins
Liviu -
r3695:68ed9527 new-ui
parent child Browse files
Show More
@@ -2100,8 +2100,8 b' BIN_FILENODE = 7'
2100 .new-file,
2100 .new-file,
2101 #filter_activate,
2101 #filter_activate,
2102 #filter_deactivate {
2102 #filter_deactivate {
2103 float: left;
2103 float: right;
2104 margin: 0 0 0 15px;
2104 margin: 0 0 0 10px;
2105 }
2105 }
2106
2106
2107 h3.files_location{
2107 h3.files_location{
@@ -2109,11 +2109,12 b' h3.files_location{'
2109 }
2109 }
2110
2110
2111 .browser-nav {
2111 .browser-nav {
2112 width: 100%;
2112 display: table;
2113 display: table;
2113 margin-bottom: @space;
2114 margin-bottom: 20px;
2114
2115
2115
2116 .info_box {
2116 .info_box {
2117 float: left;
2117 display: inline-table;
2118 display: inline-table;
2118 height: 2.5em;
2119 height: 2.5em;
2119
2120
@@ -2122,6 +2123,10 b' h3.files_location{'
2122 vertical-align: middle;
2123 vertical-align: middle;
2123 }
2124 }
2124
2125
2126 .drop-menu {
2127 margin: 0 10px;
2128 }
2129
2125 .info_box_elem {
2130 .info_box_elem {
2126 border-top: @border-thickness solid @grey5;
2131 border-top: @border-thickness solid @grey5;
2127 border-bottom: @border-thickness solid @grey5;
2132 border-bottom: @border-thickness solid @grey5;
@@ -2223,14 +2228,15 b' h3.files_location{'
2223
2228
2224 .files-quick-filter {
2229 .files-quick-filter {
2225 float: right;
2230 float: right;
2226 margin: 0 25px;
2231 width: 180px;
2232 position: relative;
2227 }
2233 }
2228
2234
2229 .files-filter-box {
2235 .files-filter-box {
2230 display: flex;
2236 display: flex;
2231 padding: 0px;
2237 padding: 0px;
2232 border-radius: 3px;
2238 border-radius: 3px;
2233 border: 1px solid @grey3;
2239 margin-bottom: 0;
2234
2240
2235 a {
2241 a {
2236 border: none !important;
2242 border: none !important;
@@ -2241,19 +2247,30 b' h3.files_location{'
2241 }
2247 }
2242 }
2248 }
2243
2249
2244
2245 .files-filter-box-path {
2250 .files-filter-box-path {
2246 line-height: 28px;
2251 line-height: 33px;
2247 padding: 0 5px;
2252 padding: 0;
2248
2253 width: 20px;
2254 position: absolute;
2255 z-index: 11;
2256 left: 5px;
2249 }
2257 }
2250
2258
2251 .files-filter-box-input {
2259 .files-filter-box-input {
2252 background-color: @grey3 !important;
2253 margin-right: 0;
2260 margin-right: 0;
2254
2261
2255 input {
2262 input {
2256 border: none
2263 border: 1px solid @white;
2264 padding-left: 25px;
2265 width: 145px;
2266
2267 &:hover {
2268 border-color: @grey6;
2269 }
2270
2271 &:focus {
2272 border-color: @grey5;
2273 }
2257 }
2274 }
2258 }
2275 }
2259
2276
@@ -33,7 +33,7 b' table.dataTable {'
33 td {
33 td {
34 height: auto;
34 height: auto;
35 max-width: 20%;
35 max-width: 20%;
36 padding: .65em 1em .65em 0;
36 padding: .65em 0 .65em 1em;
37 vertical-align: middle;
37 vertical-align: middle;
38 border-bottom: @border-thickness solid @grey5;
38 border-bottom: @border-thickness solid @grey5;
39 white-space: normal;
39 white-space: normal;
@@ -46,6 +46,8 b' h6, .h6 { font-size: 1em; font-weight'
46 .breadcrumbs {
46 .breadcrumbs {
47 font-size: @repo-title-fontsize;
47 font-size: @repo-title-fontsize;
48 margin: 0;
48 margin: 0;
49 width: ~"calc(100% - 180px)";
50 float: left;
49
51
50 h4 {
52 h4 {
51 font-size: @basefontsize;
53 font-size: @basefontsize;
@@ -3,24 +3,6 b''
3 <div class="browser-header">
3 <div class="browser-header">
4 <div class="browser-nav">
4 <div class="browser-nav">
5
5
6 <div class="files-quick-filter">
7
8 <ul class="files-filter-box">
9
10 <li class="files-filter-box-path">
11 <span class="tag">
12 ${h.get_last_path_part(c.file)}
13 </span>
14 </li>
15
16 <li class="files-filter-box-input">
17 <input onkeydown="NodeFilter.initFilter(event)" class="init" type="text" name="filter" size="25" id="node_filter" autocomplete="off">
18 </li>
19
20 </ul>
21
22 </div>
23
24 <div class="info_box">
6 <div class="info_box">
25
7
26 <div class="info_box_elem previous">
8 <div class="info_box_elem previous">
@@ -40,6 +22,7 b''
40 ${_('Add File')}</a>
22 ${_('Add File')}</a>
41 </div>
23 </div>
42 % endif
24 % endif
25
43 % if c.enable_downloads:
26 % if c.enable_downloads:
44 <% at_path = '{}.zip'.format(request.GET.get('at') or c.commit.raw_id[:6]) %>
27 <% at_path = '{}.zip'.format(request.GET.get('at') or c.commit.raw_id[:6]) %>
45 <div title="${_('Download tree at {}').format(at_path)}" class="btn btn-default new-file">
28 <div title="${_('Download tree at {}').format(at_path)}" class="btn btn-default new-file">
@@ -49,6 +32,16 b''
49 </div>
32 </div>
50 % endif
33 % endif
51
34
35 <div class="files-quick-filter">
36 <ul class="files-filter-box">
37 <li class="files-filter-box-path">
38 <i class="icon-search"></i>
39 </li>
40 <li class="files-filter-box-input">
41 <input onkeydown="NodeFilter.initFilter(event)" class="init" type="text" placeholder="Quick filter" name="filter" size="25" id="node_filter" autocomplete="off">
42 </li>
43 </ul>
44 </div>
52 </div>
45 </div>
53
46
54 </div>
47 </div>
@@ -32,7 +32,6 b''
32 % endif
32 % endif
33
33
34 </div> <!--end summary-detail-->
34 </div> <!--end summary-detail-->
35
36 % if c.file.is_dir():
35 % if c.file.is_dir():
37 <%include file='files_browser.mako'/>
36 <%include file='files_browser.mako'/>
38 % else:
37 % else:
General Comments 0
You need to be logged in to leave comments. Login now