Поправил вывод ошибок

visavi · Aug 25, 2021 · 84bf953 · 84bf953
1 parent f87ad4a
commit 84bf953
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 35 deletions.
diff --git a/public/themes/default-dark/src/dark.css b/public/themes/default-dark/src/dark.css
@@ -2,25 +2,13 @@
     max-width: none;
 }
 
-.prettyprint, .js-queries {
-    background-color: #1D1F23;
-    color: #B7B8B9;
-}
-
-.prettyprint ol.linenums {
-    margin: 0;
-    padding: 0.5rem 3rem;
-    box-shadow: inset 40px 0 0 #21252B, inset 41px 0 0 #262638;
-}
-
 .section, .app-content, .app-title, .app-footer, .section-form, .app-notification {
     background-color: #282C34;
     color: #B7B8B9;
 }
 
 .dropdown-item {
     color: #B7B8B9;
-    border-radius: 0 !important;
 }
 
 .app-notification__title {
@@ -44,21 +32,10 @@
     background-color: #333842;
 }
 
-.performance {
-    background-color: #1D1F23;
-    color: #B7B8B9;
-    border: 1px solid #1D1F23;
-    box-shadow: 0 1px 8px #1D1F23;
-}
-
 .section-body {
     border-top: 1px solid #1D1F23 !important;
 }
 
-.aleft {
-    border-radius: 5px;
-}
-
 .alert-danger {
     background: linear-gradient(to right, #4A2245, #252243 15%);
     border: 0;
@@ -90,12 +67,14 @@
     border-bottom: 1px solid #1D1F23;
 }
 
-textarea, .form-control {
-    border-radius: 0 !important;
+.form-control, .form-select {
     background-color: #1D1F23 !important;
-    border: 1px solid #3E4452 !important;
+    border: 2px solid #35373f !important;
     color: #B7B8B9 !important;
-    z-index: 0;
+}
+
+.form-control:focus, .form-select.focus {
+    border-color: #3E4452 !important;
 }
 
 .app-header {
@@ -124,7 +103,7 @@ textarea, .form-control {
 }
 
 .page-item.active .page-link {
-    background-color: #1D1F23 !important;
+    background-color: #172330 !important;
 }
 
 .page-link:hover, .dropdown-item:hover, .dropdown-item:focus {
@@ -209,8 +188,7 @@ textarea, .form-control {
     border-radius: 3px;
 }
 
-.input-group-append .input-group-text, .popover-body {
-    border-radius: 0 !important;
+.input-group-text, .popover-body {
     background-color: #1D1F23 !important;
     border: 1px solid #3E4452 !important;
     color: #B7B8B9 !important;
@@ -221,7 +199,6 @@ textarea, .form-control {
 }
 
 .dropdown-menu {
-    border-radius: 0 !important;
     background-color: #1D1F23 !important;
     border: 1px solid #3E4452 !important;
     color: #B7B8B9 !important;
@@ -318,3 +295,21 @@ textarea, .form-control {
 .media-file {
     background-color: #1D1F23 !important;
 }
+
+.performance {
+    background-color: #1D1F23;
+    color: #B7B8B9;
+    border: 1px solid #1D1F23;
+    box-shadow: 0 1px 8px #1D1F23;
+}
+
+.prettyprint, .js-queries {
+    background-color: #1D1F23;
+    color: #B7B8B9;
+}
+
+.prettyprint ol.linenums {
+    margin: 0;
+    padding: 0.5rem 3rem;
+    box-shadow: inset 40px 0 0 #21252B, inset 41px 0 0 #262638;
+}
diff --git a/resources/views/admin/forums/index.blade.php b/resources/views/admin/forums/index.blade.php
@@ -75,9 +75,7 @@
                 @csrf
                 <div class="input-group{{ hasError('title') }}">
                     <input type="text" class="form-control" id="title" name="title" maxlength="50" value="{{ getInput('title') }}" placeholder="{{ __('forums.forum') }}" required>
-                    <div class="input-group-append">
-                        <button class="btn btn-primary">{{ __('forums.create_forum') }}</button>
-                    </div>
+                    <button class="btn btn-primary">{{ __('forums.create_forum') }}</button>
                 </div>
                 <div class="invalid-feedback">{{ textError('title') }}</div>
             </form>

diff --git a/resources/views/app/_flash.blade.php b/resources/views/app/_flash.blade.php
@@ -40,7 +40,7 @@
     </div>
 @endif
 
-@if ($errors->any())
+@if ($errors = session()->get('errors'))
     <div class="alert alert-danger alert-dismissible fade show" role="alert">
         @foreach ($errors->all() as $error)
             <div>{{ $error }}</div>