Pin Docker to 1.10 not the patch version, otherwise things could go horribly wrong.

Added the_form to the Page Editor.
Added a phrase for the Menu Editor title rather than reusing the Menu Manager's one.
Replaced a dotted border I missed in Tempra Simple.
Fixed a floater in the User Manager for Shadow.
Tweaked the form CSS for Nox.
Tweaked panel_submitrow in Nox.

Continued work on the User Manager for Nox.
This commit is contained in:
Azareal 2018-08-11 22:09:26 +10:00
parent 06d6715c47
commit 18c5223143
15 changed files with 55 additions and 9 deletions

View File

@ -1,4 +1,4 @@
FROM golang:1.10.3 FROM golang:1.10
RUN git clone https://github.com/Azareal/Gosora RUN git clone https://github.com/Azareal/Gosora
RUN mv Gosora app RUN mv Gosora app
ADD . /app/ ADD . /app/

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

View File

@ -758,6 +758,7 @@
"panel_themes_menus_head":"Menus", "panel_themes_menus_head":"Menus",
"panel_themes_menus_main":"Main Menu", "panel_themes_menus_main":"Main Menu",
"panel_themes_menus_items_head":"Menu Items",
"panel_themes_menus_item_edit_button_aria":"Edit menu item", "panel_themes_menus_item_edit_button_aria":"Edit menu item",
"panel_themes_menus_item_delete_button_aria":"Delete menu item", "panel_themes_menus_item_delete_button_aria":"Delete menu item",

View File

@ -6,7 +6,7 @@
<div class="rowitem"><h1>{{lang "panel_pages_edit_head"}}</h1></div> <div class="rowitem"><h1>{{lang "panel_pages_edit_head"}}</h1></div>
</div> </div>
<form action="/panel/pages/edit/submit/{{.Page.ID}}?session={{.CurrentUser.Session}}" method="post"> <form action="/panel/pages/edit/submit/{{.Page.ID}}?session={{.CurrentUser.Session}}" method="post">
<div id="panel_page_edit_item" class="colstack_item"> <div id="panel_page_edit_item" class="colstack_item the_form">
<div class="formrow"> <div class="formrow">
<div class="formitem formlabel"><a>{{lang "panel_pages_name"}}</a></div> <div class="formitem formlabel"><a>{{lang "panel_pages_name"}}</a></div>
<div class="formitem"><input name="name" type="text" value="{{.Page.Name}}" /></div> <div class="formitem"><input name="name" type="text" value="{{.Page.Name}}" /></div>

View File

@ -3,7 +3,7 @@
{{template "panel_menu.html" . }} {{template "panel_menu.html" . }}
<main class="colstack_right"> <main class="colstack_right">
<div class="colstack_item colstack_head"> <div class="colstack_item colstack_head">
<div class="rowitem"><h1>{{lang "panel_themes_menus_head"}}</h1></div> <div class="rowitem"><h1>{{lang "panel_themes_menus_items_head"}}</h1></div>
</div> </div>
<div id="panel_menu_item_holder" class="colstack_item rowlist"> <div id="panel_menu_item_holder" class="colstack_item rowlist">
{{range .ItemList}} {{range .ItemList}}

View File

@ -12,8 +12,8 @@
<img class="bgsub" src="{{.Avatar}}" alt="{{.Name}}'s Avatar" /> <img class="bgsub" src="{{.Avatar}}" alt="{{.Name}}'s Avatar" />
<a class="rowTitle editable_block"{{if $.CurrentUser.Perms.EditUser}} href="/panel/users/edit/{{.ID}}?session={{$.CurrentUser.Session}}"{{end}}>{{.Name}}</a> <a class="rowTitle editable_block"{{if $.CurrentUser.Perms.EditUser}} href="/panel/users/edit/{{.ID}}?session={{$.CurrentUser.Session}}"{{end}}>{{.Name}}</a>
<a href="{{.Link}}" class="tag-mini profile_url">{{lang "panel_users_profile"}}</a> <a href="{{.Link}}" class="tag-mini profile_url">{{lang "panel_users_profile"}}</a>
{{if (.Tag) and (.IsSuperMod)}}<span class="to_right"><span class="panel_tag">{{.Tag}}</span></span>{{end}}
<span class="panel_floater"> <span class="panel_floater">
{{if (.Tag) and (.IsSuperMod)}}<span class="panel_tag">{{.Tag}}</span></span>{{end}}
{{if .IsBanned}}<a href="/users/unban/{{.ID}}?session={{$.CurrentUser.Session}}" class="panel_tag panel_right_button ban_button">{{lang "panel_users_unban"}}</a>{{else if not .IsSuperMod}}<a href="/user/{{.ID}}#ban_user" class="panel_tag panel_right_button ban_button">{{lang "panel_users_ban"}}</a>{{end}} {{if .IsBanned}}<a href="/users/unban/{{.ID}}?session={{$.CurrentUser.Session}}" class="panel_tag panel_right_button ban_button">{{lang "panel_users_unban"}}</a>{{else if not .IsSuperMod}}<a href="/user/{{.ID}}#ban_user" class="panel_tag panel_right_button ban_button">{{lang "panel_users_ban"}}</a>{{end}}
{{if not .Active}}<a href="/users/activate/{{.ID}}?session={{$.CurrentUser.Session}}" class="panel_tag panel_right_button">{{lang "panel_users_activate"}}</a>{{end}} {{if not .Active}}<a href="/users/activate/{{.ID}}?session={{$.CurrentUser.Session}}" class="panel_tag panel_right_button">{{lang "panel_users_activate"}}</a>{{end}}
</span> </span>

View File

@ -195,6 +195,8 @@ h1, h2, h3, h4, h5 {
.mod_floater_options { .mod_floater_options {
width: 100%; width: 100%;
margin-right: 10px; margin-right: 10px;
padding: 4px;
margin-bottom: 0px;
} }
.rowhead, .opthead, .colstack_head { .rowhead, .opthead, .colstack_head {
@ -434,6 +436,11 @@ input {
padding-bottom: 3px; padding-bottom: 3px;
font-size: 16px; font-size: 16px;
} }
input, select {
/*margin-left: 4px;*/
margin-left: 3px;
margin-bottom: 4px;
}
button, .formbutton, .panel_right_button { button, .formbutton, .panel_right_button {
background: rgb(110,110,210); background: rgb(110,110,210);
color: rgb(250,250,250); color: rgb(250,250,250);

View File

@ -97,18 +97,30 @@
input, select, textarea { input, select, textarea {
background: rgb(107,107,107); background: rgb(107,107,107);
color: rgb(217,217,217); color: rgb(197,197,197);
} }
.colstack_right input, .colstack_right select, .colstack_right textarea {
padding: 4px;
padding-bottom: 3px;
padding-left: 6px;
padding-right: 6px;
}
.colstack_right input {
padding-left: 6px;
padding-right: 6px;
}
input:focus, select:focus, textarea:focus { input:focus, select:focus, textarea:focus {
outline: 1px solid rgb(137,137,137); outline: 1px solid rgb(137,137,137);
color: rgb(207,207,207);
} }
/* ? - The background properties need to be redeclared for the new image or it won't work properly */ /* ? - The background properties need to be redeclared for the new image or it won't work properly */
input { input {
background-image: url(./fa-svg/pencil-alt-light.svg); background-image: url(./fa-svg/pencil-alt-light.svg);
background-size: 12px; background-size: 12px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: right 10px bottom 9px; background-position: right 9px bottom 7px;
background-position-x: right 10px; background-position-x: right 9px;
} }
input::placeholder, textarea::placeholder { input::placeholder, textarea::placeholder {
color: rgb(167,167,167); color: rgb(167,167,167);
@ -121,6 +133,9 @@ button, .formbutton {
button, .formbutton, .panel_right_button { button, .formbutton, .panel_right_button {
background: rgb(100,100,200); background: rgb(100,100,200);
} }
/*.formlabel {
font-size: 17px;
}*/
.panel_right_button { .panel_right_button {
margin-left: 2px; margin-left: 2px;
padding: 5px; padding: 5px;
@ -190,9 +205,29 @@ button, .formbutton, .panel_right_button {
height: 80px; height: 80px;
} }
#panel_users .rowitem .to_right {
order: 0;
margin-right: auto;
}
#panel_users .rowitem .profile_url {
order: 1;
}
#panel_users .rowitem .panel_floater {
order: 2;
}
.panel_submitrow { .panel_submitrow {
margin-top: 8px; margin-top: 8px;
} }
.colstack_right .colstack_item:not(.colstack_head):not(.rowhead).panel_submitrow .rowitem {
padding-bottom: 14px;
}
.panel_submitrow .rowitem button:first-child {
margin-left: auto;
}
.panel_submitrow .rowitem button:last-child {
margin-right: auto;
}
.panel_plugin_meta { .panel_plugin_meta {
display: flex; display: flex;

View File

@ -41,6 +41,9 @@
display: flex; display: flex;
} }
#panel_users .panel_tag {
float: right;
}
#panel_users .ban_button { #panel_users .ban_button {
font-size: 10px; font-size: 10px;
float: none; float: none;

View File

@ -813,8 +813,7 @@ input[type=checkbox]:checked + label.poll_option_label .sel {
font-size: 30px; font-size: 30px;
border-width: 1px; border-width: 1px;
background-color: #FFFFFF; background-color: #FFFFFF;
border-style: dotted; border: 1px solid hsl(0,0%,80%);
border-color: #505050;
padding: 0px; padding: 0px;
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
@ -828,6 +827,7 @@ input[type=checkbox]:checked + label.poll_option_label .sel {
display: block; display: block;
text-decoration: none; text-decoration: none;
color: #505050; color: #505050;
padding: 2px;
} }
.prev_button { .prev_button {
left: 14px; left: 14px;