Commit 489d786b authored by nextime's avatar nextime

Minimize done.

parent 81fcbe93
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
} }
.primarycontainer { .primarycontainer {
background-color: #fff /*#777*/; background-color: #fff;
position: absolute; position: absolute;
max-width: 100% !important; max-width: 100% !important;
width: 100%; width: 100%;
...@@ -196,7 +196,8 @@ ...@@ -196,7 +196,8 @@
/* /*
input::-webkit-input-speech-button { input::-webkit-input-speech-button {
opacity: 0; opacity: 0;
}*/ }
*/
.notifybutton { .notifybutton {
background-image: url(/resources/img/notification.jpg); background-image: url(/resources/img/notification.jpg);
background-repeat: no-repeat; background-repeat: no-repeat;
......
...@@ -8,7 +8,8 @@ CSS="../../resources/bootstrap/css/bootstrap.min.css ...@@ -8,7 +8,8 @@ CSS="../../resources/bootstrap/css/bootstrap.min.css
../../resources/glyphicons/css/bootstrap-glyphicons.css ../../resources/glyphicons/css/bootstrap-glyphicons.css
../../resources/full-glyphicons/css/glyphicons.css ../../resources/full-glyphicons/css/glyphicons.css
../../resources/bootstrap-switch/static/stylesheets/bootstrap-switch.css ../../resources/bootstrap-switch/static/stylesheets/bootstrap-switch.css
css/style.css" css/style.css
"
JS=" JS="
../../resources/js/jquery-1.10.2.min.js ../../resources/js/jquery-1.10.2.min.js
...@@ -39,7 +40,7 @@ for c in $CSS ...@@ -39,7 +40,7 @@ for c in $CSS
echo compressing $c ... echo compressing $c ...
rm -f /tmp/$o.compressed rm -f /tmp/$o.compressed
if [[ "$c" != *min.css ]] ; then if [[ "$c" != *min.css ]] ; then
$YUI --type css -o /tmp/$o.compressed $c >/dev/null 2>&1 $YUI --type css --nomunge -o /tmp/$o.compressed $c >/dev/null 2>&1
else else
echo "already minified..." echo "already minified..."
cp $c /tmp/$o.compressed cp $c /tmp/$o.compressed
......
...@@ -5,7 +5,7 @@ if($panel && is_array($panel)) { ...@@ -5,7 +5,7 @@ if($panel && is_array($panel)) {
$visible=""; $visible="";
if($panel['panel_visible']!="all") $visible=$panel['panel_visible']; if($panel['panel_visible']!="all") $visible=$panel['panel_visible'];
?> ?>
<div class="panel col-lg-<?=$panel['panel_cols']?> panel-media-low <?=$visible?>" style="height: auto"> <div class="panel panel-default col-lg-<?=$panel['panel_cols']?> panel-media-low <?=$visible?>" style="height: auto">
<? <?
if($panel['panel_title']!="") { if($panel['panel_title']!="") {
?> ?>
......
...@@ -5,7 +5,7 @@ if($panel && is_array($panel)) { ...@@ -5,7 +5,7 @@ if($panel && is_array($panel)) {
$visible=""; $visible="";
if($panel['panel_visible']!="all") $visible=$panel['panel_visible']; if($panel['panel_visible']!="all") $visible=$panel['panel_visible'];
?> ?>
<div class="panel col-lg-<?=$panel['panel_cols']?> panel-media-low <?=$visible?>" style="height: <?=$panel['panel_height']?>"> <div class="panel panel-default col-lg-<?=$panel['panel_cols']?> panel-media-low <?=$visible?>" style="height: <?=$panel['panel_height']?>">
<? <?
if($panel['panel_title']!="") { if($panel['panel_title']!="") {
?> ?>
......
...@@ -34,7 +34,7 @@ if($panel && is_array($panel)) { ...@@ -34,7 +34,7 @@ if($panel && is_array($panel)) {
$dmheight="style=\"height:100%;\""; $dmheight="style=\"height:100%;\"";
} }
?> ?>
<div class="domotika-panel <?=$dmfull;?>" <?=$dmheight;?>> <div class="domotika-panel<?=$dmfull;?>" <?=$dmheight;?>>
<div class="home-panel" <?=$dmheight;?>> <div class="home-panel" <?=$dmheight;?>>
<div class="list-group"> <div class="list-group">
<? <?
......
...@@ -5,7 +5,7 @@ if($panel && is_array($panel)) { ...@@ -5,7 +5,7 @@ if($panel && is_array($panel)) {
$visible=""; $visible="";
if($panel['panel_visible']!="all") $visible=$panel['panel_visible']; if($panel['panel_visible']!="all") $visible=$panel['panel_visible'];
?> ?>
<div class="panel col-lg-<?=$panel['panel_cols']?> panel-media-low <?=$visible?>" style="height: auto"> <div class="panel panel-default col-lg-<?=$panel['panel_cols']?> panel-media-low <?=$visible?>" style="height: auto">
<? <?
if($panel['panel_title']!="") { if($panel['panel_title']!="") {
?> ?>
......
...@@ -403,5 +403,5 @@ ...@@ -403,5 +403,5 @@
} }
.has-switch span.switch-default:active, .has-switch span.switch-default:active,
.has-switch span.switch-default.active { .has-switch span.switch-default.active {
background-color: #e6e6e6 \9; background-color: #e6e6e6;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment