Skip to content

Commit

Permalink
Merge pull request #34 from iFargle/css-fixes
Browse files Browse the repository at this point in the history
Css fixes
  • Loading branch information
iFargle authored Feb 28, 2023
2 parents 72e94ca + 23b1b19 commit f55bb4c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pipeline {
label 'linux-x64'
}
environment {
APP_VERSION = 'v0.5.1'
APP_VERSION = 'v0.5.2'
HS_VERSION = "v0.20.0" // Version of Headscale this is compatible with
BUILD_DATE = ''
}
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "headscale-webui"
version = "v0.5.1"
version = "v0.5.2"
description = "A simple web UI for small-scale Headscale deployments."
authors = ["Albert Copeland <albert@sysctl.io>"]
license = "AGPL"
Expand Down
6 changes: 5 additions & 1 deletion static/css/overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

.dropdown-oidc {
top: 64px !important;
width: 200px !important;
width: max-content !important;
left: unset !important;
right: 10px !important;
cursor: unset !important;
Expand All @@ -34,4 +34,8 @@ li.dropdown-oidc-collection{

.overview-page {
color: unset !important;
}

.datepicker-modal {
width: max-content !important;
}
8 changes: 1 addition & 7 deletions static/js/custom.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,13 @@ function get_color(id) {
return colors[index]
}

function get_base_path() {

}

// Generic modal used for alerts / problems
function load_modal_generic(type, title, message) {
console.log("Loading the generic modal")
element = document.getElementById('generic_modal')
content_element = document.getElementById('generic_modal_content')
title_element = document.getElementById('generic_modal_title')


content_element.innerHTML = loading()
title_element.innerHTML = "Loading..."
html = ""
Expand Down Expand Up @@ -311,7 +306,6 @@ function load_modal_add_preauth_key(user_name) {
<span>Ephemeral</span>
</label>
</p>
`

modal_body.innerHTML = body_html
Expand Down Expand Up @@ -617,7 +611,7 @@ function add_chip(machine_id, chipsData) {
}

function add_machine() {
var key = document.getElementById('add_machine_key_field').value
var key = document.getElementById('add_machine_key_field').value
var user = document.getElementById('add_machine_user_select').value
var data = {"key": key, "user": user}

Expand Down

0 comments on commit f55bb4c

Please sign in to comment.