Home Explore Help
Sign In
lukas.angerer
/
CronAlarm
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Cleanup of markup structure and styling

Lukas Angerer 5 years ago
parent
a87fac8c8b
commit
af898f2e1f
9 changed files with 24 additions and 50 deletions
Unified View Show Diff Stats
  1. 10 6
      CronAlarm/Pages/AlertSelection.razor
  2. 0 7
      CronAlarm/Pages/Counter.razor
  3. 0 12
      CronAlarm/Pages/Counter.razor.cs
  4. 1 1
      CronAlarm/Pages/Error.cshtml
  5. 1 3
      CronAlarm/Pages/Index.razor
  6. 1 1
      CronAlarm/Properties/launchSettings.json
  7. 1 5
      CronAlarm/Shared/MainLayout.razor
  8. 0 5
      CronAlarm/Shared/NavMenu.razor
  9. 10 10
      CronAlarm/wwwroot/css/site.css

+ 10 - 6
CronAlarm/Pages/AlertSelection.razor
View File 

@@ -1,8 +1,9 @@
 
-@foreach (var group in Config.Groups)
 
+
 
+@foreach (var group in Config.Groups)
 
 {
 
 {
 
-    <div class="row">
 
+    <div class="row alert-group">
 
         <div class="col-12">
 
         <div class="col-12">
 
-            @group.Name
 
+            <h4>@group.Name</h4>
 
             <div class="list-group">
 
             <div class="list-group">
 
                 @foreach (var option in group.IndexedOptions)
 
                 @foreach (var option in group.IndexedOptions)
 
                 {
 
                 {
 
@@ -14,6 +15,9 @@
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
 }
 
 }
 
-<div>
 
-    <button class="btn btn-primary" @onclick="Save">Save</button> <button class="btn btn-secondary" @onclick="Reset">Reset</button>
 
-</div>
 
+<hr />
 
+<div class="row">
 
+    <div class="col-12">
 
+        <button class="btn btn-primary" @onclick="Save">Save</button> <button class="btn btn-secondary" @onclick="Reset">Reset</button>
 
+    </div>
 
+</div>

+ 0 - 7
CronAlarm/Pages/Counter.razor
View File 

@@ -1,7 +0,0 @@
 
-@page "/counter"
 
-
 
-<h1>Counter</h1>
 
-
 
-<p>Current count: @CurrentCount</p>
 
-
 
-<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>

+ 0 - 12
CronAlarm/Pages/Counter.razor.cs
View File 

@@ -1,12 +0,0 @@
 
-namespace CronAlarm.Pages
 
-{
 
-    public partial class Counter
 
-    {
 
-        public int CurrentCount { get; private set; }
 
-
 
-        private void IncrementCount()
 
-        {
 
-            CurrentCount++;
 
-        }
 
-    }
 
-}

+ 1 - 1
CronAlarm/Pages/Error.cshtml
View File 

@@ -14,7 +14,7 @@
 
 
 
 <body>
 
 <body>
 
     <div class="main">
 
     <div class="main">
 
-        <div class="content px-4">
 
+        <div class="container-fluid">
 
             <h1 class="text-danger">Error.</h1>
 
             <h1 class="text-danger">Error.</h1>
 
             <h2 class="text-danger">An error occurred while processing your request.</h2>
 
             <h2 class="text-danger">An error occurred while processing your request.</h2>

+ 1 - 3
CronAlarm/Pages/Index.razor
View File 

@@ -2,6 +2,4 @@
 
 
 
 <h1>Alerts</h1>
 
 <h1>Alerts</h1>
 
 
 
-<div class="container">
 
-    <AlertSelection />
 
-</div>
 
+<AlertSelection />

+ 1 - 1
CronAlarm/Properties/launchSettings.json
View File 

@@ -7,7 +7,7 @@
 
         "ASPNETCORE_ENVIRONMENT": "Development"
 
         "ASPNETCORE_ENVIRONMENT": "Development"
 
       },
 
       },
 
       "dotnetRunMessages": "true",
 
       "dotnetRunMessages": "true",
 
-      "applicationUrl": "http://localhost:5000"
 
+      "applicationUrl": "http://localhost:5050"
 
     },
 
     },
 
     "Docker": {
 
     "Docker": {
 
       "commandName": "Docker",
 
       "commandName": "Docker",

+ 1 - 5
CronAlarm/Shared/MainLayout.razor
View File 

@@ -6,11 +6,7 @@
 
     </div>
 
     </div>
 
 
 
     <div class="main">
 
     <div class="main">
 
-        <div class="top-row px-4">
 
-            <a href="https://docs.microsoft.com/aspnet/" target="_blank">About</a>
 
-        </div>
 
-
 
-        <div class="content px-4">
 
+        <div class="container-fluid">
 
             @Body
 
             @Body
 
         </div>
 
         </div>
 
     </div>
 
     </div>

+ 0 - 5
CronAlarm/Shared/NavMenu.razor
View File 

@@ -12,11 +12,6 @@
 
                 <span class="oi oi-home" aria-hidden="true"></span> Home
 
                 <span class="oi oi-home" aria-hidden="true"></span> Home
 
             </NavLink>
 
             </NavLink>
 
         </li>
 
         </li>
 
-        <li class="nav-item px-3">
 
-            <NavLink class="nav-link" href="counter">
 
-                <span class="oi oi-plus" aria-hidden="true"></span> Counter
 
-            </NavLink>
 
-        </li>
 
     </ul>
 
     </ul>
 
 </div>
 
 </div>

+ 10 - 10
CronAlarm/wwwroot/css/site.css
View File 

@@ -14,10 +14,6 @@ a, .btn-link {
 
     border-color: #1861ac;
 
     border-color: #1861ac;
 
 }
 
 }
 
 
 
-.content {
 
-    padding-top: 1.1rem;
 
-}
 
-
 
 .valid.modified:not([type=checkbox]) {
 
 .valid.modified:not([type=checkbox]) {
 
     outline: 1px solid #26b050;
 
     outline: 1px solid #26b050;
 
 }
 
 }
 
@@ -30,6 +26,10 @@ a, .btn-link {
 
     color: red;
 
     color: red;
 
 }
 
 }
 
 
 
+.alert-group {
 
+    margin-bottom: 1em;
 
+}
 
+
 
 #blazor-error-ui {
 
 #blazor-error-ui {
 
     background: lightyellow;
 
     background: lightyellow;
 
     bottom: 0;
 
     bottom: 0;
 
@@ -42,9 +42,9 @@ a, .btn-link {
 
     z-index: 1000;
 
     z-index: 1000;
 
 }
 
 }
 
 
 
-    #blazor-error-ui .dismiss {
 
-        cursor: pointer;
 
-        position: absolute;
 
-        right: 0.75rem;
 
-        top: 0.5rem;
 
-    }
 
+#blazor-error-ui .dismiss {
 
+    cursor: pointer;
 
+    position: absolute;
 
+    right: 0.75rem;
 
+    top: 0.5rem;
 
+}