From 6d16ec282399198d47628a56d378a290aa138cc0 Mon Sep 17 00:00:00 2001 From: Andrew Karpow Date: Wed, 13 Nov 2013 15:30:54 +0100 Subject: [PATCH] various layout fixups --- CMakeLists.txt | 17 ++++++++++++----- htdocs/css/mpd.css | 9 +-------- htdocs/index.html | 19 +++++++------------ htdocs/js/mpd.js | 34 ++++++++++++++++++++-------------- 4 files changed, 40 insertions(+), 39 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b27c5b3..2e50618 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,11 +5,10 @@ project (ympd) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPD web client based on Websockets and Bootstrap") set(CPACK_PACKAGE_VENDOR "Andrew Karpow ") -SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "andy@ndyk.de") +set(CPACK_DEBIAN_PACKAGE_MAINTAINER "andy@ndyk.de") set(CPACK_PACKAGE_VERSION_MAJOR "0") set(CPACK_PACKAGE_VERSION_MINOR "1") -set(CPACK_PACKAGE_VERSION_PATCH "") -set(CPACK_BINARY_DEB "ON") +set(CPACK_PACKAGE_VERSION_PATCH "0") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/") find_package(LibWebSockets REQUIRED) @@ -17,13 +16,13 @@ find_package(LibMPDClient REQUIRED) include(CheckCSourceCompiles) include(CPack) -SET(CMAKE_C_FLAGS_DEBRELEASE "-O2 -DNDEBUG -pipe") +set(CMAKE_C_FLAGS_DEBRELEASE "-O2 -DNDEBUG -pipe") set(SOURCES src/ympd.c src/http_server.c src/mpd_client.c - ) +) add_executable(ympd ${SOURCES}) add_definitions(-DDATADIR="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}") @@ -37,3 +36,11 @@ install(FILES contrib/init.debian DESTINATION /etc/init.d WORLD_READ WORLD_EXECUTE CONFIGURATIONS debrelease RENAME ${PROJECT_NAME}) install(FILES contrib/default.debian DESTINATION /etc/default/${PROJECT_NAME} CONFIGURATIONS debrelease RENAME ${PROJECT_NAME}) + +if(CMAKE_BUILD_TYPE STREQUAL "debrelease") + set(CPACK_BINARY_DEB "ON") + set(CPACK_BINARY_STGZ "OFF") + set(CPACK_BINARY_TGZ "OFF") + set(CPACK_BINARY_TZ "OFF") +endif() + diff --git a/htdocs/css/mpd.css b/htdocs/css/mpd.css index 0b271a5..deb280c 100644 --- a/htdocs/css/mpd.css +++ b/htdocs/css/mpd.css @@ -28,14 +28,7 @@ body { min-width: 50px; } -.btn-group-hover .btn { - border-color: white; - background: white; - text-shadow: 0 1px 1px white; - -webkit-box-shadow: inset 0 1px 0 white; - -moz-box-shadow: inset 0 1px 0 white; - box-shadow: inset 0 1px 0 white; -} .btn-group-hover { opacity: 0; } + diff --git a/htdocs/index.html b/htdocs/index.html index 22aae15..0f4d5b4 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -42,15 +42,6 @@
  • About
    • - -