print settings info as a footer on bottom of settings page
fix display of scrollbar on settingspage
This commit is contained in:
parent
fd692c7c02
commit
bbb36606e1
@ -60,18 +60,20 @@ package_debian:
|
||||
stage: packaging
|
||||
image: debian
|
||||
script:
|
||||
- vers=$(grep -Po '"version":.*?[^\\]",' package.json | grep -Po '[0-9]+\.[0-9]+\.[0-9]+') # parse the version out of package .json
|
||||
- cd deb
|
||||
- mkdir -p "./OpenMediaCenter/var/www/openmediacenter/videos/"
|
||||
- mkdir -p "./OpenMediaCenter/tmp/"
|
||||
- cp -r ../build/* ./OpenMediaCenter/var/www/openmediacenter/
|
||||
- cp -r ../api ./OpenMediaCenter/var/www/openmediacenter/
|
||||
- cp ../database.sql ./OpenMediaCenter/tmp/openmediacenter.sql
|
||||
- 'echo "Version: ${vers}" >> ./OpenMediaCenter/DEBIAN/control'
|
||||
- chmod -R 0775 *
|
||||
- dpkg-deb --build OpenMediaCenter
|
||||
- mv OpenMediaCenter.deb OpenMediaCenter-0.1_amd64.deb
|
||||
- mv OpenMediaCenter.deb OpenMediaCenter-${vers}_amd64.deb
|
||||
artifacts:
|
||||
paths:
|
||||
- deb/OpenMediaCenter-0.1_amd64.deb
|
||||
- deb/OpenMediaCenter-*.deb
|
||||
needs: ["build"]
|
||||
|
||||
deploy_test1:
|
||||
|
@ -1,5 +1,4 @@
|
||||
Package: OpenMediaCenter
|
||||
Version: 0.1
|
||||
Depends: nginx, php-fpm, php-mysqli, mariadb-server
|
||||
Section: web
|
||||
Priority: optional
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "openmediacenter",
|
||||
"version": "0.1.0",
|
||||
"version": "0.1.1",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@fortawesome/fontawesome-svg-core": "^1.2.30",
|
||||
|
@ -5,6 +5,7 @@ import GlobalInfos from '../../GlobalInfos';
|
||||
import InfoHeaderItem from '../../elements/InfoHeaderItem/InfoHeaderItem';
|
||||
import {faArchive, faBalanceScaleLeft, faRulerVertical} from '@fortawesome/free-solid-svg-icons';
|
||||
import {faAddressCard} from '@fortawesome/free-regular-svg-icons';
|
||||
import {version} from '../../../package.json';
|
||||
|
||||
/**
|
||||
* Component for Generalsettings tag on Settingspage
|
||||
@ -130,6 +131,9 @@ class GeneralSettings extends React.Component {
|
||||
</Button>
|
||||
</Form>
|
||||
</div>
|
||||
<div className={style.footer}>
|
||||
Version: {version}
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
@ -13,6 +13,15 @@
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.footer{
|
||||
position: fixed;
|
||||
right: 0;
|
||||
bottom: 3px;
|
||||
width: 110px;
|
||||
opacity: 0.8;
|
||||
color: white;
|
||||
}
|
||||
|
||||
/* On screens that are 722px wide or less, make the columns stack on top of each other instead of next to each other */
|
||||
@media screen and (max-width: 722px) {
|
||||
.infoheader {
|
||||
|
@ -1,9 +1,8 @@
|
||||
.SettingsSidebar {
|
||||
border-bottom-right-radius: 10px;
|
||||
border-top-right-radius: 10px;
|
||||
float: left;
|
||||
margin-top: 10px;
|
||||
min-height: calc(100vh - 70px);
|
||||
min-height: calc(100vh - 72px);
|
||||
min-width: 110px;
|
||||
padding-top: 20px;
|
||||
width: 10%;
|
||||
|
Loading…
Reference in New Issue
Block a user