created develop branch for work in progress, master branch will be for most current releases

This commit is contained in:
Ro 2019-01-03 12:13:26 -05:00
parent e3d5146881
commit 684d5bbf2d
4 changed files with 29 additions and 14 deletions

View file

@ -1897,19 +1897,22 @@ 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 #theme-settings { #settings-index #settings-index-wrapper #theme-settings,
#settings-index #settings-index-wrapper #mail-settings {
width: 80%; width: 80%;
margin-bottom: 40px; margin-bottom: 40px;
} }
#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 #theme-settings label { #settings-index #settings-index-wrapper #theme-settings label,
#settings-index #settings-index-wrapper #mail-settings label {
font-family: 'Apercu-Mono'; font-family: 'Apercu-Mono';
color: #f2f1ef; color: #f2f1ef;
} }
#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 #theme-settings input { #settings-index #settings-index-wrapper #theme-settings input,
#settings-index #settings-index-wrapper #mail-settings input {
width: 44%; width: 44%;
margin-right: 5px; margin-right: 5px;
height: 30px; height: 30px;
@ -1917,12 +1920,14 @@ svg.icons {
} }
#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 #theme-settings #member-avatar-drop { #settings-index #settings-index-wrapper #theme-settings #member-avatar-drop,
#settings-index #settings-index-wrapper #mail-settings #member-avatar-drop {
display: inline-block; display: inline-block;
} }
#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 #theme-settings #member-avatar-drop img { #settings-index #settings-index-wrapper #theme-settings #member-avatar-drop img,
#settings-index #settings-index-wrapper #mail-settings #member-avatar-drop img {
width: 110px; width: 110px;
border-radius: 10px; border-radius: 10px;
overflow: hidden; overflow: hidden;
@ -1930,18 +1935,21 @@ 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 #theme-settings #member-avatar-drop input { #settings-index #settings-index-wrapper #theme-settings #member-avatar-drop input,
#settings-index #settings-index-wrapper #mail-settings #member-avatar-drop input {
visibility: hidden; visibility: hidden;
display: none; display: none;
} }
#settings-index #settings-index-wrapper #member-settings #site-background, #settings-index #settings-index-wrapper #member-settings #site-background,
#settings-index #settings-index-wrapper #site-settings #site-background, #settings-index #settings-index-wrapper #site-settings #site-background,
#settings-index #settings-index-wrapper #theme-settings #site-background { #settings-index #settings-index-wrapper #theme-settings #site-background,
#settings-index #settings-index-wrapper #mail-settings #site-background {
margin: 0 0 10px 0; margin: 0 0 10px 0;
} }
#settings-index #settings-index-wrapper #member-settings #site-background img, #settings-index #settings-index-wrapper #member-settings #site-background img,
#settings-index #settings-index-wrapper #site-settings #site-background img, #settings-index #settings-index-wrapper #site-settings #site-background img,
#settings-index #settings-index-wrapper #theme-settings #site-background img { #settings-index #settings-index-wrapper #theme-settings #site-background img,
#settings-index #settings-index-wrapper #mail-settings #site-background img {
width: 100%; width: 100%;
border-radius: 5px; border-radius: 5px;
overflow: hidden; overflow: hidden;
@ -1949,13 +1957,15 @@ svg.icons {
} }
#settings-index #settings-index-wrapper #member-settings #site-background input, #settings-index #settings-index-wrapper #member-settings #site-background input,
#settings-index #settings-index-wrapper #site-settings #site-background input, #settings-index #settings-index-wrapper #site-settings #site-background input,
#settings-index #settings-index-wrapper #theme-settings #site-background input { #settings-index #settings-index-wrapper #theme-settings #site-background input,
#settings-index #settings-index-wrapper #mail-settings #site-background input {
visibility: hidden; visibility: hidden;
display: none; display: none;
} }
#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 #theme-settings #member-info { #settings-index #settings-index-wrapper #theme-settings #member-info,
#settings-index #settings-index-wrapper #mail-settings #member-info {
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
margin: 0 0 0 10px; margin: 0 0 0 10px;
@ -1963,13 +1973,15 @@ svg.icons {
} }
#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 #theme-settings #member-info input { #settings-index #settings-index-wrapper #theme-settings #member-info input,
#settings-index #settings-index-wrapper #mail-settings #member-info input {
width: 94%; width: 94%;
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 #theme-settings textarea { #settings-index #settings-index-wrapper #theme-settings textarea,
#settings-index #settings-index-wrapper #mail-settings textarea {
background: #161d23; background: #161d23;
width: 91.5%; width: 91.5%;
height: 100px; height: 100px;

File diff suppressed because one or more lines are too long

View file

@ -39,5 +39,8 @@ block main-content
-else -else
a.theme-select(href="#" id=themes[index].theme.name, data-enabled="false") a.theme-select(href="#" id=themes[index].theme.name, data-enabled="false")
= themes[index].theme["display-name"] = themes[index].theme["display-name"]
#mail-settings
label MAIL SETTINGS
br
button#save-toggle SAVE SETTINGS button#save-toggle SAVE SETTINGS

View file

@ -11,7 +11,7 @@
width 320px width 320px
height 45px height 45px
#member-settings, #site-settings, #theme-settings #member-settings, #site-settings, #theme-settings, #mail-settings
label label
font-family 'Apercu-Mono' font-family 'Apercu-Mono'
color $white color $white