Skip to content
This repository has been archived by the owner on Oct 29, 2024. It is now read-only.

Commit

Permalink
Use new modern common-style and common-theme files and remove slick.g…
Browse files Browse the repository at this point in the history
…rid.css / select2.css as they are now integrated to common-style.
  • Loading branch information
volkanceylan committed Aug 30, 2024
1 parent 05c0de4 commit 197838d
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 45 deletions.
1 change: 0 additions & 1 deletion src/Serene.Web/Modules/Common/ScriptInit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Config.rootNamespaces.push('Serene');
EntityDialog.defaultLanguageList = siteLanguageList;
HtmlContentEditor.CKEditorBasePath = "~/Serenity.Assets/Scripts/ckeditor/";
gridDefaults.useCssVars = false;
gridDefaults.useLegacyUI = true;

let $ = getjQuery();
if ($?.fn?.colorbox) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}

<div class="s-full-page justify-content-center">
<div id="LoginPanel" class="s-container-tight s-Form flex-layout">
<div id="LoginPanel" class="s-container-tight">

</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Layout = MVC.Views.Shared._LayoutNoNavigation;
}

<div class="s-full-page justify-content-center">
<div id="SignUpPanel" class="s-container-narrow s-Form flex-layout">
<div id="SignUpPanel" class="s-container-narrow">
</div>
</div>

Expand Down
4 changes: 1 addition & 3 deletions src/Serene.Web/appsettings.bundles.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"~/Serenity.Assets/fonts/open-sans/open-sans.css",
"~/Serenity.Assets/bootstrap/css/bootstrap.css",
"~/Serenity.Assets/line-awesome/css/line-awesome-fa.min.css",
"~/Serenity.Assets/Content/css/select2.css",
"~/Serenity.Assets/Content/toastr.css",
"~/Serenity.Assets/Content/slick.grid.css",
"~/Serenity.Assets/nprogress/nprogress.css",
"~/Serenity.Extensions/common-style.css",
"~/Serenity.Extensions/index.css"
Expand Down Expand Up @@ -39,8 +37,8 @@
"~/Serenity.Assets/Scripts/sortable.js",
"~/Serenity.Assets/preact/preact.umd.js",
"~/Serenity.Assets/mousetrap/mousetrap.js",
"~/Serenity.Extensions/common-theme.js",
"~/Serenity.Corelib/index.global.js",
"~/Serenity.Extensions/common-theme.js",
"~/Serenity.Extensions/index.js",
"dynamic://ColumnAndFormBundle"
],
Expand Down
37 changes: 0 additions & 37 deletions src/Serene.Web/wwwroot/Content/site/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,40 +46,3 @@
.s-UserRoleDialog .ui-dialog-content {
padding: 8px;
}
.s-PermissionCheckEditor .check-box {
background-image: url(../serenity/images/tick-empty.png);
background-position: center center;
width: 22px;
height: 22px;
margin: 0;
}
.s-PermissionCheckEditor .check-box.checked {
background-image: url(../serenity/images/tick-green.png);
background-position: center center;
}
.s-PermissionCheckEditor .check-box.checked.revoke {
background-image: url(../serenity/images/tick-red.png);
background-position: center center;
}
.s-PermissionCheckEditor .check-box.partial {
opacity: 0.8;
}
.s-PermissionCheckEditor .check-box.checked.partial {
background-image: url(images/tick-green-partial.png);
}
.s-PermissionCheckEditor .check-box.checked.revoke.partial {
background-image: url(images/tick-red-partial.png);
}
.s-PermissionCheckEditor .effective-permission {
cursor: default;
padding-left: 22px;
background-image: url(../serenity/images/check2.png);
background-repeat: no-repeat;
background-position: left center;
}
.s-PermissionCheckEditor .effective-permission.partial {
background-image: url(../serenity/images/checkbox-null.png);
}
.s-PermissionCheckEditor .effective-permission.deny {
background-image: url(../serenity/images/slash.png);
}

0 comments on commit 197838d

Please sign in to comment.