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

Commit

Permalink
Readapt styles for font-based mimes
Browse files Browse the repository at this point in the history 
(cherry picked from commit a513220)
  • Loading branch information
@cdujeu
cdujeu committed Jul 11, 2016
1 parent 91d493e commit 1fd5b29
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 15 deletions.
4 changes: 2 additions & 2 deletions core/src/plugins/access.fs/fsActions.xml
View file
Expand Up @@ -1105,7 +1105,7 @@
</div>
]]></html>
</infoPanel>
<infoPanel mime="generic_dir" attributes="basename,icon,formated_date,ajxp_description" theme="orbit">
<infoPanel mime="generic_dir" attributes="basename,icon,fonticon,formated_date,ajxp_description" theme="orbit">
<messages>
<message key="name_string" id="133"/>
<message key="modif_string" id="138"/>
Expand All @@ -1114,7 +1114,7 @@
<html><![CDATA[
<div class="infoPanelImagePreview">
<div class="infoPanelBasenameTitle">#{basename}</div>
<img src="AJXP_THEME_FOLDER/images/mimes/64/#{icon}" height="64" width="64">
<div class="mimefont mdi mdi-#{fonticon}"></div>
<br><div class="toolbar_placeholder" data-toolbarId="info_panel" style="margin-top: 15px;"></div>
<div class="toolbar_placeholder" data-toolbarId="info_panel_share"></div>
</div>
Expand Down
6 changes: 0 additions & 6 deletions core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js
View file
Expand Up @@ -496,12 +496,6 @@ Class.create("FilesList", SelectableElements, {
command = window.actionArguments[0].command;
}
oThis.switchDisplayMode(command);
/*
window.setTimeout(function(){
var item = this.subMenuItems.staticItems.detect(function(item){return item.command == command;});
this.notify("submenu_active", item);
}.bind(window.listenerContext), 500);
*/
}
},
listeners : {
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/components/infopanel.less
View file
Expand Up @@ -76,6 +76,10 @@
text-align: left;
word-break:break-all;
}
div.mimefont{
font-size: 80px !important;
color: @thumbnail_mimefont_color;
}
}

.infoPanelTable,
Expand Down
25 changes: 22 additions & 3 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/components/selectablelist.less
View file
Expand Up @@ -12,9 +12,10 @@
@filelist_tablerow_font_big:12px;
@filelist_tablerow_font_small:10px;

@filelist_thumbnail_background:#f9f9f9;
@filelist_thumbnail_background: #fafafa;
@filelist_thumbnail_label_background:rgba(237, 237, 237, 0.82);
@filelist_thumbnail_label_color:#666;
@thumbnail_mimefont_color: #546E7A;

@filelist_paginator_background:#FFFCE8;

Expand All @@ -24,6 +25,7 @@




.class-FilesList{


Expand Down Expand Up @@ -110,6 +112,13 @@
display: inline;
margin-right: 5px;
}
.mimefont {
color: @thumbnail_mimefont_color;
line-height: 38px;
}
&.selected-focus .mimefont{
color: @filelist_selection_color;
}
.thumbLabel
{
/*overflow: hidden;*/
Expand Down Expand Up @@ -197,9 +206,19 @@

span.list_selectable_span span.text_label{
font-size: @filelist_tablerow_font_big;
padding-left: 27px !important;
/*padding-left: 27px !important;*/
background-position: 5px 4px;
color: @filelist_default_text_color;
.mimefont{
display: inline-block;
float: left;
margin: 0 5px 0 2px;
font-size: 17px;
color: @thumbnail_mimefont_color;
}
}
.selected-focus span.list_selectable_span span.text_label .mimefont {
color: @filelist_selection_color;
}
span#ajxp_label {
font-weight: normal;
Expand All @@ -222,7 +241,7 @@

div.thumbnail_selectable_cell{
margin: 1px;
background-color: #ECEFF1 /*@filelist_thumbnail_background*/;
background-color: @filelist_thumbnail_background;
border-radius: 0px;
padding: 0 0 3px;
background-size: cover;
Expand Down
26 changes: 24 additions & 2 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css
View file
Expand Up @@ -653,6 +653,13 @@ div.treeCopyContainer div.selected-webfx-tree-item-inactive a {
display: inline;
margin-right: 5px;
}
.class-FilesList .thumbnail_selectable_cell .mimefont {
color: #607d8b;
line-height: 38px;
}
.class-FilesList .thumbnail_selectable_cell.selected-focus .mimefont {
color: #ffffff;
}
.class-FilesList .thumbnail_selectable_cell .thumbLabel {
/*overflow: hidden;*/
white-space: nowrap;
Expand Down Expand Up @@ -726,10 +733,20 @@ div.treeCopyContainer div.selected-webfx-tree-item-inactive a {
}
.class-FilesList.fl-displayMode-list .table_rows_container span.list_selectable_span span.text_label {
font-size: 13px;
padding-left: 27px !important;
/*padding-left: 27px !important;*/
background-position: 5px 4px;
color: rgba(0, 0, 0, 0.87);
}
.class-FilesList.fl-displayMode-list .table_rows_container span.list_selectable_span span.text_label .mimefont {
display: inline-block;
float: left;
margin: 0 5px 0 2px;
font-size: 17px;
color: #607d8b;
}
.class-FilesList.fl-displayMode-list .table_rows_container .selected-focus span.list_selectable_span span.text_label .mimefont {
color: #ffffff;
}
.class-FilesList.fl-displayMode-list .table_rows_container span#ajxp_label {
font-weight: normal;
background-size: 16px;
Expand All @@ -743,7 +760,7 @@ div.treeCopyContainer div.selected-webfx-tree-item-inactive a {
}
.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell {
margin: 1px;
background-color: #eceff1 /*@filelist_thumbnail_background*/;
background-color: #fafafa;
border-radius: 0px;
padding: 0 0 3px;
background-size: cover;
Expand Down Expand Up @@ -5117,6 +5134,11 @@ div.menu.rootDirChooser span.rootDirTitle {
text-align: left;
word-break: break-all;
}
#info_panel .infoPanelImagePreview div.mimefont,
.form-ip_content_info_panel .infoPanelImagePreview div.mimefont {
font-size: 80px !important;
color: #607d8b;
}
#info_panel .infoPanelTable,
.form-ip_content_info_panel .infoPanelTable,
#info_panel div.infoPanelRow,
Expand Down
3 changes: 2 additions & 1 deletion core/src/plugins/gui.ajax/res/themes/orbit/css/theme/variables.less
View file
Expand Up @@ -146,9 +146,10 @@
@filelist_tablerow_font_big:13px;
@filelist_tablerow_font_small:11px;

@filelist_thumbnail_background:#f9f9f9;
@filelist_thumbnail_background:#fafafa;
@filelist_thumbnail_label_background:@white;
@filelist_thumbnail_label_color:#666;
@thumbnail_mimefont_color: #607D8B;

@filelist_paginator_background:#FFFCE8;

Expand Down

0 comments on commit 1fd5b29

Please sign in to comment.