diff --git a/public/assets/css/dash/forms.css b/public/assets/css/dash/forms.css index be365e7..e9c2407 100644 --- a/public/assets/css/dash/forms.css +++ b/public/assets/css/dash/forms.css @@ -18,15 +18,15 @@ input[type="text"] { border-radius: 5px; font: 18px var(--base-type); display: inline-block; - background: var(--secondary); - color: var(--primary); + background: var(--primary); + color: var(--secondar); } textarea { border: 0; border-radius: 3px; - color: var(--primary); - background: var(--secondary); + color: var(--secondary); + background: var(--primary); } button, diff --git a/public/assets/css/dash/settings.css b/public/assets/css/dash/settings.css index ed3f910..92b4945 100644 --- a/public/assets/css/dash/settings.css +++ b/public/assets/css/dash/settings.css @@ -10,10 +10,10 @@ article[class="settings"] h1 { } article[class="settings"] label { - color: var(--secondary); + color: var(--primary); margin-bottom: 10px; display: inline-block; - font-weight: 400; + font-weight: bold; } article.settings div.tab-toolbar button { @@ -25,7 +25,7 @@ article.settings div.tab-toolbar button { article.settings section.settings-tabs section.section-tab { width: 100%; min-height: 400px; - background: var(--secondary-highlight); + background: var(--secondary); color: var(--secondary); } @@ -35,36 +35,42 @@ article.settings section.settings-tabs section.section-tab { } .hide { - display: none; + /* REFACTOR: i know, i know, it's just a placeholder*/ + display: none !important; visibility: hidden; } section#member-profile { display: grid; - grid-template-columns: 1fr 1fr 1fr 1fr; + grid-template-columns: 1fr 1fr 1fr; grid-auto-columns: auto; gap: 15px; width: 100%; max-width: 900px; - margin: 10px auto; + margin: 0 auto; + border-radius: 3px; } section#member-profile > div:nth-child(1) { grid-column: 1/2; - grid-row: 1/3; + grid-row: 1/2; + height: 250px; } section#member-profile > div:nth-child(2) { grid-column: 2/4; - grid-row: 1/3; + grid-row: 1/2; } section#member-profile > div:nth-child(3) { - grid-row: 1/3; + grid-column: 1/2; + grid-row: 2/3; + padding-left: 10px; } section#member-profile > div:nth-child(4) { - color: var(--white); + grid-column: 2/3; + grid-row: 2/3; } section#member-profile > div:nth-child(4) a { @@ -74,22 +80,37 @@ section#member-profile > div:nth-child(4) a { } section#member-profile > div:nth-child(5) { - grid-column: 2/4; + grid-column: 3/4; + grid-row: 2/3; + padding-right: 10px; } section#member-profile > div:nth-child(6) { - grid-column: 1/3; -} - -section#member-profile > div:nth-child(7) { - grid-column: 3/5; - min-height: 325px; -} - -section#member-profile > div:nth-child(8) { grid-column: 1/4; - color: var(--white); + grid-row: 3/4; + padding: 0 10px; +} + +section#member-profile > div:nth-child(6) div { + display: inline-block; + color: var(--secondary); word-wrap: break-word; + vertical-align: top; + width: 49.6%; +} + +section#member-profile > div:nth-child(6) div > span { + display: block; + background: var(--primary); + color: var(--secondary); + border-radius: 3px; + padding: 3px; + margin-bottom: 10px; +} + +section#member-profile > div textarea { + width: 98.4%; + height: 85%; } section#member-profile > div[class="member-avatar"] div, @@ -109,11 +130,6 @@ section#member-profile div input[type="text"] { margin-bottom: 10px; } -section[class="member-settings"] div textarea { - width: 98.4%; - height: 63%; -} - article[class="settings"] button { width: 100%; text-align: left; diff --git a/resources/views/back/settings.blade.php b/resources/views/back/settings.blade.php index 785e02c..7ac4c94 100644 --- a/resources/views/back/settings.blade.php +++ b/resources/views/back/settings.blade.php @@ -23,123 +23,127 @@ + +
+
+
+
+
+ + {{ $member['key'] }} +
+
+
+ {{ $ftoken }} +
+ +
MEMBER FEATURES +
+ @if(isset($apiStatus) && $apiStatus == 'true') + + @else + + + @endif + @if(isset($dynamicRenderStatus) && $dynamicRenderStatus == 'true') + + + @else + + + @endif +
+
+
+ @if($lastBackup != '') + LAST BACK UP
+ {{ $lastBackup }}
+ @else + span No back ups. Frowny face. + @endif +
+
+
+ @if($mailOption == "option-none" or $mailOption == "") + NONE + @else + NONE + @endif + @if($mailOption == "option-mg" or $mailOption == "") + MAILGUN + @else + MAILGUN + @endif + @if($mailOption == "option-smtp" or $mailOption == "") + SMTP + @else + SMTP + @endif + @include('forms.mailforms') + +
MEMBER THEMES +
+
+ @foreach($themes as $theme) + @if($theme['name'] == $currentTheme) + Edit + @else + + @endif + @endforeach +
-
- -
-
- @if($lastBackup != '') - LAST BACK UP
- {{ $lastBackup }}
- @else - span No back ups. Frowny face. - @endif -
-
- @if(isset($apiStatus) && $apiStatus == 'true') - - @else - - - @endif - @if(isset($dynamicRenderStatus) && $dynamicRenderStatus == 'true') - - - @else - - - @endif -
-
-
- @foreach($themes as $theme) - @if($theme['name'] == $currentTheme) - Edit - @else - - @endif - @endforeach -
-
-
- @if($mailOption == "option-none" or $mailOption == "") - NONE - @else - NONE - @endif - @if($mailOption == "option-mg" or $mailOption == "") - MAILGUN - @else - MAILGUN - @endif - @if($mailOption == "option-smtp" or $mailOption == "") - SMTP - @else - SMTP - @endif - @include('forms.mailforms') - -
-
- -
- {{ $member['key'] }} -
-
- {{ $ftoken }} -
-
@endsection @section('scripting')