projects/fipamo
1
0
Fork 1
Code Issues 8 Pull requests Projects 1 Releases 23 Wiki Activity

include-adm-zip #37

Closed
are0h wants to merge 28 commits from refs/pull/37/head into develop
pull from: refs/pull/37/head
merge into: projects:develop
Conversation 1 Commits 28 Files changed 82 +65 -18
1 changed files with 65 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit debaad2bca - Show all commits

83
public/assets/css/dash.css
View file

@ -1719,40 +1719,53 @@ svg.icons {
height: 100%; height: 100%;
margin: 0 auto; margin: 0 auto;
} }
#dash-index-content #dash-index #dash-index-wrapper .dash-init { #dash-index-content #dash-index #dash-index-wrapper .dash-init,
#dash-index-content #dash-index #dash-index-wrapper .dash-restore {
width: 100%; width: 100%;
max-width: 900px; max-width: 900px;
margin: 0 auto; margin: 0 auto;
color: #b2cce5; color: #b2cce5;
} }
#dash-index-content #dash-index #dash-index-wrapper .dash-init label { #dash-index-content #dash-index #dash-index-wrapper .dash-init label,
#dash-index-content #dash-index #dash-index-wrapper .dash-restore label {
color: #374857; color: #374857;
} }
#dash-index-content #dash-index #dash-index-wrapper .dash-init form { #dash-index-content #dash-index #dash-index-wrapper .dash-init form,
#dash-index-content #dash-index #dash-index-wrapper .dash-restore form {
background: #f2f1ef; background: #f2f1ef;
padding: 15px; padding: 15px;
} }
#dash-index-content #dash-index #dash-index-wrapper .dash-init form h1 { #dash-index-content #dash-index #dash-index-wrapper .dash-init form h1,
#dash-index-content #dash-index #dash-index-wrapper .dash-restore form h1 {
color: #374857; color: #374857;
} }
#dash-index-content #dash-index #dash-index-wrapper .dash-init form p { #dash-index-content #dash-index #dash-index-wrapper .dash-init form p,
#dash-index-content #dash-index #dash-index-wrapper .dash-restore form p {
color: #161d23; color: #161d23;
border-top: 1px solid #374857; border-top: 1px solid #374857;
border-bottom: 1px solid #374857; border-bottom: 1px solid #374857;
padding: 10px 0 10px 0; padding: 10px 0 10px 0;
} }
#dash-index-content #dash-index #dash-index-wrapper .dash-init form input.large[type=email], #dash-index-content #dash-index #dash-index-wrapper .dash-init form input.large[type=email],
#dash-index-content #dash-index #dash-index-wrapper .dash-restore form input.large[type=email],
#dash-index-content #dash-index #dash-index-wrapper .dash-init form input[type=password], #dash-index-content #dash-index #dash-index-wrapper .dash-init form input[type=password],
#dash-index-content #dash-index #dash-index-wrapper .dash-init form input[type=text] { #dash-index-content #dash-index #dash-index-wrapper .dash-restore form input[type=password],
#dash-index-content #dash-index #dash-index-wrapper .dash-init form input[type=text],
#dash-index-content #dash-index #dash-index-wrapper .dash-restore form input[type=text] {
margin-bottom: 15px; margin-bottom: 15px;
margin-top: 5px; margin-top: 5px;
} }
#dash-index-content #dash-index #dash-index-wrapper .dash-init form button { #dash-index-content #dash-index #dash-index-wrapper .dash-init form button,
#dash-index-content #dash-index #dash-index-wrapper .dash-restore form button {
height: 30px; height: 30px;
width: 120px; width: 120px;
margin: 0 auto; margin: 0 auto;
display: block; display: block;
} }
#dash-index-content #dash-index #dash-index-wrapper .dash-restore {
display: none;
visibility: hidden;
}
#dash-index-content #dash-index #dash-index-wrapper #dash-login { #dash-index-content #dash-index #dash-index-wrapper #dash-login {
width: 100%; width: 100%;
max-width: 900px; max-width: 900px;
@ -2021,7 +2034,8 @@ svg.icons {
} }
#settings-index #settings-index-wrapper #member-settings, #settings-index #settings-index-wrapper #member-settings,
#settings-index #settings-index-wrapper #site-settings, #settings-index #settings-index-wrapper #site-settings,
#settings-index #settings-index-wrapper #option-settings { #settings-index #settings-index-wrapper #option-settings,
#settings-index #settings-index-wrapper #member-utils {
background: #374857; background: #374857;
padding: 5px; padding: 5px;
border-radius: 5px 0 5px 0; border-radius: 5px 0 5px 0;
@ -2030,27 +2044,54 @@ svg.icons {
} }
#settings-index #settings-index-wrapper #member-settings label, #settings-index #settings-index-wrapper #member-settings label,
#settings-index #settings-index-wrapper #site-settings label, #settings-index #settings-index-wrapper #site-settings label,
#settings-index #settings-index-wrapper #option-settings label { #settings-index #settings-index-wrapper #option-settings label,
#settings-index #settings-index-wrapper #member-utils label {
font-family: 'Andale Mono'; font-family: 'Andale Mono';
color: #f2f1ef; color: #f2f1ef;
} }
#settings-index #settings-index-wrapper #member-settings span,
#settings-index #settings-index-wrapper #site-settings span,
#settings-index #settings-index-wrapper #option-settings span,
#settings-index #settings-index-wrapper #member-utils span {
color: #b2cce5;
}
#settings-index #settings-index-wrapper #member-settings input, #settings-index #settings-index-wrapper #member-settings input,
#settings-index #settings-index-wrapper #site-settings input, #settings-index #settings-index-wrapper #site-settings input,
#settings-index #settings-index-wrapper #option-settings input { #settings-index #settings-index-wrapper #option-settings input,
#settings-index #settings-index-wrapper #member-utils input {
width: 95%; width: 95%;
margin: 0 5px 10px 0; margin: 0 5px 10px 0;
height: 30px; height: 30px;
padding: 10px; padding: 10px;
} }
#settings-index #settings-index-wrapper #member-settings input#backup-upload,
#settings-index #settings-index-wrapper #site-settings input#backup-upload,
#settings-index #settings-index-wrapper #option-settings input#backup-upload,
#settings-index #settings-index-wrapper #member-utils input#backup-upload {
visibility: hidden;
display: none;
}
#settings-index #settings-index-wrapper #member-settings .backup-meta,
#settings-index #settings-index-wrapper #site-settings .backup-meta,
#settings-index #settings-index-wrapper #option-settings .backup-meta,
#settings-index #settings-index-wrapper #member-utils .backup-meta {
background: #161d23;
color: #f2f1ef;
padding: 8px;
border-radius: 3px;
margin: 5px 0 0 0;
}
#settings-index #settings-index-wrapper #member-settings #member-avatar-drop, #settings-index #settings-index-wrapper #member-settings #member-avatar-drop,
#settings-index #settings-index-wrapper #site-settings #member-avatar-drop, #settings-index #settings-index-wrapper #site-settings #member-avatar-drop,
#settings-index #settings-index-wrapper #option-settings #member-avatar-drop { #settings-index #settings-index-wrapper #option-settings #member-avatar-drop,
#settings-index #settings-index-wrapper #member-utils #member-avatar-drop {
display: inline-block; display: inline-block;
margin: 0 0 10px 0; margin: 0 0 10px 0;
} }
#settings-index #settings-index-wrapper #member-settings #member-avatar-drop img, #settings-index #settings-index-wrapper #member-settings #member-avatar-drop img,
#settings-index #settings-index-wrapper #site-settings #member-avatar-drop img, #settings-index #settings-index-wrapper #site-settings #member-avatar-drop img,
#settings-index #settings-index-wrapper #option-settings #member-avatar-drop img { #settings-index #settings-index-wrapper #option-settings #member-avatar-drop img,
#settings-index #settings-index-wrapper #member-utils #member-avatar-drop img {
width: 100%; width: 100%;
border-radius: 5px; border-radius: 5px;
overflow: hidden; overflow: hidden;
@ -2060,36 +2101,42 @@ svg.icons {
} }
#settings-index #settings-index-wrapper #member-settings #member-avatar-drop input, #settings-index #settings-index-wrapper #member-settings #member-avatar-drop input,
#settings-index #settings-index-wrapper #site-settings #member-avatar-drop input, #settings-index #settings-index-wrapper #site-settings #member-avatar-drop input,
#settings-index #settings-index-wrapper #option-settings #member-avatar-drop input { #settings-index #settings-index-wrapper #option-settings #member-avatar-drop input,
#settings-index #settings-index-wrapper #member-utils #member-avatar-drop input {
visibility: hidden; visibility: hidden;
display: none; display: none;
} }
#settings-index #settings-index-wrapper #member-settings #member-avatar-drop #privacy-toggle, #settings-index #settings-index-wrapper #member-settings #member-avatar-drop #privacy-toggle,
#settings-index #settings-index-wrapper #site-settings #member-avatar-drop #privacy-toggle, #settings-index #settings-index-wrapper #site-settings #member-avatar-drop #privacy-toggle,
#settings-index #settings-index-wrapper #option-settings #member-avatar-drop #privacy-toggle { #settings-index #settings-index-wrapper #option-settings #member-avatar-drop #privacy-toggle,
#settings-index #settings-index-wrapper #member-utils #member-avatar-drop #privacy-toggle {
width: 50%; width: 50%;
} }
#settings-index #settings-index-wrapper #member-settings #member-avatar-drop #render-toggle, #settings-index #settings-index-wrapper #member-settings #member-avatar-drop #render-toggle,
#settings-index #settings-index-wrapper #site-settings #member-avatar-drop #render-toggle, #settings-index #settings-index-wrapper #site-settings #member-avatar-drop #render-toggle,
#settings-index #settings-index-wrapper #option-settings #member-avatar-drop #render-toggle { #settings-index #settings-index-wrapper #option-settings #member-avatar-drop #render-toggle,
#settings-index #settings-index-wrapper #member-utils #member-avatar-drop #render-toggle {
width: 50%; width: 50%;
} }
#settings-index #settings-index-wrapper #member-settings #member-info, #settings-index #settings-index-wrapper #member-settings #member-info,
#settings-index #settings-index-wrapper #site-settings #member-info, #settings-index #settings-index-wrapper #site-settings #member-info,
#settings-index #settings-index-wrapper #option-settings #member-info { #settings-index #settings-index-wrapper #option-settings #member-info,
#settings-index #settings-index-wrapper #member-utils #member-info {
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
width: 100%; width: 100%;
} }
#settings-index #settings-index-wrapper #member-settings #member-info input, #settings-index #settings-index-wrapper #member-settings #member-info input,
#settings-index #settings-index-wrapper #site-settings #member-info input, #settings-index #settings-index-wrapper #site-settings #member-info input,
#settings-index #settings-index-wrapper #option-settings #member-info input { #settings-index #settings-index-wrapper #option-settings #member-info input,
#settings-index #settings-index-wrapper #member-utils #member-info input {
width: 95%; width: 95%;
margin: 0 5px 10px 0; margin: 0 5px 10px 0;
} }
#settings-index #settings-index-wrapper #member-settings textarea, #settings-index #settings-index-wrapper #member-settings textarea,
#settings-index #settings-index-wrapper #site-settings textarea, #settings-index #settings-index-wrapper #site-settings textarea,
#settings-index #settings-index-wrapper #option-settings textarea { #settings-index #settings-index-wrapper #option-settings textarea,
#settings-index #settings-index-wrapper #member-utils textarea {
background: #161d23; background: #161d23;
width: 95%; width: 95%;
height: 155px; height: 155px;