Merge branch 'develop' into feature/admin-retheme

# Conflicts:
#	public/themes/pterodactyl/css/pterodactyl.css
This commit is contained in:
Dane Everitt 2017-03-03 17:35:04 -05:00
commit 799f2ee6d9
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
22 changed files with 10923 additions and 528 deletions

View file

@ -245,3 +245,24 @@ span[aria-labelledby="select2-pUserId-container"] {
.nav-tabs-custom.nav-tabs-floating > .nav-tabs > li:first-child.active > a {
border-radius: 0 0 0 3px;
}
.position-relative {
position: relative;
}
.terminal-notify {
position: absolute;
right: 10px;
bottom: 10px;
/* Browsers usually have a 17px scrollbar which is visible in the terminal */
padding: 7px 24px 7px 7px;
border-top-left-radius: 3px;
background: white;
color: black;
opacity: .5;
cursor: pointer;
}
.terminal-notify:hover {
opacity: .9;
}