Skip to content

Commit 9054f30

Browse files
author
Musa Demir
committed
replace flag-icon with famfamfam-flags.
Since our other projects uses famfamfam-flags we better keep using famfamfam-flags
1 parent ed04607 commit 9054f30

File tree

511 files changed

+1903
-31
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

511 files changed

+1903
-31
lines changed

aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/Seed/Host/DefaultLanguagesCreator.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ private static List<ApplicationLanguage> GetInitialLanguages()
1717
var tenantId = AbpProjectNameConsts.MultiTenancyEnabled ? null : (int?)MultiTenancyConsts.DefaultTenantId;
1818
return new List<ApplicationLanguage>
1919
{
20-
new ApplicationLanguage(tenantId, "en", "English", "flag-icon flag-icon-gb"),
21-
new ApplicationLanguage(tenantId, "ar", "العربية", "flag-icon flag-icon-sa"),
22-
new ApplicationLanguage(tenantId, "de", "German", "flag-icon flag-icon-de"),
23-
new ApplicationLanguage(tenantId, "it", "Italiano", "flag-icon flag-icon-it"),
24-
new ApplicationLanguage(tenantId, "fr", "Français", "flag-icon flag-icon-fr"),
25-
new ApplicationLanguage(tenantId, "pt-BR", "Português", "flag-icon flag-icon-br"),
26-
new ApplicationLanguage(tenantId, "tr", "Türkçe", "flag-icon flag-icon-tr"),
27-
new ApplicationLanguage(tenantId, "ru", "Русский", "flag-icon flag-icon-ru"),
28-
new ApplicationLanguage(tenantId, "zh-Hans", "简体中文", "flag-icon flag-icon-cn"),
29-
new ApplicationLanguage(tenantId, "es-MX", "Español México", "flag-icon flag-icon-mx"),
30-
new ApplicationLanguage(tenantId, "nl", "Nederlands", "flag-icon flag-icon-nl"),
31-
new ApplicationLanguage(tenantId, "ja", "日本語", "flag-icon flag-icon-jp")
20+
new ApplicationLanguage(tenantId, "en", "English", "famfamfam-flags gb"),
21+
new ApplicationLanguage(tenantId, "ar", "العربية", "famfamfam-flags sa"),
22+
new ApplicationLanguage(tenantId, "de", "German", "famfamfam-flags de"),
23+
new ApplicationLanguage(tenantId, "it", "Italiano", "famfamfam-flags it"),
24+
new ApplicationLanguage(tenantId, "fr", "Français", "famfamfam-flags fr"),
25+
new ApplicationLanguage(tenantId, "pt-BR", "Português", "famfamfam-flags br"),
26+
new ApplicationLanguage(tenantId, "tr", "Türkçe", "famfamfam-flags tr"),
27+
new ApplicationLanguage(tenantId, "ru", "Русский", "famfamfam-flags ru"),
28+
new ApplicationLanguage(tenantId, "zh-Hans", "简体中文", "famfamfam-flags cn"),
29+
new ApplicationLanguage(tenantId, "es-MX", "Español México", "famfamfam-flags mx"),
30+
new ApplicationLanguage(tenantId, "nl", "Nederlands", "famfamfam-flags nl"),
31+
new ApplicationLanguage(tenantId, "ja", "日本語", "famfamfam-flags jp")
3232
};
3333
}
3434

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Layout.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<environment names="Development">
3131
<link href="~/libs/font-awesome/css/all.css" rel="stylesheet" asp-append-version="true" />
32-
<link href="~/libs/flag-icon/css/flag-icon.css" rel="stylesheet" asp-append-version="true" />
32+
<link href="~/libs-ext/famfamfam-flags/dist/sprite/famfamfam-flags.min.css" rel="stylesheet" asp-append-version="true" />
3333
<link href="~/libs/icheck-bootstrap/icheck-bootstrap.css" rel="stylesheet" asp-append-version="true" />
3434
<link href="~/libs/toastr/toastr.css" rel="stylesheet" asp-append-version="true" />
3535
<link href="~/libs/animate.css/animate.css" rel="stylesheet" asp-append-version="true" />

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Layout/_Layout.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<environment names="Development">
3232
<link href="~/libs/font-awesome/css/all.min.css" rel="stylesheet" asp-append-version="true" />
33-
<link href="~/libs/flag-icon/css/flag-icon.min.css" rel="stylesheet" asp-append-version="true" />
33+
<link href="~/libs-ext/famfamfam-flags/dist/sprite/famfamfam-flags.min.css" rel="stylesheet" asp-append-version="true" />
3434
<link href="~/libs/animate.css/animate.css" rel="stylesheet" asp-append-version="true" />
3535
<link href="~/libs/icheck-bootstrap/icheck-bootstrap.css" rel="stylesheet" asp-append-version="true" />
3636
<link href="~/libs/toastr/toastr.css" rel="stylesheet" asp-append-version="true" />

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bundleconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"outputFileName": "wwwroot/view-resources/Views/_Bundles/account-layout.min.css",
44
"inputFiles": [
55
"wwwroot/libs/font-awesome/css/all.css",
6-
"wwwroot/libs/flag-icon/css/flag-icon.css",
6+
"wwwroot/libs-ext/famfamfam-flags/dist/sprite/famfamfam-flags.css",
77
"wwwroot/libs/icheck-bootstrap/icheck-bootstrap.css",
88
"wwwroot/libs/toastr/toastr.css",
99
"wwwroot/libs/animate.css/animate.css",
@@ -39,7 +39,7 @@
3939
"outputFileName": "wwwroot/view-resources/Views/_Bundles/shared-layout.min.css",
4040
"inputFiles": [
4141
"wwwroot/libs/font-awesome/css/all.min.css",
42-
"wwwroot/libs/flag-icon/css/flag-icon.min.css",
42+
"wwwroot/libs-ext/famfamfam-flags/dist/sprite/famfamfam-flags.min.css",
4343
"wwwroot/libs/animate.css/animate.css",
4444
"wwwroot/libs/icheck-bootstrap/icheck-bootstrap.css",
4545
"wwwroot/libs/toastr/toastr.css",

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/libman.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,6 @@
102102
"provider": "jsdelivr",
103103
"destination": "wwwroot/libs/font-awesome"
104104
},
105-
{
106-
"library": "[email protected]",
107-
"provider": "jsdelivr",
108-
"destination": "wwwroot/libs/flag-icon"
109-
},
110105
{
111106
"library": "[email protected]",
112107
"provider": "jsdelivr",
Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,31 @@
11
/* prevent the drop down icon going onto a new line for the top bar language link */
22
.top-bar-language-nav-link {
3-
min-width: 65px; }
3+
min-width: 65px;
4+
}
45

56
/* bootstrap model showing two scroll bars */
67
html {
7-
overflow: visible; }
8+
overflow: visible;
9+
}
810

911
/* main sidebar not under model */
1012
.modal {
11-
z-index: 1110; }
13+
z-index: 1110;
14+
}
1215

1316
.form-group.required .col-form-label:after {
14-
color: #d00;
15-
content: "*";
16-
position: absolute;
17-
margin-left: 3px; }
17+
color: #d00;
18+
content: "*";
19+
position: absolute;
20+
margin-left: 3px;
21+
}
1822

1923
.nav-user-menu .user-image {
20-
width: 20px;
21-
margin-right: 4px;
22-
margin-top: -4px; }
24+
width: 20px;
25+
margin-right: 4px;
26+
margin-top: -4px;
27+
}
28+
29+
.famfamfam-flags {
30+
display: inline-block;
31+
}

0 commit comments

Comments
 (0)