Skip to content

Commit 109d4ea

Browse files
committed
New icons set
1 parent 2bd4458 commit 109d4ea

File tree

22 files changed

+235
-190
lines changed

22 files changed

+235
-190
lines changed

logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/Feature.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,4 @@ public static boolean showDisabled() {
264264
public static boolean showLicensee() {
265265
return enabled(SHOW_DISABLED);
266266
}
267-
268-
public static boolean isCommercial() {
269-
return enabled(ADDITIONAL_FORMATS);
270-
}
271267
}

logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/util/AwesomeFactory.java

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ public static String getIconHtml(String icon) {
149149

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

158158
public static String getIconButtonHTML(String icon, String text, String tooltip, String color, String url) {
@@ -217,10 +217,15 @@ public static String getIndexedIcon(Integer indexed) {
217217
return "";
218218
String html = AwesomeFactory.getIconHtml("database");
219219
if (indexed == Constants.INDEX_SKIP) {
220+
// html = "<span class='fa-stack'><i class='" + getCssClassPrefix()
221+
// + " fa-database fa-stack-1x fa-thin' aria-hidden='true' data-fa-transform='grow-6'></i>";
222+
// html += I_CLASS + AwesomeFactory.getCssClassPrefix()
223+
// + " fa-times fa-stack-1x' style='color: red' data-fa-transform='grow-2'></i></span>";
224+
220225
html = "<span class='fa-stack'><i class='" + getCssClassPrefix()
221-
+ " fa-database fa-stack-1x' aria-hidden='true' data-fa-transform='grow-6'></i>";
226+
+ " fa-database fa-stack-1x fa-thin' aria-hidden='true' ></i>";
222227
html += I_CLASS + AwesomeFactory.getCssClassPrefix()
223-
+ " fa-times fa-stack-1x' style='color: red' data-fa-transform='grow-2'></i></span>";
228+
+ " fa-times fa-stack-1x' style='color: red' ></i></span>";
224229
}
225230
return html;
226231
}
@@ -236,18 +241,18 @@ public static String getColoredIconHtml(String icon, String text, String color)
236241
public static String getIconHtml(String icon, String rotation, String text) {
237242
if (text == null || text.isEmpty())
238243
return I_CLASS + getCssClassPrefix() + " fa-" + icon + (rotation != null ? " " + rotation : "")
239-
+ " fa-lg' aria-hidden='true'></i>";
244+
+ " fa-thin' aria-hidden='true'></i>";
240245
else
241246
return DIV_I_CLASS + getCssClassPrefix() + " fa-" + icon + (rotation != null ? " " + rotation : "")
242-
+ " fa-lg fa-fw' aria-hidden='true'></i> " + I18N.message(text) + CLOSE_DIV;
247+
+ " fa-thin fa-fw' aria-hidden='true'></i> " + I18N.message(text) + CLOSE_DIV;
243248
}
244249

245250
public static String getColoredIconHtmlWithoutI18N(String icon, String text, String color) {
246251
if (text == null || text.isEmpty())
247-
return I_CLASS + getCssClassPrefix() + " fa-" + icon + " fa-lg' aria-hidden='true' "
252+
return I_CLASS + getCssClassPrefix() + " fa-" + icon + " fa-thin' aria-hidden='true' "
248253
+ (color != null && !color.isEmpty() ? "style='color: " + color + "'" : "") + "></i>";
249254
else
250-
return DIV_I_CLASS + getCssClassPrefix() + " fa-" + icon + " fa-lg fa-fw' aria-hidden='true'"
255+
return DIV_I_CLASS + getCssClassPrefix() + " fa-" + icon + " fa-thin fa-fw' aria-hidden='true'"
251256
+ (color != null && !color.isEmpty() ? "style='color: " + color + "'" : "") + "></i> " + text
252257
+ CLOSE_DIV;
253258
}

logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/util/DocUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,11 @@ public static String getFolderIcon(boolean open, int type, String name, String c
159159
html = AwesomeFactory.getColoredIconHtmlWithoutI18N("cube", name, color);
160160
else if (type == GUIFolder.TYPE_ALIAS) {
161161
html = "<div><span class='fa-layers fa-fw'>";
162-
html += "<i class='" + AwesomeFactory.getCssClassPrefix() + " fa-lg fa-fw fa-"
162+
html += "<i class='" + AwesomeFactory.getCssClassPrefix() + " fa-thin fa-fw fa-"
163163
+ (open ? "folder-open" : "folder") + " ' "
164164
+ (color != null && !color.isEmpty() ? "style='color: " + color + "'" : "") + "></i>";
165165
// This is the small alias arrow
166-
html += "<i class='fas fa-lg fa-fw fa-share' data-fa-transform='shrink-10 down-2 right-2'></i></span>&nbsp;&nbsp;&nbsp;";
166+
html += "<i class='fas fa-thin fa-fw fa-share' data-fa-transform='shrink-10 down-2 right-2'></i></span>&nbsp;&nbsp;&nbsp;";
167167
html += name + "</div>";
168168
} else {
169169
if (open)

0 commit comments

Comments
 (0)