Compare commits

..

No commits in common. "cd056336cd22870d1cbb51e31039622f1874a8cd" and "bdca7f4ace5fa39b1e7f99b97c4b16c57f621802" have entirely different histories.

3 changed files with 97 additions and 89 deletions

View file

@ -4,7 +4,7 @@ namespace App\Http\Controllers\API;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Services\Assets\FileUploadService; use App\Services\FileUploadService;
class FileUploadAPIController extends Controller class FileUploadAPIController extends Controller
{ {

View file

@ -318,99 +318,111 @@ section#site-themes > a {
z-index: 30; z-index: 30;
} }
@media only screen and (max-width: 530px) { section[class="data-settings"] {
article.settings div.tab-toolbar button { color: var(--white);
width: 20%; }
@media only screen and (max-width: 900px) {
main > article[class="settings"] {
width: 97%;
}
}
@media only screen and (max-width: 650px) {
section[class="member-settings"] div input[type="text"] {
width: 99.3%;
height: 40px; height: 40px;
color: var(--secondary);
font-size: 0.7em;
}
section#site-profile {
grid-template-columns: 1fr;
}
section#site-profile > div:nth-child(1) {
grid-column: 1/4;
grid-row: 1;
height: 250px;
padding: 10px;
}
section#site-profile > div:nth-child(2) {
grid-column: 1/4;
grid-row: 2;
height: 250px;
padding: 10px;
}
section#site-profile > div:nth-child(3) {
grid-column: 1/4;
grid-row: 3;
padding-left: 10px;
}
section#site-profile > div:nth-child(4) {
grid-column: 1/4;
grid-row: 4;
padding: 5px;
}
section#site-profile > div:nth-child(4) a {
font-weight: bold;
text-decoration: underline;
color: var(--primary-highlight);
}
section#site-profile > div:nth-child(5) {
grid-column: 1/4;
grid-row: 5;
padding: 10px;
}
section#site-profile > div:nth-child(6) {
grid-column: 1/4;
grid-row: 6;
padding: 0 10px;
}
section#site-profile > div:nth-child(6) div {
display: inline-block;
color: var(--secondary);
word-wrap: break-word;
vertical-align: top;
width: 49%;
}
section#site-profile > div:nth-child(6) div > span {
display: block;
background: var(--primary);
color: var(--secondary);
border-radius: 3px;
padding: 3px;
margin-bottom: 10px; margin-bottom: 10px;
} }
section#site-profile > div textarea { section[class="member-settings"] {
width: 98.4%; grid-template-columns: 1fr 1fr;
height: 85%;
} }
article.settings section.settings-tabs section.section-tab { section[class="member-settings"] > div[class="mail"] input {
width: 98%; width: 97.7%;
padding: 5px; height: 40px;
padding-left: 5px;
margin-bottom: 10px;
} }
section#site-features > div.features-mail { section[class="member-settings"] div textarea {
width: 96%; height: 80px;
width: 99.3%;
} }
section#site-features div.site-options button, section[class="member-settings"] > div:nth-child(1) {
section#site-features div.site-maintenance button { grid-column: 1/2;
width: 86%; grid-row: 1/3;
height: 200px;
} }
section#site-features div.option-container span { section[class="member-settings"] > div:nth-child(2) {
font-size: 0.7em; grid-column: 2/3;
grid-row: 1/3;
}
section[class="member-settings"] > div:nth-child(3) {
grid-column: 1/3;
grid-row: 3/5;
}
section[class="member-settings"] > div:nth-child(4) {
grid-column: 1/2;
}
section[class="member-settings"] > div:nth-child(5) {
grid-column: 2/3;
}
section[class="member-settings"] > div:nth-child(6) {
grid-column: 1/2;
}
section[class="member-settings"] > div:nth-child(7) {
grid-column: 2/3;
min-height: 325px;
}
section[class="member-settings"] > div:nth-child(8) {
grid-column: 1/3;
}
}
@media only screen and (max-width: 530px) {
section[class="member-settings"] > div[class="mail"] input {
width: 98.5%;
}
section[class="member-settings"] {
grid-template-columns: 100%;
}
section[class="member-settings"] div textarea {
height: 80px;
}
section[class="member-settings"] > div:nth-child(1) {
grid-row: 1/3;
height: 200px;
}
section[class="member-settings"] > div:nth-child(2) {
grid-row: 3/5;
grid-column: 1;
height: 200px;
}
section[class="member-settings"] > div:nth-child(3) {
grid-column: 1;
grid-row: 5/7;
}
section[class="member-settings"] > div:nth-child(4),
section[class="member-settings"] > div:nth-child(5),
section[class="member-settings"] > div:nth-child(6),
section[class="member-settings"] > div:nth-child(7),
section[class="member-settings"] > div:nth-child(8) {
grid-column: 1;
} }
} }

View file

@ -10,7 +10,7 @@
<button id="themes" class="tab-button">THEMES</button> <button id="themes" class="tab-button">THEMES</button>
</div> </div>
<section class="settings-tabs"> <section class="settings-tabs">
<section id="site-profile" class="section-tab show"> <section id="site-profile" class="section-tab hide">
<div class="member-avatar"> <div class="member-avatar">
<div class="avatar" style="background: url({{ $member['avatar'] }} ) no-repeat center center / cover"></div> <div class="avatar" style="background: url({{ $member['avatar'] }} ) no-repeat center center / cover"></div>
<input id="avatar-upload" type="file" name="avatar-upload"/> <input id="avatar-upload" type="file" name="avatar-upload"/>
@ -122,7 +122,6 @@
@endif @endif
<span> <span>
</div> </div>
<!-- TODO: File Back up option
<div class="option-container"> <div class="option-container">
<svg id="nav-menu-icon" class="icon"> <svg id="nav-menu-icon" class="icon">
<use id="nav-menu-icon" xlink:href="/assets/images/global/sprite.svg#entypo-images"/> <use id="nav-menu-icon" xlink:href="/assets/images/global/sprite.svg#entypo-images"/>
@ -132,8 +131,6 @@
</button> </button>
<span>COMING SOON</span> <span>COMING SOON</span>
</div> </div>
-->
<!-- TODO: Reset site to defualt
<div class="option-container"> <div class="option-container">
<svg id="nav-menu-icon" class="icon"> <svg id="nav-menu-icon" class="icon">
<use id="nav-menu-icon" xlink:href="/assets/images/global/sprite.svg#entypo-back-in-time"/> <use id="nav-menu-icon" xlink:href="/assets/images/global/sprite.svg#entypo-back-in-time"/>
@ -143,10 +140,9 @@
</button> </button>
<span>COMING SOON</span> <span>COMING SOON</span>
</div> </div>
-->s
</div> </div>
</section> </section>
<section id="site-themes" class="section-tab hide"> <section id="site-themes" class="section-tab show">
@foreach($themes as $theme) @foreach($themes as $theme)
@if($theme['name'] == $currentTheme) @if($theme['name'] == $currentTheme)
<!-- <!--