Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
D
domotikad
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
domotika
domotikad
Commits
489d786b
Commit
489d786b
authored
Jan 12, 2014
by
nextime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minimize done.
parent
81fcbe93
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
12 additions
and
10 deletions
+12
-10
combined.min.css
Web/htdocs/gui/css/combined.min.css
+1
-1
style.css
Web/htdocs/gui/css/style.css
+3
-2
optimize.sh
Web/htdocs/gui/optimize.sh
+3
-2
cameras.php
Web/htdocs/gui/panels/content/cameras.php
+1
-1
macrobuttons.php
Web/htdocs/gui/panels/content/macrobuttons.php
+1
-1
standard.php
Web/htdocs/gui/panels/content/standard.php
+1
-1
video.php
Web/htdocs/gui/panels/content/video.php
+1
-1
bootstrap-switch.css
.../bootstrap-switch/static/stylesheets/bootstrap-switch.css
+1
-1
.hammer.fakemultitouch.js.swp
...resources/hammer.js/plugins/.hammer.fakemultitouch.js.swp
+0
-0
No files found.
Web/htdocs/gui/css/combined.min.css
View file @
489d786b
This source diff could not be displayed because it is too large. You can
view the blob
instead.
Web/htdocs/gui/css/style.css
View file @
489d786b
...
@@ -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
;
...
...
Web/htdocs/gui/optimize.sh
View file @
489d786b
...
@@ -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
...
...
Web/htdocs/gui/panels/content/cameras.php
View file @
489d786b
...
@@ -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'
]
!=
""
)
{
?>
?>
...
...
Web/htdocs/gui/panels/content/macrobuttons.php
View file @
489d786b
...
@@ -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'
]
!=
""
)
{
?>
?>
...
...
Web/htdocs/gui/panels/content/standard.php
View file @
489d786b
...
@@ -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"
>
<?
<?
...
...
Web/htdocs/gui/panels/content/video.php
View file @
489d786b
...
@@ -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'
]
!=
""
)
{
?>
?>
...
...
Web/resources/bootstrap-switch/static/stylesheets/bootstrap-switch.css
View file @
489d786b
...
@@ -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
;
}
}
Web/resources/hammer.js/plugins/.hammer.fakemultitouch.js.swp
deleted
100644 → 0
View file @
81fcbe93
File deleted
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment