Web: Add Hyperion logo and bigger colorpicker (#173)

This commit is contained in:
brindosch 2016-08-13 22:01:07 +02:00 committed by GitHub
parent 1ff8528597
commit bc0c9c469f
4 changed files with 46 additions and 3 deletions

View File

@ -0,0 +1,23 @@
/*Header*/
.navbar-brand{padding: 5px;height:90px;}
.sidebar{margin-top:91px;}
.dropdown{font-size:18px;}
@media (max-width: 767px) {.sidebar{margin-top:0px;}}
/*Colopicker 2x*/
.colorpicker-2x .colorpicker-saturation {
width: 200px;
height: 200px;
}
.colorpicker-2x .colorpicker-hue,
.colorpicker-2x .colorpicker-alpha {
width: 30px;
height: 200px;
}
.colorpicker-2x .colorpicker-color,
.colorpicker-2x .colorpicker-color div {
height: 30px;
}
.colorpicker-2x .colorpicker-selectors i{height:20px;width:20px;}

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -51,6 +51,7 @@
<!-- Custom CSS -->
<link href="css/sb-admin-2.css" rel="stylesheet">
<link href="css/hyperion.css" rel="stylesheet">
<!-- Custom Fonts -->
<link href="css/font-awesome.min.css" rel="stylesheet" type="text/css">
@ -77,7 +78,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Hyperion</a>
<a class="navbar-brand" href="index.html"><img src="img/hyperion/hyperionlogo.png" alt="Redefine ambient light!"></a>
</div>
<!-- /.navbar-header -->

View File

@ -35,7 +35,26 @@
$(function() {
$('#cp2').colorpicker({
format: 'rgb',
colorSelectors: {'default': '#777777'}
colorSelectors: {'default': '#777777',
'primary': '#337ab7',
'success': '#5cb85c',
'info': '#5bc0de',
'warning': '#f0ad4e',
'danger': '#d9534f'
},
customClass: 'colorpicker-2x',
sliders: {
saturation: {
maxLeft: 200,
maxTop: 200
},
hue: {
maxTop: 200
},
alpha: {
maxTop: 200
},
}
});
$('#cp2').colorpicker().on('changeColor', function(e) {