Skip to content

Commit 21832a9

Browse files
Vatsal6288Vatsal6288
authored
Merge pull request #1 from themeselection/design-update
Merging: design-update branch to main branch
2 parents bfad478 + e3955e9 commit 21832a9

File tree

146 files changed

+32118
-34574
lines changed

Some content is hidden

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

146 files changed

+32118
-34574
lines changed

‎AspnetCoreMvcFull.sln

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.8.34322.80
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspnetCoreMvcFull", "AspnetCoreMvcFull.csproj", "{9618F5B9-8BCD-4A87-ADF5-D4A4935FB0A6}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspnetCoreMvcFull", "AspnetCoreMvcFull.csproj", "{B3F387EE-69F2-410B-BF7C-D48AD6403234}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
1111
Release|Any CPU = Release|Any CPU
1212
EndGlobalSection
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{9618F5B9-8BCD-4A87-ADF5-D4A4935FB0A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{9618F5B9-8BCD-4A87-ADF5-D4A4935FB0A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{9618F5B9-8BCD-4A87-ADF5-D4A4935FB0A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{9618F5B9-8BCD-4A87-ADF5-D4A4935FB0A6}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{B3F387EE-69F2-410B-BF7C-D48AD6403234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{B3F387EE-69F2-410B-BF7C-D48AD6403234}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{B3F387EE-69F2-410B-BF7C-D48AD6403234}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{B3F387EE-69F2-410B-BF7C-D48AD6403234}.Release|Any CPU.Build.0 = Release|Any CPU
1818
EndGlobalSection
1919
GlobalSection(SolutionProperties) = preSolution
2020
HideSolutionNode = FALSE
2121
EndGlobalSection
2222
GlobalSection(ExtensibilityGlobals) = postSolution
23-
SolutionGuid = {E129492E-9D1C-4963-8F37-96CE8E204C18}
23+
SolutionGuid = {D80F505E-3FBC-4ADC-BE79-BD5DED605BAA}
2424
EndGlobalSection
2525
EndGlobal

‎Controllers/IconsController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ namespace AspnetCoreMvcFull.Controllers;
66

77
public class IconsController : Controller
88
{
9-
public IActionResult MdiIcons() => View();
9+
public IActionResult RiIcons() => View();
1010
}

‎Gulpfile.js

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,22 @@ const buildCssTask = function (cb) {
6565
// If conf.minify == true, generate compressed style without sourcemap
6666
gulpIf(
6767
conf.minify,
68-
`sass src/site.scss:${conf.distPath}/css/site.css src/scss:${conf.distPath}/vendor/css src/fonts:${conf.distPath}/vendor/fonts src/libs:${conf.distPath}/vendor/libs --style compressed --no-source-map`,
68+
`sass --load-path=node_modules/ src/site.scss:${conf.distPath}/css/site.css src/scss:${conf.distPath}/vendor/css src/fonts:${conf.distPath}/vendor/fonts src/libs:${conf.distPath}/vendor/libs --style compressed --no-source-map`,
6969
gulpIf(
7070
conf.fastDev,
71-
`sass src/site.scss:${conf.distPath}/css/site.css src/scss:${conf.distPath}/vendor/css src/scss/pages:${conf.distPath}/vendor/css/pages src/fonts:${conf.distPath}/vendor/fonts src/libs:${conf.distPath}/vendor/libs --no-source-map`
71+
`sass --load-path=node_modules/ src/site.scss:${conf.distPath}/css/site.css src/scss:${conf.distPath}/vendor/css src/scss/pages:${conf.distPath}/vendor/css/pages src/fonts:${conf.distPath}/vendor/fonts src/libs:${conf.distPath}/vendor/libs --no-source-map`
7272
)
7373
),
7474
function (err) {
7575
cb(err);
7676
}
7777
),
78-
sass({
79-
outputStyle: conf.minify ? 'compressed' : 'expanded'
80-
}).on('error', sass.logError)
78+
sass
79+
.sync({
80+
includePaths: ['node_modules'], // Add this line to include node_modules
81+
outputStyle: conf.minify ? 'compressed' : 'expanded'
82+
})
83+
.on('error', sass.logError)
8184
)
8285
)
8386
.pipe(gulpIf(conf.sourcemaps, sourcemaps.write()))
@@ -88,7 +91,8 @@ const buildCssTask = function (cb) {
8891
path.dirname = path.dirname.replace('scss', 'css');
8992
})
9093
)
91-
.pipe(dest(conf.distPath));
94+
.pipe(dest(conf.distPath))
95+
.pipe(browserSync.stream());
9296
};
9397

9498
// Build JS
@@ -147,8 +151,14 @@ const pageJsTask = function () {
147151

148152
const FONT_TASKS = [
149153
{
150-
name: 'materialdesignicons',
151-
path: 'node_modules/@mdi/font/fonts/*'
154+
name: 'remixicon',
155+
path: [
156+
'node_modules/remixicon/fonts/remixicon.eot',
157+
'node_modules/remixicon/fonts/remixicon.ttf',
158+
'node_modules/remixicon/fonts/remixicon.woff',
159+
'node_modules/remixicon/fonts/remixicon.woff2',
160+
'node_modules/remixicon/fonts/remixicon.svg'
161+
]
152162
}
153163
].reduce(function (tasks, font) {
154164
const functionName = `buildFonts${font.name.replace(/^./, m => m.toUpperCase())}Task`;

‎README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<p align="center">
22
<a href="https://themeselection.com/item/materio-free-aspnet-core-mvc-admin-template/" target="_blank">
3-
<img src="https://user-images.githubusercontent.com/749684/150333149-805037bc-8874-4a1f-876a-61a9683f8ef5.png" alt="materio-logo" width="30px" height="auto">
3+
<img src="https://cdn.themeselection.com/ts-assets/materio/logo/logo.png" alt="materio-logo" width="40px" height="auto">
44
</a>
55
</p>
66

@@ -14,13 +14,13 @@
1414

1515
![GitHub](https://img.shields.io/github/license/themeselection/materio-bootstrap-html-aspnet-core-mvc-admin-template-free) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/themeselection/materio-bootstrap-html-aspnet-core-mvc-admin-template-free) ![GitHub issues](https://img.shields.io/github/issues/themeselection/materio-bootstrap-html-aspnet-core-mvc-admin-template-free) ![GitHub closed issues](https://img.shields.io/github/issues-closed/themeselection/materio-bootstrap-html-aspnet-core-mvc-admin-template-free) ![Twitter Follow](https://img.shields.io/twitter/follow/Theme_Selection?style=social)
1616

17-
<kbd>[![Materio - Free Bootstrap 5 .Net Core MVC Admin Template Demo Screenshot](https://cdn.jsdelivr.net/gh/themeselection/ts-assets/materio/materio-bootstrap-aspnet-core-mvc-admin-template-free/banner/banner.png)](https://themeselection.com/item/materio-free-aspnet-core-mvc-admin-template/)</kbd>
17+
<kbd>[![Materio - Free Bootstrap 5 .Net Core MVC Admin Template Demo Screenshot](https://cdn.themeselection.com/ts-assets/materio/materio-bootstrap-aspnet-core-mvc-admin-template-free/banner/banner.png)](https://themeselection.com/item/materio-free-aspnet-core-mvc-admin-template/)</kbd>
1818

1919
## Introduction 🚀
2020

21-
If you’re a developer looking for the most Powerful & comprehensive [**Free Bootstrap 5 ASPNET Core MVC Admin Template**](https://themeselection.com/item/materio-bootstrap-html-aspnet-core-mvc-admin-template-free/) built for developers, rich with features, and highly customizable look no further than Materio. We’ve followed the highest industry standards to bring you the very best admin template that is not only fast and easy to use but highly scalable. Offering ultimate convenience and flexibility, you’ll be able to build whatever application you want with very little hassle.
21+
If you’re a developer looking for the most Powerful & comprehensive [**Free Bootstrap 5 ASPNET Core MVC Admin Template**](https://themeselection.com/item/materio-free-aspnet-core-mvc-admin-template/) built for developers, rich with features, and highly customizable look no further than Materio. We’ve followed the highest industry standards to bring you the very best admin template that is not only fast and easy to use but highly scalable. Offering ultimate convenience and flexibility, you’ll be able to build whatever application you want with very little hassle.
2222

23-
Build premium quality applications with ease. Use our innovative [Aspnet Core MVC Bootstrap admin template](https://themeselection.com/item/category/bootstrap-admin-templates/) to create eye-catching, high-quality WebApps. Your apps will be completely responsive, ensuring they’ll look stunning and function flawlessly on desktops, tablets, and mobile devices.
23+
Build premium quality applications with ease. Use our innovative [Aspnet Core MVC Bootstrap admin template](https://themeselection.com/item/category/asp-net-dashboard/) to create eye-catching, high-quality WebApps. Your apps will be completely responsive, ensuring they’ll look stunning and function flawlessly on desktops, tablets, and mobile devices.
2424

2525
[View Demo](https://demos.themeselection.com/materio-aspnet-core-mvc-admin-template-free/html/)
2626

@@ -51,7 +51,7 @@ Please [visit](https://demos.themeselection.com/materio-bootstrap-html-admin-tem
5151
- Extended UI
5252
- Perfect Scrollbar
5353
- Text Divider
54-
- Material Design Icons (MDI)
54+
- Remix Icons (RI)
5555
- Form Elements
5656
- Basic Inputs
5757
- Input Groups
@@ -72,7 +72,7 @@ Please [visit](https://demos.themeselection.com/materio-bootstrap-html-admin-tem
7272
| Fixed Layout(Menu) | Fixed & Static Layout(Menu) |
7373
| 1 Simple Dashboard | 5 Niche Dashboards |
7474
| - | Multiple Ready Applications like Calendar, Invoice, Users List, Users View, Roles and Permission,Transactions(CRUD) etc. |
75-
| Simple From Elements | Advance form elements, validation & form wizard |
75+
| Simple Form Elements | Advance form elements, validation & form wizard |
7676
| Basic Cards | Basic, Advance, Statistics, Analytics, Gamification and Actions Cards |
7777
| Basic User Interface(Components) | Advance and Custom User Interfaces(Components) |
7878
| Two Extended Components | Twelve Ready to use Extended Components |
@@ -85,7 +85,7 @@ Please [visit](https://demos.themeselection.com/materio-bootstrap-html-admin-tem
8585
| 1 Chart Library | 2 Chart Libraries |
8686
| - | Multiple Navbar & Menu Options |
8787
| - | Starter-kit |
88-
| - | Internationalization support, Docker support |
88+
| - | Internationalization support |
8989
| - | RTL Support |
9090
| Regular Support | Priority Support |
9191
| Detailed Documentation | Detailed Documentation |
@@ -124,7 +124,7 @@ Contribution are always welcome and recommended! Here is how:
124124

125125
## Changelog 📆
126126

127-
Please refer to the [CHANGELOG](CHANGELOG.md) file. We will add detailed release notes to each new release.
127+
Please refer to the [CHANGELOG](CHANGELOG.md) file. We will add a detailed release notes to each new release.
128128

129129
## Support 🧑🏻‍💻
130130

@@ -168,21 +168,21 @@ For free products, enjoy community support via GitHub issues. Upgrade to Premium
168168

169169
**[ThemeSelection](https://themeselection.com/)** provides Selected high quality, modern design, professional and easy-to-use **Fully Coded Dashboard Templates & UI Kits** to create your applications faster!
170170

171-
- [Bootstrap Admin Templates](https://themeselection.com/products/category/bootstrap-admin-templates/)
172-
- [VueJS Admin Templates](https://themeselection.com/products/category/vuejs-admin-templates/)
173-
- [Laravel Admin Templates](https://themeselection.com/products/category/laravel-admin-templates/)
171+
- [Bootstrap Admin Templates](https://themeselection.com/item/category/bootstrap-admin-templates/)
172+
- [VueJS Admin Templates](https://themeselection.com/item/category/vuejs-admin-templates/)
173+
- [Laravel Admin Templates](https://themeselection.com/item/category/laravel-admin-templates/)
174174
- [Django Admin Templates](https://themeselection.com/item/category/django-admin-template/)
175175
- [React (NextJS) Admin Templates](https://themeselection.com/item/category/next-js-admin-template/)
176176
- [ASP.Net Core Admin Templates](https://themeselection.com/item/category/asp-net-dashboard/)
177-
- [Free UI Kits](https://themeselection.com/products/category/free-ui-kits/)
177+
- [Free UI Kits](https://themeselection.com/item/category/free-ui-kits/)
178178

179-
If you want to [Download Free Admin Templates](https://themeselection.com/products/category/download-free-admin-templates/) like Materio Aspnet Core MVC Free then do visit [ThemeSelection](https://themeselection.com/).
179+
If you want to [Download Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/) like Materio Aspnet Core MVC Free then do visit [ThemeSelection](https://themeselection.com/).
180180

181181
## Useful Links 🎁
182182

183183
- [Vue CheatSheet](https://vue-cheatsheet.themeselection.com/)
184-
- [Freebies](https://themeselection.com/products/category/download-free-admin-templates/)
185-
- [Download Free Admin Templates](https://themeselection.com/products/category/download-free-admin-templates/)
184+
- [Freebies](https://themeselection.com/item/category/free-admin-templates/)
185+
- [Download Free Admin Templates](https://themeselection.com/item/category/free-admin-templates/)
186186
- [Bootstrap 5 CheatSheet](https://bootstrap-cheatsheet.themeselection.com/)
187187

188188
## Social Media :earth_africa:

‎Views/Auth/ForgotPasswordBasic.cshtml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,39 @@
1111

1212
<div class="position-relative">
1313
<div class="authentication-wrapper authentication-basic container-p-y">
14-
<div class="authentication-inner py-4">
14+
<div class="authentication-inner py-6 mx-4">
1515

1616
<!-- Logo -->
17-
<div class="card p-2">
17+
<div class="card p-7">
1818
<!-- Forgot Password -->
1919
<div class="app-brand justify-content-center mt-5">
20-
<a href="/" class="app-brand-link gap-2">
20+
<a href="/" class="app-brand-link gap-3">
2121
<span class="app-brand-logo demo">@await Html.PartialAsync("../_Partials/_Macros")</span>
2222
<span class="app-brand-text demo text-heading fw-semibold">@TempData.Peek("appName")</span>
2323
</a>
2424
</div>
2525
<!-- /Logo -->
26-
<div class="card-body mt-2">
27-
<h4 class="mb-2">Forgot Password? 🔒</h4>
28-
<p class="mb-4">Enter your email and we'll send you instructions to reset your password</p>
29-
<form id="formAuthentication" class="mb-3" action="~/Auth/ResetPasswordBasic" method="GET">
30-
<div class="form-floating form-floating-outline mb-3">
26+
<div class="card-body mt-1">
27+
<h4 class="mb-1">Forgot Password? 🔒</h4>
28+
<p class="mb-5">Enter your email and we'll send you instructions to reset your password</p>
29+
<form id="formAuthentication" class="mb-5" action="~/" method="GET">
30+
<div class="form-floating form-floating-outline mb-5">
3131
<input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" autofocus>
3232
<label>Email</label>
3333
</div>
34-
<button class="btn btn-primary d-grid w-100">Send Reset Link</button>
34+
<button class="btn btn-primary d-grid w-100 mb-5">Send Reset Link</button>
3535
</form>
3636
<div class="text-center">
3737
<a href="~/Auth/LoginBasic" class="d-flex align-items-center justify-content-center">
38-
<i class="mdi mdi-chevron-left scaleX-n1-rtl mdi-24px"></i>
38+
<i class="ri-arrow-left-s-line scaleX-n1-rtl ri-20px me-1_5"></i>
3939
Back to login
4040
</a>
4141
</div>
4242
</div>
4343
</div>
4444
<!-- /Forgot Password -->
4545
<img src="~/img/illustrations/tree-3.png" alt="auth-tree" class="authentication-image-object-left d-none d-lg-block">
46-
<img src="~/img/illustrations/auth-basic-mask-light.png" class="authentication-image d-none d-lg-block" alt="triangle-bg" data-app-light-img="illustrations/auth-basic-mask-light.png" data-app-dark-img="illustrations/auth-basic-mask-dark.png">
46+
<img src="~/img/illustrations/auth-basic-mask-light.png" class="authentication-image d-none d-lg-block" height="172" alt="triangle-bg" data-app-light-img="illustrations/auth-basic-mask-light.png" data-app-dark-img="illustrations/auth-basic-mask-dark.png">
4747
<img src="~/img/illustrations/tree.png" alt="auth-tree" class="authentication-image-object-right d-none d-lg-block">
4848
</div>
4949
</div>

0 commit comments

Comments
 (0)