diff --git a/.ci/ci_build.sh b/.ci/ci_build.sh index 740a4126..17ce7987 100755 --- a/.ci/ci_build.sh +++ b/.ci/ci_build.sh @@ -57,7 +57,7 @@ elif [[ "$CI_NAME" == 'linux' ]]; then hyperionproject/hyperion-ci:$DOCKER_TAG \ /bin/bash -c "mkdir hyperion && cp -r source/. /hyperion && cd /hyperion && mkdir build && cd build && - cmake -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DDOCKER_PLATFORM=${DOCKER_TAG} ../ || exit 2 && + cmake -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ../ || exit 2 && make -j $(nproc) package || exit 3 && cp /hyperion/build/bin/h* /deploy/ 2>/dev/null || : && cp /hyperion/build/Hyperion-* /deploy/ 2>/dev/null || : && diff --git a/CMakeLists.txt b/CMakeLists.txt index 52659c5e..04243027 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,7 +112,7 @@ if ( "${PLATFORM}" MATCHES "osx" ) include_directories("/opt/X11/include/") SET ( DEFAULT_OSX ON ) SET ( DEFAULT_USB_HID ON ) -elseif ( "${PLATFORM}" STREQUAL "rpi" ) +elseif ( "${PLATFORM}" MATCHES "rpi" ) SET ( DEFAULT_DISPMANX ON ) SET ( DEFAULT_WS281XPWM ON ) elseif ( "${PLATFORM}" STREQUAL "amlogic" ) diff --git a/assets/webconfig/css/hyperion.css b/assets/webconfig/css/hyperion.css index 3e9646fa..e65db53b 100644 --- a/assets/webconfig/css/hyperion.css +++ b/assets/webconfig/css/hyperion.css @@ -79,7 +79,7 @@ table.borderless td,table.borderless th{border: none !important;} table label{margin:0} /*Header*/ -.navbar-brand{padding: 5px;padding-left:20px;height:60px;} +.navbar-brand{padding-top:0px;padding-bottom:5px;padding-left:20px;height:60px;} .sidebar{margin-top:62px;padding-top:20px;} .dropdown{font-size:18px;} @media (max-width: 767px) {.sidebar{margin-top:0px;padding-top:0px !important;}}