Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit a513220

Browse files
cdujeucdujeu
committed
Readapt styles for font-based mimes
1 parent bdc8b8d commit a513220

File tree

7 files changed

+55
-15
lines changed

7 files changed

+55
-15
lines changed

‎core/src/plugins/access.fs/fsActions.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@
10941094
</div>
10951095
]]></html>
10961096
</infoPanel>
1097-
<infoPanel mime="generic_dir" attributes="basename,icon,formated_date,ajxp_description" theme="orbit">
1097+
<infoPanel mime="generic_dir" attributes="basename,icon,fonticon,formated_date,ajxp_description" theme="orbit">
10981098
<messages>
10991099
<message key="name_string" id="133"/>
11001100
<message key="modif_string" id="138"/>
@@ -1103,7 +1103,7 @@
11031103
<html><![CDATA[
11041104
<div class="infoPanelImagePreview">
11051105
<div class="infoPanelBasenameTitle">#{basename}</div>
1106-
<img src="AJXP_THEME_FOLDER/images/mimes/64/#{icon}" height="64" width="64">
1106+
<div class="mimefont mdi mdi-#{fonticon}"></div>
11071107
<br><div class="toolbar_placeholder" data-toolbarId="info_panel" style="margin-top: 15px;"></div>
11081108
<div class="toolbar_placeholder" data-toolbarId="info_panel_share"></div>
11091109
</div>

‎core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -496,12 +496,6 @@ Class.create("FilesList", SelectableElements, {
496496
command = window.actionArguments[0].command;
497497
}
498498
oThis.switchDisplayMode(command);
499-
/*
500-
window.setTimeout(function(){
501-
var item = this.subMenuItems.staticItems.detect(function(item){return item.command == command;});
502-
this.notify("submenu_active", item);
503-
}.bind(window.listenerContext), 500);
504-
*/
505499
}
506500
},
507501
listeners : {

‎core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/src/plugins/gui.ajax/res/themes/orbit/css/components/infopanel.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@
7676
text-align: left;
7777
word-break:break-all;
7878
}
79+
div.mimefont{
80+
font-size: 80px !important;
81+
color: @thumbnail_mimefont_color;
82+
}
7983
}
8084

8185
.infoPanelTable,

‎core/src/plugins/gui.ajax/res/themes/orbit/css/components/selectablelist.less

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
@filelist_tablerow_font_big:12px;
1313
@filelist_tablerow_font_small:10px;
1414

15-
@filelist_thumbnail_background:#f9f9f9;
15+
@filelist_thumbnail_background: #fafafa;
1616
@filelist_thumbnail_label_background:rgba(237, 237, 237, 0.82);
1717
@filelist_thumbnail_label_color:#666;
18+
@thumbnail_mimefont_color: #546E7A;
1819

1920
@filelist_paginator_background:#FFFCE8;
2021

@@ -24,6 +25,7 @@
2425

2526

2627

28+
2729
.class-FilesList{
2830

2931

@@ -110,6 +112,13 @@
110112
display: inline;
111113
margin-right: 5px;
112114
}
115+
.mimefont {
116+
color: @thumbnail_mimefont_color;
117+
line-height: 38px;
118+
}
119+
&.selected-focus .mimefont{
120+
color: @filelist_selection_color;
121+
}
113122
.thumbLabel
114123
{
115124
/*overflow: hidden;*/
@@ -197,9 +206,19 @@
197206

198207
span.list_selectable_span span.text_label{
199208
font-size: @filelist_tablerow_font_big;
200-
padding-left: 27px !important;
209+
/*padding-left: 27px !important;*/
201210
background-position: 5px 4px;
202211
color: @filelist_default_text_color;
212+
.mimefont{
213+
display: inline-block;
214+
float: left;
215+
margin: 0 5px 0 2px;
216+
font-size: 17px;
217+
color: @thumbnail_mimefont_color;
218+
}
219+
}
220+
.selected-focus span.list_selectable_span span.text_label .mimefont {
221+
color: @filelist_selection_color;
203222
}
204223
span#ajxp_label {
205224
font-weight: normal;
@@ -222,7 +241,7 @@
222241

223242
div.thumbnail_selectable_cell{
224243
margin: 1px;
225-
background-color: #ECEFF1 /*@filelist_thumbnail_background*/;
244+
background-color: @filelist_thumbnail_background;
226245
border-radius: 0px;
227246
padding: 0 0 3px;
228247
background-size: cover;

‎core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,13 @@ div.treeCopyContainer div.selected-webfx-tree-item-inactive a {
653653
display: inline;
654654
margin-right: 5px;
655655
}
656+
.class-FilesList .thumbnail_selectable_cell .mimefont {
657+
color: #607d8b;
658+
line-height: 38px;
659+
}
660+
.class-FilesList .thumbnail_selectable_cell.selected-focus .mimefont {
661+
color: #ffffff;
662+
}
656663
.class-FilesList .thumbnail_selectable_cell .thumbLabel {
657664
/*overflow: hidden;*/
658665
white-space: nowrap;
@@ -726,10 +733,20 @@ div.treeCopyContainer div.selected-webfx-tree-item-inactive a {
726733
}
727734
.class-FilesList.fl-displayMode-list .table_rows_container span.list_selectable_span span.text_label {
728735
font-size: 13px;
729-
padding-left: 27px !important;
736+
/*padding-left: 27px !important;*/
730737
background-position: 5px 4px;
731738
color: rgba(0, 0, 0, 0.87);
732739
}
740+
.class-FilesList.fl-displayMode-list .table_rows_container span.list_selectable_span span.text_label .mimefont {
741+
display: inline-block;
742+
float: left;
743+
margin: 0 5px 0 2px;
744+
font-size: 17px;
745+
color: #607d8b;
746+
}
747+
.class-FilesList.fl-displayMode-list .table_rows_container .selected-focus span.list_selectable_span span.text_label .mimefont {
748+
color: #ffffff;
749+
}
733750
.class-FilesList.fl-displayMode-list .table_rows_container span#ajxp_label {
734751
font-weight: normal;
735752
background-size: 16px;
@@ -743,7 +760,7 @@ div.treeCopyContainer div.selected-webfx-tree-item-inactive a {
743760
}
744761
.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell {
745762
margin: 1px;
746-
background-color: #eceff1 /*@filelist_thumbnail_background*/;
763+
background-color: #fafafa;
747764
border-radius: 0px;
748765
padding: 0 0 3px;
749766
background-size: cover;
@@ -4065,6 +4082,11 @@ div.menu.rootDirChooser span.rootDirTitle {
40654082
text-align: left;
40664083
word-break: break-all;
40674084
}
4085+
#info_panel .infoPanelImagePreview div.mimefont,
4086+
.form-ip_content_info_panel .infoPanelImagePreview div.mimefont {
4087+
font-size: 80px !important;
4088+
color: #607d8b;
4089+
}
40684090
#info_panel .infoPanelTable,
40694091
.form-ip_content_info_panel .infoPanelTable,
40704092
#info_panel div.infoPanelRow,

‎core/src/plugins/gui.ajax/res/themes/orbit/css/theme/variables.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,10 @@
146146
@filelist_tablerow_font_big:13px;
147147
@filelist_tablerow_font_small:11px;
148148

149-
@filelist_thumbnail_background:#f9f9f9;
149+
@filelist_thumbnail_background:#fafafa;
150150
@filelist_thumbnail_label_background:@white;
151151
@filelist_thumbnail_label_color:#666;
152+
@thumbnail_mimefont_color: #607D8B;
152153

153154
@filelist_paginator_background:#FFFCE8;
154155

0 commit comments

Comments
 (0)