frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Hyperion logo align in WebUI (#896)

Browse Source 
- DispmanX Grabber also used in PR builds
- Removed unused build variable
This commit is contained in:
Serhan 2020-07-23 16:47:35 +02:00 committed by GitHub
parent df0d411ba1
commit 6f5f28cd56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/ci_build.sh
View File

@ -57,7 +57,7 @@ elif [[ "$CI_NAME" == 'linux' ]]; then
hyperionproject/hyperion-ci:$DOCKER_TAG \ hyperionproject/hyperion-ci:$DOCKER_TAG \
/bin/bash -c "mkdir hyperion && cp -r source/. /hyperion && /bin/bash -c "mkdir hyperion && cp -r source/. /hyperion &&
cd /hyperion && mkdir build && cd build && 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 && make -j $(nproc) package || exit 3 &&
cp /hyperion/build/bin/h* /deploy/ 2>/dev/null || : && cp /hyperion/build/bin/h* /deploy/ 2>/dev/null || : &&
cp /hyperion/build/Hyperion-* /deploy/ 2>/dev/null || : && cp /hyperion/build/Hyperion-* /deploy/ 2>/dev/null || : &&

2
CMakeLists.txt
View File

@ -112,7 +112,7 @@ if ( "${PLATFORM}" MATCHES "osx" )
include_directories("/opt/X11/include/") include_directories("/opt/X11/include/")
SET ( DEFAULT_OSX ON ) SET ( DEFAULT_OSX ON )
SET ( DEFAULT_USB_HID ON ) SET ( DEFAULT_USB_HID ON )
elseif ( "${PLATFORM}" STREQUAL "rpi" ) elseif ( "${PLATFORM}" MATCHES "rpi" )
SET ( DEFAULT_DISPMANX ON ) SET ( DEFAULT_DISPMANX ON )
SET ( DEFAULT_WS281XPWM ON ) SET ( DEFAULT_WS281XPWM ON )
elseif ( "${PLATFORM}" STREQUAL "amlogic" ) elseif ( "${PLATFORM}" STREQUAL "amlogic" )

2
assets/webconfig/css/hyperion.css
View File

@ -79,7 +79,7 @@ table.borderless td,table.borderless th{border: none !important;}
table label{margin:0} table label{margin:0}
/*Header*/ /*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;} .sidebar{margin-top:62px;padding-top:20px;}
.dropdown{font-size:18px;} .dropdown{font-size:18px;}
@media (max-width: 767px) {.sidebar{margin-top:0px;padding-top:0px !important;}} @media (max-width: 767px) {.sidebar{margin-top:0px;padding-top:0px !important;}}