Merge branch 'no_overwrite_zm_conf' into multi-server
This commit is contained in:
commit
e12640ec73
|
@ -704,7 +704,9 @@ else(zmconfgen_result EQUAL 0)
|
|||
endif(zmconfgen_result EQUAL 0)
|
||||
|
||||
# Install zm.conf
|
||||
if(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf")
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}")
|
||||
endif(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf")
|
||||
|
||||
# Uninstall target
|
||||
configure_file(
|
||||
|
|
|
@ -23,6 +23,10 @@
|
|||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#monitors .imageFeed img {
|
||||
border: 2px solid #ffffff;
|
||||
}
|
||||
|
||||
#monitors .imageFeed img.idle {
|
||||
border: 2px solid #ffffff;
|
||||
}
|
||||
|
|
|
@ -23,6 +23,10 @@
|
|||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#monitors .imageFeed img {
|
||||
border: 2px solid #999999;
|
||||
}
|
||||
|
||||
#monitors .imageFeed img.idle {
|
||||
border: 2px solid #999999;
|
||||
}
|
||||
|
|
|
@ -23,6 +23,10 @@
|
|||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#monitors .imageFeed img {
|
||||
border: 2px solid #ffffff;
|
||||
}
|
||||
|
||||
#monitors .imageFeed img.idle {
|
||||
border: 2px solid #ffffff;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue