Merge pull request #364 from bergware/master

Header and style corrections
This commit is contained in:
tom mortensen
2018-08-24 08:53:03 -07:00
committed by GitHub
18 changed files with 75 additions and 47 deletions

View File

@@ -105,7 +105,7 @@ var sortableHelper = function(e,i){
function loadlist() {
$.get('/plugins/dynamix.docker.manager/include/DockerContainers.php',function(d) {
var data = d.split(/\0/);
$('div.spinner').hide('slow');
$('div.spinner').hide('slow').remove();
$('#docker_list').html(data[0]).sortable({helper:sortableHelper,items:'tr.sortable',opacity:0.4,update:function(e,i){
var row = $('#docker_list').find('tr:first');
var names = ''; var index = '';

View File

@@ -190,7 +190,8 @@ function checkAll() {
}
function updateAll() {
$('input[type=button]').prop('disabled',true);
$('div.spinner').addClass('fixed').show('slow');
$('#docker_list').append("<div class='spinner fixed'></div>");
$('div.spinner').html(unraid_logo).show('slow');
var list = '';
for (var i=0,ct; ct=docker[i]; i++) if (ct.update=='false') list += '&ct[]='+encodeURI(ct.name);
var address = '/plugins/dynamix.docker.manager/include/CreateDocker.php?updateContainer=true'+list;

View File

@@ -26,6 +26,9 @@ $check = $notify['version'] ? 0 : 1;
<link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.filetree.css">
<style>
#plugin_tree{width:33%;height:200px;overflow-y:scroll}
<?if (strstr('white,black',$display['theme'])):?>
span.vhshift{margin-top:30px!important;margin-right:-20px!important}
<?endif;?>
</style>
<script src="<?autov('/webGui/javascript/jquery.filetree.js')?>"></script>
<script>
@@ -50,7 +53,7 @@ function loadlist(id) {
var cmd = id.split(':');
var tr = 'tr#'+cmd[0].replace(/[\. _]/g,'');
switch (cmd[1]) {
case 'return' : $('div.spinner').hide('slow');list.html(data[0]); $('#plugin_table').trigger('destroy'); break;
case 'return' : $('div.spinner').hide('slow').remove();list.html(data[0]); $('#plugin_table').trigger('destroy'); break;
case 'remove' : list.find(tr).remove(); break;
case 'update' : list.find(tr).remove();
case 'install': if (!list.find(tr).length) list.append(data[0]).trigger('update'); break;
@@ -70,12 +73,16 @@ function loadlist(id) {
<?endif;?>
});
}
function spinner() {
$('#plugin_list').append("<div class='spinner fixed'></div>");
$('div.spinner').html(unraid_logo).show('slow');
}
$(function() {
loadlist();
$('#plugin_tree').fileTree({root:'/boot/',filter:'plg'}, function(file) {$('#plugin_file').val(file);});
$('.tabs').append("<span id='updateall' class='status vhshift' style='display:none;margin-left:12px'><input type='button' value='Update All Plugins' onclick='$(\"div.spinner\").addClass('fixed').show(\"slow\");openBox(\"/plugins/dynamix.plugin.manager/scripts/plugin&arg1=updateall\",\"Update All Plugins\",490,430,true,\"loadlist\",\":return\")'></span>");
$('.tabs').append("<span id='updateall' class='status vhshift' style='display:none;margin-left:12px'><input type='button' value='Update All Plugins' onclick='spinner();openBox(\"/plugins/dynamix.plugin.manager/scripts/plugin&arg1=updateall\",\"Update All Plugins\",600,600,true,\"loadlist\",\":return\")'></span>");
<?if ($check):?>
$('.tabs').append("<span id='checkall' class='status vhshift'><input type='button' value='Check For Updates' onclick='$(\"div.spinner\").addClass('fixed').show(\"slow\");openBox(\"/plugins/dynamix.plugin.manager/scripts/plugin&arg1=checkall\",\"Plugin Update Check\",490,430,true,\"loadlist\",\":return\")' disabled></span>");
$('.tabs').append("<span id='checkall' class='status vhshift'><input type='button' value='Check For Updates' onclick='spinner();openBox(\"/plugins/dynamix.plugin.manager/scripts/plugin&arg1=checkall\",\"Plugin Update Check\",600,600,true,\"loadlist\",\":return\")' disabled></span>");
<?endif;?>
});
</script>

View File

@@ -32,7 +32,12 @@ if (file_exists('/boot/previous/changes.txt')) {
$branch = strpos($version,'rc')===false ? 'Stable' : 'Next';
}
?>
<style>input[value='Install'],input[value='Update'],input[value='Restore']{margin:0}</style>
<style>
input[value='Install'],input[value='Update'],input[value='Restore']{margin:0}
<?if (strstr('white,black',$display['theme'])):?>
span.vhshift{margin-top:30px!important;margin-right:-20px!important}
<?endif;?>
</style>
<script>
var original = null;
@@ -79,7 +84,7 @@ function loadlist(id) {
$(function() {
loadlist();
<?if ($check):?>
$('.tabs').append("<span class='status vhshift'><input type='button' id='checkos' value='Check for Updates' onclick='openBox(\"/plugins/dynamix.plugin.manager/scripts/plugin&arg1=checkos\",\"System Update Check\",490,430,true,\"loadlist\",\":return\")' disabled></span>");
$('.tabs').append("<span class='status vhshift'><input type='button' id='checkos' value='Check for Updates' onclick='openBox(\"/plugins/dynamix.plugin.manager/scripts/plugin&arg1=checkos\",\"System Update Check\",600,600,true,\"loadlist\",\":return\")' disabled></span>");
<?endif;?>
});
</script>

View File

@@ -57,6 +57,9 @@ input.option{display:none;width:40px}
span.devtext{display:none;font-weight:bold}
span.helptext{display:none;font-style:italic}
span.code{display:inline-block;width:186px}
<?if (strstr('white,black',$display['theme'])):?>
span.vhshift{margin-top:30px!important;margin-right:-20px!important}
<?endif;?>
</style>
<script>
function doDispatch(form) {

View File

@@ -42,7 +42,7 @@ function diagnostics() {
}
</script>
<div class="spinner" style="display:none"></div>
<div id="pleaseWait" style="display:none;font-weight:bold;color:red;text-align:center;margin:0">Please wait, collecting diagnostic information...</div>
<div id="pleaseWait" style="display:none;font-weight:bold;color:red;text-align:center;margin:0">Please wait... collecting diagnostic information (this may take several minutes)</div>
This utility is used for troubleshooting purposes. It will collect all of the system information and configuration files, and package these files in a single ZIP file which can be saved locally.
Subsequently, this file can be included in your correspondence with Limetech or the unRAID forum.

View File

@@ -36,6 +36,9 @@ div.clone2{position:absolute;right:0;margin-top:48px}
select.clone{min-width:144px;margin-right:0}
input.clone{margin-left:8px;margin-right:0}
span.clone,i.clone{margin-right:4px}
<?if (strstr('white,black',$display['theme'])):?>
span.vhshift{margin-top:30px!important;margin-right:-20px!important}
<?endif;?>
</style>
<script>
var ctrl = "<span class='ctrl2 status <?=$tabbed?'vhshift':'vshift'?>'><a href='/Shares/Disk?name=<?=$prev?>' title='previous disk share'><button type='button' style='margin-right:4px'><i class='fa fa-chevron-left fa-fw'></i></button></a><a href='/Shares/Disk?name=<?=$next?>' title='next disk share'><button type='button'><i class='fa fa-chevron-right fa-fw'></i></button></a></span>";

View File

@@ -70,4 +70,4 @@ This utility is used for troubleshooting purposes. It will collect all of the sy
<input type="button" value="Upload" onclick="upload()"><input type="button" value="Done" onclick="done()">
<br><div id="pleaseWait" style="display:none;font-weight:bold;color:blue;text-align:center">Please wait, uploading hardware information...</div>
<br><div id="pleaseWait" style="display:none;font-weight:bold;color:blue;text-align:center">Please wait... uploading hardware information (this may take several minutes)</div>

View File

@@ -39,6 +39,9 @@ div.clone2{position:absolute;right:0;margin-top:48px}
select.clone{min-width:144px;margin-right:0}
input.clone{margin-left:8px;margin-right:0}
span.clone,i.clone{margin-right:4px}
<?if (strstr('white,black',$display['theme'])):?>
span.vhshift{margin-top:30px!important;margin-right:-20px!important}
<?endif;?>
</style>
<script>
function toggleButton(button,id) {

View File

@@ -10,7 +10,7 @@ scale="-1"
resize="0"
wwn="0"
total="1"
banner="image"
banner=""
dashapps="icons"
tabs="1"
users="Tasks:3"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 222.36 39.04"><defs><linearGradient id="header-logo" x1="47.53" y1="79.1" x2="170.71" y2="-44.08" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e32929"/><stop offset="1" stop-color="#ff8d30"/></linearGradient></defs><title>Feedback</title><path d="M146.7,29.47H135l-3,9h-6.49L138.93,0h8l13.41,38.49h-7.09L142.62,6.93l-5.83,16.88h8ZM29.69,0V25.4c0,8.91-5.77,13.64-14.9,13.64S0,34.31,0,25.4V0H6.54V25.4c0,5.17,3.19,7.92,8.25,7.92s8.36-2.75,8.36-7.92V0ZM50.86,12v26.5H44.31V0h6.11l17,26.5V0H74V38.49H67.9ZM171.29,0h6.54V38.49h-6.54Zm51.07,24.69c0,9-5.88,13.8-15.17,13.8H192.67V0H207.3c9.18,0,15.06,4.78,15.06,13.8ZM215.82,13.8c0-5.28-3.3-8.14-8.52-8.14h-8.08V32.77h8c5.33,0,8.63-2.8,8.63-8.08ZM108.31,23.92c4.34-1.6,6.93-5.28,6.93-11.55C115.24,3.68,110.18,0,102.48,0H88.84V38.49h6.55V5.66h6.87c3.8,0,6.21,1.82,6.21,6.71s-2.41,6.76-6.21,6.76H98.88l9.21,19.36h7.53Z" fill="url(#header-logo)"/></svg>

After

Width:  |  Height:  |  Size: 1005 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 133.52 76.97" class="unraid_mark"><defs><linearGradient id="unraid_logo" x1="23.76" y1="81.49" x2="109.76" y2="-4.51" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e32929"/><stop offset="1" stop-color="#ff8d30"/></linearGradient></defs><path d="m70,19.24zm57,0l6.54,0l0,38.49l-6.54,0l0,-38.49z" fill="url(#unraid_logo)" class="unraid_mark_9"/><path d="m70,19.24zm47.65,11.9l-6.55,0l0,-23.79l6.55,0l0,23.79z" fill="url(#unraid_logo)" class="unraid_mark_8"/><path d="m70,19.24zm31.77,-4.54l-6.54,0l0,-14.7l6.54,0l0,14.7z" fill="url(#unraid_logo)" class="unraid_mark_7"/><path d="m70,19.24zm15.9,11.9l-6.54,0l0,-23.79l6.54,0l0,23.79z" fill="url(#unraid_logo)" class="unraid_mark_6"/><path d="m63.49,19.24l6.51,0l0,38.49l-6.51,0l0,-38.49z" fill="url(#unraid_logo)" class="unraid_mark_5"/><path d="m70,19.24zm-22.38,26.6l6.54,0l0,23.78l-6.54,0l0,-23.78z" fill="url(#unraid_logo)" class="unraid_mark_4"/><path d="m70,19.24zm-38.26,43.03l6.55,0l0,14.73l-6.55,0l0,-14.73z" fill="url(#unraid_logo)" class="unraid_mark_3"/><path d="m70,19.24zm-54.13,26.6l6.54,0l0,23.78l-6.54,0l0,-23.78z" fill="url(#unraid_logo)" class="unraid_mark_2"/><path d="m70,19.24zm-63.46,38.49l-6.54,0l0,-38.49l6.54,0l0,38.49z" fill="url(#unraid_logo)" class="unraid_mark_1"/></svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -86,13 +86,12 @@ function updateTime() {
if (expiretime > 0) {
var remainingtime = expiretime - now.getTime()/1000;
if (remainingtime <= 0) {
$('#licenseexpire').html('<em> (click here for details)</em>');
$('#licensetype').addClass('warning')
$('#licenseexpire').html('Trial period: expired (click here for details)');
} else {
days = parseInt(remainingtime/86400);
hour = parseInt(remainingtime/3600%24);
mins = parseInt(remainingtime/60%60);
$('#licenseexpire').html(' - '+((days|hour|mins)?(days?plus(days,'day',true):(hour?plus(hour,'hour',true):plus(mins,'minute',true))):'less than a minute')+' remaining (click here for details)');
$('#licenseexpire').html('Trial period: '+((days|hour|mins)?(days?plus(days,'day',true):(hour?plus(hour,'hour',true):plus(mins,'minute',true))):'less than a minute')+' remaining (click here for details)');
}
}
setTimeout(updateTime,1000);
@@ -296,13 +295,14 @@ $.ajaxPrefilter(function(s, orig, xhr){
<div class="upgrade_notice" style="display:none"></div>
<div id="header" class="<?=$display['banner']?>">
<div class="logo">
<a href="#" onclick="openBox('/webGui/include/Feedback.php','Feedback',600,600,false);return false;"><img src="/webGui/images/UN-logotype-gradient.png" title="Feedback" border="0"/></a>
<a href="/Tools/Registration"><span></span></a>
<a href="#" onclick="openBox('/webGui/include/Feedback.php','Feedback',600,600,false);return false;"><?=file_get_contents("$docroot/webGui/images/UN-logotype-gradient.svg")?></a>
<a href="/Tools/Registration"><span id="licenseexpire"></span></a>
</div>
<div class="block">
<span class="text-left">Server<br/>Description<br/>Version<br/>Uptime</span>
<span class="text-right"><?=$var['NAME']." &bullet; ".$eth0['IPADDR:0']?><br/><?=$var['COMMENT']?><br/><?=$var['version']?>
<a href="/Tools/Registration" class="header" title="Go to Registration page"><span id="licensetype"><?=$var['regTy']?></span></a><?=$notes?><br/><span id="uptime"></span></span>
<span class="text-right"><?=$var['NAME']." &bullet; ".$eth0['IPADDR:0']?><br/><?=$var['COMMENT']?><br/>
<a href="/Tools/Registration" class="header" title="Go to Registration page"><?=$var['version']?>-<span id="licensetype"><?=$var['regTy']?></span></a><?=$notes?><br/>
<span id="uptime"></span></span>
</div>
</div>
<a href="#" class="back_to_top" title="Back To Top"><i class="fa fa-arrow-circle-up"></i></a>
@@ -442,7 +442,7 @@ function parseINI(data){
return value;
}
// unraid animated logo
var unraid_logo = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 133.52 76.97" class="unraid_mark"><defs><linearGradient id="unraid_logo" x1="23.76" y1="81.49" x2="109.76" y2="-4.51" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e32929"/><stop offset="1" stop-color="#ff8d30"/></linearGradient></defs><path d="m70,19.24zm57,0l6.54,0l0,38.49l-6.54,0l0,-38.49z" fill="url(#unraid_logo)" class="unraid_mark_9"/><path d="m70,19.24zm47.65,11.9l-6.55,0l0,-23.79l6.55,0l0,23.79z" fill="url(#unraid_logo)" class="unraid_mark_8"/><path d="m70,19.24zm31.77,-4.54l-6.54,0l0,-14.7l6.54,0l0,14.7z" fill="url(#unraid_logo)" class="unraid_mark_7"/><path d="m70,19.24zm15.9,11.9l-6.54,0l0,-23.79l6.54,0l0,23.79z" fill="url(#unraid_logo)" class="unraid_mark_6"/><path d="m63.49,19.24l6.51,0l0,38.49l-6.51,0l0,-38.49z" fill="url(#unraid_logo)" class="unraid_mark_5"/><path d="m70,19.24zm-22.38,26.6l6.54,0l0,23.78l-6.54,0l0,-23.78z" fill="url(#unraid_logo)" class="unraid_mark_4"/><path d="m70,19.24zm-38.26,43.03l6.55,0l0,14.73l-6.55,0l0,-14.73z" fill="url(#unraid_logo)" class="unraid_mark_3"/><path d="m70,19.24zm-54.13,26.6l6.54,0l0,23.78l-6.54,0l0,-23.78z" fill="url(#unraid_logo)" class="unraid_mark_2"/><path d="m70,19.24zm-63.46,38.49l-6.54,0l0,-38.49l6.54,0l0,38.49z" fill="url(#unraid_logo)" class="unraid_mark_1"/></svg>';
var unraid_logo = '<?=file_get_contents("$docroot/webGui/images/animated-logo.svg")?>';
var watchdog = new NchanSubscriber('/sub/var', /^((?!chrome|android).)*safari/i.test(navigator.userAgent) ? {subscriber:'longpoll'} : {});
watchdog.on('message', function(data) {
@@ -575,7 +575,7 @@ $(function() {
});
}
$('form').append($('<input>').attr({type:'hidden', name:'csrf_token', value:'<?=$var['csrf_token']?>'}));
setTimeout(function(){$('div.spinner').each(function(){$(this).html(unraid_logo);});},100); // display animation if longer than 100ms
setTimeout(function(){$('div.spinner').each(function(){$(this).html(unraid_logo);});},150); // display animation if page loading takes longer than 150ms
watchdog.start();
});
</script>

View File

@@ -44,13 +44,14 @@ input.narrow{width:166px}
input.trim{width:50px}
form+p{display:none}
#header{position:fixed;top:0;left:0;width:100%;height:90px;z-index:100;margin:0;background-color:#EDEAEF;background-size:100% 90px;border-bottom:#9794A0 1px solid}
#header .logo{float:left;margin-top:20px;margin-left:100px}
#header .logo img{margin:4px 50px 2px 1px}
#header .logo a{color:#5D6833;font-size:24px}
#header .block{margin:4px 10px 0 0;float:right;text-align:right;background-color:rgba(244,242,244,0.5);color:#373F49;border-radius:10px;padding:2px 8px}
#header .logo{float:left;margin-top:25px;margin-left:76px}
#header .logo svg{margin-right:180px;height:40px}
#header .logo a span{color:#ff8c2f;font-size:24px;font-weight:bold;float:right;background-color:rgba(244,242,244,0.4);border-radius:10px;padding:6px 20px}
#header .block{margin:2px 2px 0 0;float:right;text-align:right;background-color:rgba(244,242,244,0.4);color:#373F49;border-radius:10px;padding:5px 10px}
#header .text-left{float:left;text-align:right;padding-right:5px;border-right:solid medium #5D6833}
#header .text-right{float:right;text-align:left;padding-left:5px;padding-right:20px}
#header #licensetype{font-weight:bold;color:#ff8c2f;text-transform:uppercase;letter-spacing:1px}
#header .text-right{float:right;text-align:left;padding-left:5px}
#header .text-right a{color:#ff8c2f}
#header #licensetype{font-weight:bold;font-style:italic}
#menu{position:fixed;top:0;left:0;bottom:12px;width:65px;padding:0;margin:0;background:#383A34;z-index:100;box-shadow:inset -1px 0 2px #EDEAEF}
#nav-block{position:absolute;top:0;bottom:12px;color:#5D6833;white-space:nowrap;float:left;overflow-y:scroll;direction:rtl;letter-spacing:2px}
#nav-block::-webkit-scrollbar{display:none}
@@ -102,7 +103,7 @@ span.tub span[id^='txt-tub']{margin-top:7px}
.usage-disk.sys>span{font-size:13px}
.usage-disk.all{background-color:transparent}
.usage-disk.all>span{font-size:12px}
.notice{background:#FFF6BF url(../images/notice.png) no-repeat;background-position:60px 50%;font-size:16px;text-align:left;padding:15px 0 15px 130px;display:block;height:70px;line-height:70px;width:100%;vertical-align:middle;border-top:1px solid #FFD324;border-bottom:1px solid #FFD324}
.notice{background:#FFF6BF url(../images/notice.png) no-repeat;background-position:60px 50%;font-size:16px;text-align:left;padding:15px 0 15px 130px;display:block;height:70px;line-height:70px;vertical-align:middle;border-top:1px solid #FFD324;border-bottom:1px solid #FFD324}
.greenbar{background:-webkit-radial-gradient(#127A05,#17BF0B);background:linear-gradient(#127A05,#17BF0B)}
.orangebar{background:-webkit-radial-gradient(#CE7C10,#F0B400);background:linear-gradient(#CE7C10,#F0B400)}
.redbar{background:-webkit-radial-gradient(#941C00,#DE1100);background:linear-gradient(#941C00,#DE1100)}

View File

@@ -45,13 +45,14 @@ input.narrow{width:166px}
input.trim{width:50px}
#header{position:fixed;top:0;left:0;width:100%;height:140px;z-index:100;margin:0;background:#f2f2f2}
#header.image{background-size:100% 90px;background-repeat:no-repeat;color:#1c1c1c}
#header .logo{float:left;margin-top:20px;margin-left:20px}
#header .logo img{margin:4px 50px 0 20px}
#header .logo a{color:#ff8c2f;font-size:24px}
#header .block{margin:2px 5px 0 0;float:right;text-align:right;background-color:rgba(242,242,242,0.4);border-radius:10px;padding:5px 20px}
#header .logo{float:left;margin-top:34px;margin-left:11px}
#header .logo svg{margin-right:180px;height:40px}
#header .logo a span{color:#ff8c2f;font-size:24px;font-weight:bold;float:right;background-color:rgba(242,242,242,0.4);border-radius:10px;padding:6px 20px}
#header .block{margin:2px 2px 0 0;float:right;text-align:right;background-color:rgba(242,242,242,0.4);border-radius:10px;padding:5px 10px}
#header .text-left{float:left;text-align:right;color:#1c1c1c;padding-right:5px;border-right:solid medium #f15a2c}
#header .text-right{float:right;color:#1c1c1c;text-align:left;padding-left:5px;min-width:165px}
#header #licensetype{font-weight:bold;color:#ff8c2f;text-transform:uppercase;letter-spacing:1px}
#header .text-right{float:right;color:#1c1c1c;text-align:left;padding-left:5px}
#header .text-right a{color:#ff8c2f}
#header #licensetype{font-weight:bold;font-style:italic}
#title{margin:20px 0 32px 0;padding:8px 10px;clear:both;border-bottom:#2b2b2b 1px solid;background:#262626;letter-spacing:2px}
#title span.left{font-size:15px}
#title span.right{font-size:13px;padding-top:2px;padding-right:10px;float:right}
@@ -96,7 +97,7 @@ input.trim{width:50px}
.usage-disk.sys>span{color:#f2f2f2;font-size:14px}
.usage-disk.all{margin-right:2px}
.usage-disk.all>span{color:#f2f2f2;font-size:12px}
.notice{background:#FFF6BF url(../images/notice.png) no-repeat;background-position:60px 50%;color:#1c1c1c;font-size:16px;text-align:left;margin-top:180px;padding:15px 0 15px 130px;display:block;height:70px;line-height:70px;width:100%;vertical-align:middle;border-top:2px solid #FFD324;border-bottom:2px solid #FFD324}
.notice{background:#FFF6BF url(../images/notice.png) no-repeat;background-position:60px 50%;color:#1c1c1c;font-size:16px;text-align:left;margin-top:180px;padding:15px 0 15px 130px;display:block;height:70px;line-height:70px;vertical-align:middle;border-top:2px solid #FFD324;border-bottom:2px solid #FFD324}
.whitebar{background:-webkit-gradient(linear,left top,right top,from(#C7C7C7),to(#EEEEEE));background:linear-gradient(90deg,#C7C7C7 0,#EEEEEE)}
.greenbar{background:-webkit-gradient(linear,left top,right top,from(#127A05),to(#17BF0B));background:linear-gradient(90deg,#127A05 0,#17BF0B)}
.orangebar{background:-webkit-gradient(linear,left top,right top,from(#CE7C10),to(#CE7C10));background:linear-gradient(90deg,#CE7C10 0,#CE7C10)}

View File

@@ -44,13 +44,14 @@ input.narrow{width:166px}
input.trim{width:50px}
form+p{display:none}
#header{position:fixed;top:0;left:0;width:100%;height:90px;z-index:100;margin:0;background-color:#121510;background-size:100% 90px;border-bottom:#42453E 1px solid}
#header .logo{float:left;margin-top:20px;margin-left:100px}
#header .logo img{margin:4px 50px 2px 1px}
#header .logo a{color:#5D6833;font-size:24px}
#header .block{margin:4px 10px 0 0;float:right;text-align:right;background-color:rgba(27,29,27,0.5);color:#99A5B2;border-radius:10px;padding:2px 8px}
#header .logo{float:left;margin-top:25px;margin-left:76px}
#header .logo svg{margin-right:180px;height:40px}
#header .logo a span{color:#ff8c2f;font-size:24px;font-weight:bold;float:right;background-color:rgba(27,29,27,0.4);border-radius:10px;padding:6px 20px}
#header .block{margin:2px 2px 0 0;float:right;text-align:right;background-color:rgba(27,29,27,0.4);color:#99A5B2;border-radius:10px;padding:5px 10px}
#header .text-left{float:left;text-align:right;padding-right:5px;border-right:solid medium #5D6833}
#header .text-right{float:right;text-align:left;padding-left:5px;padding-right:20px}
#header #licensetype{font-weight:bold;color:#ff8c2f;text-transform:uppercase;letter-spacing:1px}
#header .text-right{float:right;text-align:left;padding-left:5px}
#header .text-right a{color:#ff8c2f}
#header #licensetype{font-weight:bold;font-style:italic}
#menu{position:fixed;top:0;left:0;bottom:12px;width:65px;padding:0;margin:0;background:#383A34;z-index:100;box-shadow:inset -1px 0 2px #121510}
#nav-block{position:absolute;top:0;bottom:12px;color:#5D6833;white-space:nowrap;float:left;overflow-y:scroll;direction:rtl;letter-spacing:2px}
#nav-block::-webkit-scrollbar{display:none}
@@ -102,7 +103,7 @@ span.tub span[id^='txt-tub']{margin-top:7px}
.usage-disk.sys>span{font-size:13px}
.usage-disk.all{background-color:transparent}
.usage-disk.all>span{font-size:12px}
.notice{background:#FFF6BF url(../images/notice.png) no-repeat;background-position:60px 50%;font-size:16px;text-align:left;padding:15px 0 15px 130px;display:block;height:70px;line-height:70px;width:100%;vertical-align:middle;border-top:1px solid #FFD324;border-bottom:1px solid #FFD324}
.notice{background:#FFF6BF url(../images/notice.png) no-repeat;background-position:60px 50%;font-size:16px;text-align:left;padding:15px 0 15px 130px;display:block;height:70px;line-height:70px;vertical-align:middle;border-top:1px solid #FFD324;border-bottom:1px solid #FFD324}
.whitebar{background:-webkit-radial-gradient(#C7C7C7,#EEEEEE);background:linear-gradient(#C7C7C7,#EEEEEE)}
.greenbar{background:-webkit-radial-gradient(#127A05,#17BF0B);background:linear-gradient(#127A05,#17BF0B)}
.orangebar{background:-webkit-radial-gradient(#CE7C10,#F0B400);background:linear-gradient(#CE7C10,#F0B400)}

View File

@@ -45,13 +45,14 @@ input.narrow{width:166px}
input.trim{width:50px}
#header{position:fixed;top:0;left:0;width:100%;height:140px;z-index:100;margin:0;background:#1c1b1b}
#header.image{background-size:100% 90px;background-repeat:no-repeat;color:#f2f2f2}
#header .logo{float:left;margin-top:20px;margin-left:20px}
#header .logo img{margin:4px 50px 0 20px}
#header .logo a{color:#ff8c2f;font-size:24px}
#header .block{margin:2px 5px 0 0;float:right;text-align:right;background-color:rgba(28,27,27,0.4);border-radius:10px;padding:5px 20px}
#header .logo{float:left;margin-top:34px;margin-left:11px}
#header .logo svg{margin-right:180px;height:40px}
#header .logo a span{color:#ff8c2f;font-size:24px;font-weight:bold;float:right;background-color:rgba(28,27,27,0.4);border-radius:10px;padding:6px 20px}
#header .block{margin:2px 2px 0 0;float:right;text-align:right;background-color:rgba(28,27,27,0.4);border-radius:10px;padding:5px 10px}
#header .text-left{float:left;text-align:right;color:#f2f2f2;padding-right:5px;border-right:solid medium #f15a2c}
#header .text-right{float:right;color:#f2f2f2;text-align:left;padding-left:5px;min-width:165px}
#header #licensetype{font-weight:bold;color:#ff8c2f;text-transform:uppercase;letter-spacing:1px}
#header .text-right{float:right;color:#f2f2f2;text-align:left;padding-left:5px}
#header .text-right a{color:#ff8c2f}
#header #licensetype{font-weight:bold;font-style:italic}
#title{margin:20px 0 32px 0;padding:8px 10px;clear:both;border-bottom:#e3e3e3 1px solid;background:#e8e8e8;letter-spacing:2px}
#title span.left{font-size:15px}
#title span.right{font-size:13px;padding-top:2px;padding-right:10px;float:right}
@@ -96,7 +97,7 @@ input.trim{width:50px}
.usage-disk.sys>span{color:#f2f2f2;font-size:14px}
.usage-disk.all{margin-right:2px}
.usage-disk.all>span{color:#f2f2f2;font-size:12px}
.notice{background:#FFF6BF url(../images/notice.png) no-repeat;background-position:60px 50%;font-size:16px;text-align:left;margin-top:180px;padding:15px 0 15px 130px;display:block;height:70px;line-height:70px;width:100%;vertical-align:middle;border-top:2px solid #FFD324;border-bottom:2px solid #FFD324}
.notice{background:#FFF6BF url(../images/notice.png) no-repeat;background-position:60px 50%;font-size:16px;text-align:left;margin-top:180px;padding:15px 0 15px 130px;display:block;height:70px;line-height:70px;vertical-align:middle;border-top:2px solid #FFD324;border-bottom:2px solid #FFD324}
.whitebar{background:-webkit-gradient(linear,left top,right top,from(#C7C7C7),to(#EEEEEE));background:linear-gradient(90deg,#C7C7C7 0,#EEEEEE)}
.greenbar{background:-webkit-gradient(linear,left top,right top,from(#127A05),to(#17BF0B));background:linear-gradient(90deg,#127A05 0,#17BF0B)}
.orangebar{background:-webkit-gradient(linear,left top,right top,from(#CE7C10),to(#CE7C10));background:linear-gradient(90deg,#CE7C10 0,#CE7C10)}