From 43a91bc21e76b5864e3170053008c988c560d58a Mon Sep 17 00:00:00 2001 From: Paulchen-Panther Date: Sun, 3 May 2020 13:38:18 +0200 Subject: [PATCH 1/6] github actions replaces azure (release creation) --- .azure.yml | 202 ++++++++---------------------- .github/workflows/deploy.yml | 38 ------ .github/workflows/push-master.yml | 79 +++++++++++- 3 files changed, 130 insertions(+), 189 deletions(-) delete mode 100644 .github/workflows/deploy.yml diff --git a/.azure.yml b/.azure.yml index 71f9a587..165a19e7 100644 --- a/.azure.yml +++ b/.azure.yml @@ -1,156 +1,64 @@ -stages: -- stage: Build - displayName: Build packages +jobs: - jobs: +###################### +###### Linux ######### +###################### - ###################### - ###### Linux ######### - ###################### +- job: Linux + timeoutInMinutes: 120 + pool: + vmImage: 'ubuntu-16.04' + strategy: + matrix: + AMD64 (x64): + dockerTag: 'amd64' + dockerName: 'Debian Stretch (AMD64)' + platform: 'x11' + ARMv6hf (Raspberry Pi v1 & ZERO): + dockerTag: 'armv6hf' + dockerName: 'Debian Stretch (Raspberry Pi v1 & ZERO)' + platform: 'rpi' + ARMv7hf (Raspberry Pi 2 & 3): + dockerTag: 'armv7hf' + dockerName: 'Debian Stretch (Raspberry Pi 2 & 3)' + platform: 'rpi' + ARMv8 (Generic AARCH64): + dockerTag: 'aarch64' + dockerName: 'ARMv8 (Generic AARCH64)' + platform: 'amlogic' - - job: Linux - timeoutInMinutes: 120 - pool: - vmImage: 'ubuntu-16.04' - strategy: - matrix: - AMD64 (x64): - dockerTag: 'amd64' - dockerName: 'Debian Stretch (AMD64)' - platform: 'x11' - ARMv6hf (Raspberry Pi v1 & ZERO): - dockerTag: 'armv6hf' - dockerName: 'Debian Stretch (Raspberry Pi v1 & ZERO)' - platform: 'rpi' - ARMv7hf (Raspberry Pi 2 & 3): - dockerTag: 'armv7hf' - dockerName: 'Debian Stretch (Raspberry Pi 2 & 3)' - platform: 'rpi' - ARMv8 (Generic AARCH64): - dockerTag: 'aarch64' - dockerName: 'ARMv8 (Generic AARCH64)' - platform: 'amlogic' + steps: + - checkout: self # represents the repo where the initial Pipelines YAML file was found + submodules: recursive # set to 'recursive' to get submodules of submodules - steps: - - checkout: self # represents the repo where the initial Pipelines YAML file was found - submodules: recursive # set to 'recursive' to get submodules of submodules + # build process + - bash: ./.ci/ci_build.sh + displayName: 'Build $(dockerName) packages' + env: + DOCKER_TAG: $(dockerTag) + DOCKER_NAME: $(dockerName) + PLATFORM: $(platform) - # build process - - bash: ./.ci/ci_build.sh - displayName: 'Build $(dockerName) packages' - env: - DOCKER_TAG: $(dockerTag) - DOCKER_NAME: $(dockerName) - PLATFORM: $(platform) +###################### +###### macOS ######### +###################### - # move files - - bash: 'mv -v deploy/Hyperion-* $(Build.ArtifactStagingDirectory) 2>/dev/null || :' - workingDirectory: $(Build.SourcesDirectory) - condition: and(succeeded(), ne(variables['system.pullrequest.isfork'], true), ne(variables['system.pullrequest.isfork'], true), startsWith(variables['Build.SourceBranch'], 'refs/tags/')) - displayName: 'Collect artifacts' +- job: macOS + timeoutInMinutes: 120 + pool: + vmImage: 'macOS-10.14' - # publish artifacts - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: $(Build.ArtifactStagingDirectory) - ArtifactName: $(dockerTag) - condition: and(succeeded(), in(variables['dockerTag'], 'amd64', 'armv6hf', 'armv7hf'), ne(variables['system.pullrequest.isfork'], true), startsWith(variables['Build.SourceBranch'], 'refs/tags/')) - displayName: 'Publish artifacts' + steps: + - checkout: self # represents the repo where the initial Pipelines YAML file was found + submodules: recursive # set to 'recursive' to get submodules of submodules - ###################### - ###### macOS ######### - ###################### + # install dependencies + - bash: ./.ci/ci_install.sh + displayName: 'Install dependencies' - - job: macOS - timeoutInMinutes: 120 - pool: - vmImage: 'macOS-10.14' - - steps: - - checkout: self # represents the repo where the initial Pipelines YAML file was found - submodules: recursive # set to 'recursive' to get submodules of submodules - - # install dependencies - - bash: ./.ci/ci_install.sh - displayName: 'Install dependencies' - - # build process - - bash: ./.ci/ci_build.sh - env: - PLATFORM: 'osx' - condition: succeeded() - displayName: 'Build macOS 10.13 packages' - - # move files - - bash: 'mv -v build/Hyperion-* $(Build.ArtifactStagingDirectory) 2>/dev/null || :' - workingDirectory: $(Build.SourcesDirectory) - condition: and(succeeded(), ne(variables['system.pullrequest.isfork'], true), startsWith(variables['Build.SourceBranch'], 'refs/tags/')) - displayName: 'Collect artifacts' - - # publish artifacts - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: $(Build.ArtifactStagingDirectory) - ArtifactName: 'macos' - condition: and(succeeded(), ne(variables['system.pullrequest.isfork'], true), startsWith(variables['Build.SourceBranch'], 'refs/tags/')) - displayName: 'Publish artifacts' - -################################ -###### Publish Releases ######## -################################ - -- stage: Publish - displayName: Publish Releases - dependsOn: - - Build - condition: and(succeeded('Build'), ne(variables['system.pullrequest.isfork'], true), startsWith(variables['Build.SourceBranch'], 'refs/tags/')) - - jobs: - - job: PublishReleases - timeoutInMinutes: 120 - pool: - vmImage: ubuntu-16.04 - - steps: - - checkout: self # represents the repo where the initial Pipelines YAML file was found - - # download deployables artifacts - - task: DownloadPipelineArtifact@2 - inputs: - path: $(Build.ArtifactStagingDirectory) - displayName: Download artifacts - - # read version file - - bash: | - echo "##vso[task.setvariable variable=semVer]$(cat version)" - echo "##vso[task.setvariable variable=preRel]$(grep -oE 'alpha|beta' version)" - workingDirectory: '$(Build.SourcesDirectory)' - condition: succeeded() - displayName: 'Read and generate pipeline variables' - - # set release to pre-release - - bash: echo '##vso[task.setvariable variable=preRelease;]true' - condition: and(succeeded(), or(contains(variables['preRel'], 'alpha'), contains(variables['preRel'], 'beta')), ne(variables['system.pullrequest.isfork'], true), startsWith(variables['Build.SourceBranch'], 'refs/tags/')) - displayName: 'Mark alpha or beta as pre-release' - - # create github releases - - task: GithubRelease@0 - inputs: - gitHubConnection: Hyperion-Bot - repositoryName: $(Build.Repository.Name) - action: create - target: $(Build.SourceVersion) - tagSource: manual - tag: $(Build.SourceBranchName) - title: 'Hyperion $(semVer)' - assets: | - $(Build.ArtifactStagingDirectory)/amd64/* - $(Build.ArtifactStagingDirectory)/armv6hf/* - $(Build.ArtifactStagingDirectory)/armv7hf/* - $(Build.ArtifactStagingDirectory)/aarch64/* - $(Build.ArtifactStagingDirectory)/macos/* - assetUploadMode: 'replace' - addChangeLog: false - isPreRelease: $(preRelease) - condition: succeeded() - displayName: Create GitHub releases + # build process + - bash: ./.ci/ci_build.sh + env: + PLATFORM: 'osx' + condition: succeeded() + displayName: 'Build macOS 10.13 packages' \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 304643ab..00000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Build & Deploy -on: - release: - types: [published] - -jobs: - -###################### -#### Documentation ### -###################### - - docs: - name: Documentation - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - # Install dependencies - - name: Setup node 12 - uses: actions/setup-node@v1 - with: - node-version: '12' - - # Build Docs - - name: Build docs - run: | - cd docs - npm install -g yarn - yarn install - yarn docs:build - # Deploy to gh-pages - - name: Deploy to gh-pages - uses: peaceiris/actions-gh-pages@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./docs/dist - cname: docs.hyperion-project.org diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml index 31f29c6e..d8a9db6a 100644 --- a/.github/workflows/push-master.yml +++ b/.github/workflows/push-master.yml @@ -1,14 +1,18 @@ name: Hyperion CI Build on: push: - branches: - - master + branches-ignore: + - 'gh-pages' + - 'docker-ci' + tags: + - '*' + +jobs: ###################### ###### Linux ######### ###################### -jobs: Linux: name: ${{ matrix.dockerName }} runs-on: ubuntu-latest @@ -43,6 +47,13 @@ jobs: shell: bash run: ./.ci/ci_build.sh + # upload artifacts (only on tagged commit) + - name: Upload artifacts + if: startsWith(github.event.ref, 'refs/tags') + uses: actions/upload-artifact@v2 + with: + path: deploy/Hyperion-* + ###################### ###### macOS ######### ###################### @@ -67,11 +78,18 @@ jobs: shell: bash run: ./.ci/ci_build.sh + # upload artifacts (only on tagged commit) + - name: Upload artifacts + if: startsWith(github.event.ref, 'refs/tags') + uses: actions/upload-artifact@v2 + with: + path: build/Hyperion-* + ###################### #### Documentation ### ###################### - docs: + Docs: name: Documentation runs-on: ubuntu-latest defaults: @@ -90,6 +108,59 @@ jobs: # Build Docs - name: Build docs run: | + cd docs npm install -g yarn yarn install yarn docs:build + + # Deploy to gh-pages (only on tagged commit) + - name: Deploy to gh-pages + if: startsWith(github.event.ref, 'refs/tags') + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./docs/dist + cname: docs.hyperion-project.org + +################################ +###### Publish Releases ######## +################################ + + publish: + name: Publish Releases + if: startsWith(github.event.ref, 'refs/tags') + needs: [Linux, macOS, Docs] + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + # generate environment variables + - name: Generate environment variables from version and tag + run: | + echo ::set-env name=TAG::${GITHUB_REF/refs\/tags\//} + echo ::set-env name=VERSION::$(tr -d '\n' < version) + echo ::set-env name=preRelease::false + + # If version contains alpha or beta, mark draft release as pre-release + - name: Mark release as pre-release + if: contains(env.VERSION, 'alpha') || contains(env.VERSION, 'beta') + run: echo ::set-env name=preRelease::true + + # Download artifacts from previous build process + - name: Download artifacts + uses: actions/download-artifact@v2 + with: + path: artifacts + + # create draft release and upload artifacts + - name: Create draft release + uses: softprops/action-gh-release@v1 + with: + name: Hyperion ${{ env.VERSION }} + tag_name: ${{ env.TAG }} + files: "artifacts/**" + draft: true + prerelease: ${{ env.preRelease }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 6c7b1813a72b8035f2c7657a614493949dba96ac Mon Sep 17 00:00:00 2001 From: LordGrey Date: Fri, 29 May 2020 11:28:35 +0200 Subject: [PATCH 2/6] Improve language selection usability --- assets/webconfig/content/about.html | 2 +- assets/webconfig/css/bootstrap-select.min.css | 6 ++++ assets/webconfig/css/hyperion.css | 6 ++++ assets/webconfig/index.html | 29 +++++++++++-------- assets/webconfig/js/content_index.js | 14 ++++++++- .../webconfig/js/lib/bootstrap-select.min.js | 9 ++++++ assets/webconfig/js/settings.js | 29 ++----------------- assets/webconfig/js/ui_utils.js | 11 +++++++ 8 files changed, 65 insertions(+), 41 deletions(-) create mode 100644 assets/webconfig/css/bootstrap-select.min.css create mode 100644 assets/webconfig/js/lib/bootstrap-select.min.js diff --git a/assets/webconfig/content/about.html b/assets/webconfig/content/about.html index 3d32f2b3..1b9ba4b3 100644 --- a/assets/webconfig/content/about.html +++ b/assets/webconfig/content/about.html @@ -18,7 +18,7 @@ performTranslation(); var si = sysInfo.hyperion; - var libs = { "Bootstrap 3": "http://getbootstrap.com/", "JQuery": "https://jquery.com/", "Bootstrap Colorpicker": "https://itsjavi.com/bootstrap-colorpicker/", "Bootstrap Toggle": "https://www.bootstraptoggle.com/", "JSON-Editor": "http://jeremydorn.com/json-editor/", "jQuery.i18n": "https://github.com/wikimedia/jquery.i18n", "metisMenu": "http://mm.onokumus.com/index.html", "download.js": "http://danml.com/download.html", "gijgo": "http://gijgo.com/" }; + var libs = { "Bootstrap 3": "http://getbootstrap.com/", "JQuery": "https://jquery.com/", "Bootstrap Colorpicker": "https://itsjavi.com/bootstrap-colorpicker/", "Bootstrap Toggle": "https://www.bootstraptoggle.com/", "Bootstrap Select": "https://developer.snapappointments.com/bootstrap-select/", "JSON-Editor": "http://jeremydorn.com/json-editor/", "jQuery.i18n": "https://github.com/wikimedia/jquery.i18n", "metisMenu": "http://mm.onokumus.com/index.html", "download.js": "http://danml.com/download.html", "gijgo": "http://gijgo.com/" }; var libh = ""; var lang = []; var dcount = 0; diff --git a/assets/webconfig/css/bootstrap-select.min.css b/assets/webconfig/css/bootstrap-select.min.css new file mode 100644 index 00000000..59708ed5 --- /dev/null +++ b/assets/webconfig/css/bootstrap-select.min.css @@ -0,0 +1,6 @@ +/*! + * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select) + * + * Copyright 2012-2020 SnapAppointments, LLC + * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE) + */@-webkit-keyframes bs-notify-fadeOut{0%{opacity:.9}100%{opacity:0}}@-o-keyframes bs-notify-fadeOut{0%{opacity:.9}100%{opacity:0}}@keyframes bs-notify-fadeOut{0%{opacity:.9}100%{opacity:0}}.bootstrap-select>select.bs-select-hidden,select.bs-select-hidden,select.selectpicker{display:none!important}.bootstrap-select{width:220px\0;vertical-align:middle}.bootstrap-select>.dropdown-toggle{position:relative;width:100%;text-align:right;white-space:nowrap;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.bootstrap-select>.dropdown-toggle:after{margin-top:-1px}.bootstrap-select>.dropdown-toggle.bs-placeholder,.bootstrap-select>.dropdown-toggle.bs-placeholder:active,.bootstrap-select>.dropdown-toggle.bs-placeholder:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder:hover{color:#999}.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:hover{color:rgba(255,255,255,.5)}.bootstrap-select>select{position:absolute!important;bottom:0;left:50%;display:block!important;width:.5px!important;height:100%!important;padding:0!important;opacity:0!important;border:none;z-index:0!important}.bootstrap-select>select.mobile-device{top:0;left:0;display:block!important;width:100%!important;z-index:2!important}.bootstrap-select.is-invalid .dropdown-toggle,.error .bootstrap-select .dropdown-toggle,.has-error .bootstrap-select .dropdown-toggle,.was-validated .bootstrap-select select:invalid+.dropdown-toggle{border-color:#b94a48}.bootstrap-select.is-valid .dropdown-toggle,.was-validated .bootstrap-select select:valid+.dropdown-toggle{border-color:#28a745}.bootstrap-select.fit-width{width:auto!important}.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){width:220px}.bootstrap-select .dropdown-toggle:focus,.bootstrap-select>select.mobile-device:focus+.dropdown-toggle{outline:thin dotted #333!important;outline:5px auto -webkit-focus-ring-color!important;outline-offset:-2px}.bootstrap-select.form-control{margin-bottom:0;padding:0;border:none;height:auto}:not(.input-group)>.bootstrap-select.form-control:not([class*=col-]){width:100%}.bootstrap-select.form-control.input-group-btn{float:none;z-index:auto}.form-inline .bootstrap-select,.form-inline .bootstrap-select.form-control:not([class*=col-]){width:auto}.bootstrap-select:not(.input-group-btn),.bootstrap-select[class*=col-]{float:none;display:inline-block;margin-left:0}.bootstrap-select.dropdown-menu-right,.bootstrap-select[class*=col-].dropdown-menu-right,.row .bootstrap-select[class*=col-].dropdown-menu-right{float:right}.form-group .bootstrap-select,.form-horizontal .bootstrap-select,.form-inline .bootstrap-select{margin-bottom:0}.form-group-lg .bootstrap-select.form-control,.form-group-sm .bootstrap-select.form-control{padding:0}.form-group-lg .bootstrap-select.form-control .dropdown-toggle,.form-group-sm .bootstrap-select.form-control .dropdown-toggle{height:100%;font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-lg .dropdown-toggle,.bootstrap-select.form-control-sm .dropdown-toggle{font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-sm .dropdown-toggle{padding:.25rem .5rem}.bootstrap-select.form-control-lg .dropdown-toggle{padding:.5rem 1rem}.form-inline .bootstrap-select .form-control{width:100%}.bootstrap-select.disabled,.bootstrap-select>.disabled{cursor:not-allowed}.bootstrap-select.disabled:focus,.bootstrap-select>.disabled:focus{outline:0!important}.bootstrap-select.bs-container{position:absolute;top:0;left:0;height:0!important;padding:0!important}.bootstrap-select.bs-container .dropdown-menu{z-index:1060}.bootstrap-select .dropdown-toggle .filter-option{position:static;top:0;left:0;float:left;height:100%;width:100%;text-align:left;overflow:hidden;-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto}.bs3.bootstrap-select .dropdown-toggle .filter-option{padding-right:inherit}.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option{position:absolute;padding-top:inherit;padding-bottom:inherit;padding-left:inherit;float:none}.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option .filter-option-inner{padding-right:inherit}.bootstrap-select .dropdown-toggle .filter-option-inner-inner{overflow:hidden}.bootstrap-select .dropdown-toggle .filter-expand{width:0!important;float:left;opacity:0!important;overflow:hidden}.bootstrap-select .dropdown-toggle .caret{position:absolute;top:50%;right:12px;margin-top:-2px;vertical-align:middle}.input-group .bootstrap-select.form-control .dropdown-toggle{border-radius:inherit}.bootstrap-select[class*=col-] .dropdown-toggle{width:100%}.bootstrap-select .dropdown-menu{min-width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select .dropdown-menu>.inner:focus{outline:0!important}.bootstrap-select .dropdown-menu.inner{position:static;float:none;border:0;padding:0;margin:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none}.bootstrap-select .dropdown-menu li{position:relative}.bootstrap-select .dropdown-menu li.active small{color:rgba(255,255,255,.5)!important}.bootstrap-select .dropdown-menu li.disabled a{cursor:not-allowed}.bootstrap-select .dropdown-menu li a{cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.bootstrap-select .dropdown-menu li a.opt{position:relative;padding-left:2.25em}.bootstrap-select .dropdown-menu li a span.check-mark{display:none}.bootstrap-select .dropdown-menu li a span.text{display:inline-block}.bootstrap-select .dropdown-menu li small{padding-left:.5em}.bootstrap-select .dropdown-menu .notify{position:absolute;bottom:5px;width:96%;margin:0 2%;min-height:26px;padding:3px 5px;background:#f5f5f5;border:1px solid #e3e3e3;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05);pointer-events:none;opacity:.9;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select .dropdown-menu .notify.fadeOut{-webkit-animation:.3s linear 750ms forwards bs-notify-fadeOut;-o-animation:.3s linear 750ms forwards bs-notify-fadeOut;animation:.3s linear 750ms forwards bs-notify-fadeOut}.bootstrap-select .no-results{padding:3px;background:#f5f5f5;margin:0 5px;white-space:nowrap}.bootstrap-select.fit-width .dropdown-toggle .filter-option{position:static;display:inline;padding:0}.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner,.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner{display:inline}.bootstrap-select.fit-width .dropdown-toggle .bs-caret:before{content:'\00a0'}.bootstrap-select.fit-width .dropdown-toggle .caret{position:static;top:auto;margin-top:-1px}.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark{position:absolute;display:inline-block;right:15px;top:5px}.bootstrap-select.show-tick .dropdown-menu li a span.text{margin-right:34px}.bootstrap-select .bs-ok-default:after{content:'';display:block;width:.5em;height:1em;border-style:solid;border-width:0 .26em .26em 0;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg)}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle{z-index:1061}.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before{content:'';border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid rgba(204,204,204,.2);position:absolute;bottom:-4px;left:9px;display:none}.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after{content:'';border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;bottom:-4px;left:10px;display:none}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before{bottom:auto;top:-4px;border-top:7px solid rgba(204,204,204,.2);border-bottom:0}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after{bottom:auto;top:-4px;border-top:6px solid #fff;border-bottom:0}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before{right:12px;left:auto}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after{right:13px;left:auto}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:after,.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:before,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:after,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:before{display:block}.bs-actionsbox,.bs-donebutton,.bs-searchbox{padding:4px 8px}.bs-actionsbox{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-actionsbox .btn-group button{width:50%}.bs-donebutton{float:left;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-donebutton .btn-group button{width:100%}.bs-searchbox+.bs-actionsbox{padding:0 8px 4px}.bs-searchbox .form-control{margin-bottom:0;width:100%;float:none} \ No newline at end of file diff --git a/assets/webconfig/css/hyperion.css b/assets/webconfig/css/hyperion.css index a51cee35..8c67b12d 100644 --- a/assets/webconfig/css/hyperion.css +++ b/assets/webconfig/css/hyperion.css @@ -168,6 +168,12 @@ table label{margin:0} border-color: #602060; } +.btn-lang-select { + color: #337ab7; + background-color: transparent; + border-style: none; +} + /*led preview & led visualisation*/ #leds_canvas {background-color:#AAAAAA; position:absolute; margin:15px; background-image:url(/img/hyperion/hyperionlogo.png); background-repeat:no-repeat; background-position: center;} .led { display:inline-block; border: 1px solid black; position:absolute; opacity:0.8; text-align:center; vertical-align:middle; padding:4px; border-radius:2px;} diff --git a/assets/webconfig/index.html b/assets/webconfig/index.html index 410571e0..a5baaa38 100644 --- a/assets/webconfig/index.html +++ b/assets/webconfig/index.html @@ -53,11 +53,14 @@ - + + - - + + + + @@ -169,15 +172,6 @@ + +
  • + +
  • +
    - -
  • - -