Skip to content

Commit

Permalink
New icons set
Browse files Browse the repository at this point in the history
  • Loading branch information
car031 committed Dec 24, 2024
1 parent 2bd4458 commit 109d4ea
Show file tree
Hide file tree
Showing 22 changed files with 235 additions and 190 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,4 @@ public static boolean showDisabled() {
public static boolean showLicensee() {
return enabled(SHOW_DISABLED);
}

public static boolean isCommercial() {
return enabled(ADDITIONAL_FORMATS);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ public static String getIconHtml(String icon) {

public static String getSpinnerIconHtml(String icon, String text) {
if (text == null || text.isEmpty())
return I_CLASS + getCssClassPrefix() + " fa-" + icon + " fa-lg fa-spinner' aria-hidden='true'></i>";
return I_CLASS + getCssClassPrefix() + " fa-" + icon + " fa-thin fa-spinner' aria-hidden='true'></i>";
else
return DIV_I_CLASS + getCssClassPrefix() + " fa-" + icon
+ " fa-lg fa-fw fa-spinner' aria-hidden='true'></i>&nbsp;" + I18N.message(text) + CLOSE_DIV;
+ " fa-thin fa-fw fa-spinner' aria-hidden='true'></i>&nbsp;" + I18N.message(text) + CLOSE_DIV;
}

public static String getIconButtonHTML(String icon, String text, String tooltip, String color, String url) {
Expand Down Expand Up @@ -217,10 +217,15 @@ public static String getIndexedIcon(Integer indexed) {
return "";
String html = AwesomeFactory.getIconHtml("database");
if (indexed == Constants.INDEX_SKIP) {
// html = "<span class='fa-stack'><i class='" + getCssClassPrefix()
// + " fa-database fa-stack-1x fa-thin' aria-hidden='true' data-fa-transform='grow-6'></i>";
// html += I_CLASS + AwesomeFactory.getCssClassPrefix()
// + " fa-times fa-stack-1x' style='color: red' data-fa-transform='grow-2'></i></span>";

html = "<span class='fa-stack'><i class='" + getCssClassPrefix()
+ " fa-database fa-stack-1x' aria-hidden='true' data-fa-transform='grow-6'></i>";
+ " fa-database fa-stack-1x fa-thin' aria-hidden='true' ></i>";
html += I_CLASS + AwesomeFactory.getCssClassPrefix()
+ " fa-times fa-stack-1x' style='color: red' data-fa-transform='grow-2'></i></span>";
+ " fa-times fa-stack-1x' style='color: red' ></i></span>";
}
return html;
}
Expand All @@ -236,18 +241,18 @@ public static String getColoredIconHtml(String icon, String text, String color)
public static String getIconHtml(String icon, String rotation, String text) {
if (text == null || text.isEmpty())
return I_CLASS + getCssClassPrefix() + " fa-" + icon + (rotation != null ? " " + rotation : "")
+ " fa-lg' aria-hidden='true'></i>";
+ " fa-thin' aria-hidden='true'></i>";
else
return DIV_I_CLASS + getCssClassPrefix() + " fa-" + icon + (rotation != null ? " " + rotation : "")
+ " fa-lg fa-fw' aria-hidden='true'></i> " + I18N.message(text) + CLOSE_DIV;
+ " fa-thin fa-fw' aria-hidden='true'></i> " + I18N.message(text) + CLOSE_DIV;
}

public static String getColoredIconHtmlWithoutI18N(String icon, String text, String color) {
if (text == null || text.isEmpty())
return I_CLASS + getCssClassPrefix() + " fa-" + icon + " fa-lg' aria-hidden='true' "
return I_CLASS + getCssClassPrefix() + " fa-" + icon + " fa-thin' aria-hidden='true' "
+ (color != null && !color.isEmpty() ? "style='color: " + color + "'" : "") + "></i>";
else
return DIV_I_CLASS + getCssClassPrefix() + " fa-" + icon + " fa-lg fa-fw' aria-hidden='true'"
return DIV_I_CLASS + getCssClassPrefix() + " fa-" + icon + " fa-thin fa-fw' aria-hidden='true'"
+ (color != null && !color.isEmpty() ? "style='color: " + color + "'" : "") + "></i> " + text
+ CLOSE_DIV;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,11 @@ public static String getFolderIcon(boolean open, int type, String name, String c
html = AwesomeFactory.getColoredIconHtmlWithoutI18N("cube", name, color);
else if (type == GUIFolder.TYPE_ALIAS) {
html = "<div><span class='fa-layers fa-fw'>";
html += "<i class='" + AwesomeFactory.getCssClassPrefix() + " fa-lg fa-fw fa-"
html += "<i class='" + AwesomeFactory.getCssClassPrefix() + " fa-thin fa-fw fa-"
+ (open ? "folder-open" : "folder") + " ' "
+ (color != null && !color.isEmpty() ? "style='color: " + color + "'" : "") + "></i>";
// This is the small alias arrow
html += "<i class='fas fa-lg fa-fw fa-share' data-fa-transform='shrink-10 down-2 right-2'></i></span>&nbsp;&nbsp;&nbsp;";
html += "<i class='fas fa-thin fa-fw fa-share' data-fa-transform='shrink-10 down-2 right-2'></i></span>&nbsp;&nbsp;&nbsp;";
html += name + "</div>";
} else {
if (open)
Expand Down
Loading

0 comments on commit 109d4ea

Please sign in to comment.