Merge branch 'develop' into feature/new-theme
# Conflicts: # .gitignore # public/themes/pterodactyl/js/frontend/files/filemanager.min.js # public/themes/pterodactyl/js/frontend/files/filemanager.min.js.map # public/themes/pterodactyl/js/frontend/serverlist.js # resources/themes/pterodactyl/server/files/list.blade.php
This commit is contained in:
commit
3a88deb97a
170 changed files with 9023 additions and 2222 deletions
|
@ -20,10 +20,17 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
.login-box, .register-box {
|
||||
width: 40%;
|
||||
margin: 7% auto
|
||||
}
|
||||
|
||||
.login-box, .register-box {
|
||||
width: 460px;
|
||||
}
|
||||
@media (max-width:768px) {
|
||||
.login-box, .register-box {
|
||||
width: 90%;
|
||||
margin-top: 20px
|
||||
}
|
||||
}
|
||||
|
||||
.weight-100 {
|
||||
font-weight: 100;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue