diff --git a/assets/css/styles.scss b/assets/css/styles.scss index a747de106..669013bfc 100644 --- a/assets/css/styles.scss +++ b/assets/css/styles.scss @@ -11,11 +11,11 @@ $responsiveWidth: 720px; } ::-webkit-scrollbar-thumb { - background-color: rgba(0, 0, 0, .5); + background-color: rgba(0, 0, 0, 0.5); } ::-webkit-scrollbar-thumb:hover { - background-color: rgba(0, 0, 0, .6); + background-color: rgba(0, 0, 0, 0.6); } ::placeholder { @@ -134,8 +134,7 @@ legend { } fieldset textarea, -fieldset pre -code { +fieldset pre code { resize: vertical; } @@ -148,11 +147,11 @@ fieldset.blue legend { } fieldset.gray { - border-color: #BCC2CD; + border-color: #bcc2cd; } fieldset.gray legend { - color: #BCC2CD; + color: #bcc2cd; } fieldset.green { @@ -226,7 +225,6 @@ pre { width: calc(100% - 8px); background-color: var(--bg-dark-color); color: var(--fg-color); - font-weight: 700; font-size: 18px; font-family: monospace; transition: all 0.2s ease-in-out; @@ -278,7 +276,7 @@ input[type="checkbox"] { justify-content: center; margin: 8px 8px 8px 0; color: transparent; - transition: .2s; + transition: 0.2s; } } @@ -368,23 +366,23 @@ ol li { } .info-response { - background-color: #FFEB3B; + background-color: #ffeb3b; } .success-response { - background-color: #4BB543; + background-color: #4bb543; } .redir-response { - background-color: #FF5722; + background-color: #ff5722; } .cl-error-response { - background-color: #A63232; + background-color: #a63232; } .sv-error-response { - background-color: #B71C1C; + background-color: #b71c1c; } .missing-data-response { @@ -403,7 +401,6 @@ fieldset#history { position: absolute; top: 44px; right: 12px; - font-weight: 700; font-family: monospace, monospace; } } @@ -461,3 +458,37 @@ fieldset#history { } } } + +section { + display: flex; + flex-wrap: wrap; +} + +div.tab { + width: 100%; + order: 1; +} + +input[type="radio"], +div.tab { + display: none; +} + +input[type="radio"] + label { + padding: 8px 16px; + border-bottom: 2px solid transparent; + cursor: pointer; + transition: all 0.2s ease; + + &:hover { + border-color: var(--err-color); + } +} + +input[type="radio"]:checked + label { + border-color: var(--ac-color); +} + +input[type="radio"]:checked + label + div.tab { + display: block; +} diff --git a/build.js b/build.js index 3d7d52e1d..e16304317 100644 --- a/build.js +++ b/build.js @@ -1,46 +1,54 @@ -const axios = require('axios'); -const fs = require('fs'); -const { spawnSync } = require('child_process'); -const runCommand = (command, args) => spawnSync(command, args).stdout.toString().replace(/\n/g, ""); +const axios = require("axios"); +const fs = require("fs"); +const { spawnSync } = require("child_process"); +const runCommand = (command, args) => + spawnSync(command, args) + .stdout.toString() + .replace(/\n/g, ""); const FAIL_ON_ERROR = false; const PW_BUILD_DATA_DIR = "./.postwoman"; const IS_DEV_MODE = process.argv.includes("--dev"); try { + (async () => { + // Create the build data directory if it does not exist. + if (!fs.existsSync(PW_BUILD_DATA_DIR)) { + fs.mkdirSync(PW_BUILD_DATA_DIR); + } - (async () => { - // Create the build data directory if it does not exist. - if (!fs.existsSync(PW_BUILD_DATA_DIR)) { - fs.mkdirSync(PW_BUILD_DATA_DIR); - } + let version = {}; + // Get the current version name as the tag from Git. + version.name = process.env.TRAVIS_TAG || runCommand("git", ["tag"]); - let version = {}; - // Get the current version name as the tag from Git. - version.name = (process.env.TRAVIS_TAG || runCommand('git', ['tag'])); + // FALLBACK: If version.name was unset, let's grab it from GitHub. + if (!version.name) { + version.name = (await axios + .get("https://api.github.com/repos/liyasthomas/postwoman/releases") + // If we can't get it from GitHub, we'll resort to getting it from package.json + .catch(ex => ({ + data: [{ tag_name: require("./package.json").version }] + }))).data[0]["tag_name"]; + } - // FALLBACK: If version.name was unset, let's grab it from GitHub. - if(!version.name){ - version.name = ( - await axios.get("https://api.github.com/repos/liyasthomas/postwoman/releases") - // If we can't get it from GitHub, we'll resort to getting it from package.json - .catch( - (ex) => ({ data: [{ 'tag_name': require('./package.json').version }] }) - ) - ).data[0]['tag_name']; - } + // Get the current version hash as the short hash from Git. + version.hash = runCommand("git", ["rev-parse", "--short", "HEAD"]); + // Get the 'variant' name as the branch, if it's not master. + version.variant = + process.env.TRAVIS_BRANCH || + runCommand("git", ["branch"]) + .split("* ")[1] + .split(" ")[0] + (IS_DEV_MODE ? " - DEV MODE" : ""); + if (version.variant === "" || version.variant === "master") + delete version.variant; - // Get the current version hash as the short hash from Git. - version.hash = runCommand('git', ['rev-parse', '--short', 'HEAD']); - // Get the 'variant' name as the branch, if it's not master. - version.variant = (process.env.TRAVIS_BRANCH || runCommand('git', ['branch']).split("* ")[1].split(" ")[0] + (IS_DEV_MODE ? " - DEV MODE" : "")); - if(version.variant === "" || version.variant === "master") delete version.variant; - - // Write version data into a file - fs.writeFileSync(PW_BUILD_DATA_DIR + "/version.json", JSON.stringify(version)); - })(); - -}catch(ex){ - console.error(ex); - process.exit(FAIL_ON_ERROR ? 1 : 0); + // Write version data into a file + fs.writeFileSync( + PW_BUILD_DATA_DIR + "/version.json", + JSON.stringify(version) + ); + })(); +} catch (ex) { + console.error(ex); + process.exit(FAIL_ON_ERROR ? 1 : 0); } diff --git a/components/autocomplete.vue b/components/autocomplete.vue index f985d8718..b469f5aca 100644 --- a/components/autocomplete.vue +++ b/components/autocomplete.vue @@ -1,11 +1,9 @@ diff --git a/pages/websocket.vue b/pages/websocket.vue index 56d11d507..99ffbffb8 100644 --- a/pages/websocket.vue +++ b/pages/websocket.vue @@ -28,7 +28,7 @@
- @ {{ logEntry.ts }} {{ getSourcePrefix(logEntry.source) }} {{ logEntry.payload }} + @ {{ logEntry.ts }} {{ getSourcePrefix(logEntry.source) }} {{ logEntry.payload }} (Waiting for connection...)