Skip to content

Commit 0c6c806

Browse files
rxturrxtur
committed
Fixed spinners and toasters
1 parent b7eef08 commit 0c6c806

4 files changed

Lines changed: 7 additions & 9 deletions

File tree

‎BlogEngine/BlogEngine.NET/Account/login.aspx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<div class="form-group">
1818
<asp:TextBox ID="Password" runat="server" placeholder="*******" CssClass="form-control input-lg passwordEntry ltr-dir" TextMode="Password"></asp:TextBox>
1919
</div>
20-
<div class="checkbox">
20+
<div class="checkbox" style="margin-left: 23px; margin-bottom: 20px">
2121
<asp:CheckBox ID="RememberMe" runat="server" />
2222
<asp:Label ID="RememberMeLabel" runat="server" AssociatedControlID="RememberMe" CssClass="inline "><%=Resources.labels.rememberMe %></asp:Label>
2323
</div>

‎BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,11 @@ static void RegisterBundles(BundleCollection bundles)
115115
AddDefaultIgnorePatterns(bundles.IgnoreList);
116116

117117
bundles.Add(
118-
new StyleBundle("~/Content/css")
119-
.Include("~/Content/ie10mobile.css")
118+
new StyleBundle("~/Content/admincss")
120119
.Include("~/Content/bootstrap.min.css")
121120
.Include("~/Content/toastr.css")
122121
.Include("~/Content/font-awesome.min.css")
123-
.Include("~/Content/editor.css")
124-
.Include("~/Content/app.css")
125-
.Include("~/admin/editors/summernote/summernote.css")
122+
.Include("~/Content/admin.css")
126123
);
127124

128125
bundles.Add(

‎BlogEngine/BlogEngine.NET/Content/admin.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,3 +281,6 @@ label { font-size: 13px; font-weight: normal; }
281281
.btn-flt-r .btn span { display: none; }
282282
.active-flt-r { right: 4px; }
283283
}
284+
285+
.loading { display: inline-block; }
286+
.loaded { display: none; }

‎BlogEngine/BlogEngine.NET/admin/index.cshtml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
2222
@*@Styles.Render("~/Content/css")*@
2323
<link href='http://fonts.googleapis.com/css?family=Roboto:400,300' rel='stylesheet' type='text/css'>
24-
<link href="~/Content/bootstrap.min.css" rel="stylesheet" />
25-
<link href="~/Content/font-awesome.min.css" rel="stylesheet" />
26-
<link href="~/Content/admin.css" rel="stylesheet" />
24+
@Styles.Render("~/Content/admincss")
2725
<script type="text/javascript">
2826
var UserVars = { Name: '@Security.CurrentUser.Identity.Name', IsAdmin: '@Security.IsAdministrator', Rights: ['@Html.Raw(userRights)'] };
2927
var ActiveTheme = { Theme: '@BlogSettings.Instance.Theme' }

0 commit comments

Comments
 (0)