From e37d51f5495f56148087b895c8b5094fba6d72b5 Mon Sep 17 00:00:00 2001 From: shockrah Date: Fri, 1 Jan 2021 20:04:11 -0800 Subject: [PATCH] Making the navbar more responsive to screen changes ! Bootstrap doesn't behave so dropdowns are borked but they'r theoretically there LMAO at this example config update btw its gonna keep changing so I'm not updating its patch notes from here out until its a proper looking example --- freechat-client/example-dev-config.json | 6 +++ freechat-client/pages/index.html | 63 +++++++++++++++++++++---- freechat-client/sass/style.scss | 3 +- freechat-client/src/config.js | 2 +- 4 files changed, 63 insertions(+), 11 deletions(-) diff --git a/freechat-client/example-dev-config.json b/freechat-client/example-dev-config.json index 604f253..d37fc40 100644 --- a/freechat-client/example-dev-config.json +++ b/freechat-client/example-dev-config.json @@ -8,6 +8,12 @@ "description": "really good", "key": "given by server don't worry fow now", "username": "this is optional per server" + }, + { + "name": "another one" + }, + { + "name": "shockrah's lair" } ], diff --git a/freechat-client/pages/index.html b/freechat-client/pages/index.html index 033ff05..075ce2c 100644 --- a/freechat-client/pages/index.html +++ b/freechat-client/pages/index.html @@ -1,24 +1,69 @@ - + + + Freechat + + + + - + + + + diff --git a/freechat-client/sass/style.scss b/freechat-client/sass/style.scss index 86738cd..13441bb 100644 --- a/freechat-client/sass/style.scss +++ b/freechat-client/sass/style.scss @@ -32,5 +32,6 @@ input { .btn-nav-settings { color: whitesmoke; - border-color: whitesmoke; + border-color: whitesmoke; + margin-right: 1em; } diff --git a/freechat-client/src/config.js b/freechat-client/src/config.js index 61f8baa..776be17 100644 --- a/freechat-client/src/config.js +++ b/freechat-client/src/config.js @@ -16,7 +16,7 @@ function get_config(parser) { // now we'll just blindly construct the config object from here on out let ret = { path: path } - for(const key in file_json.keys) { + for(const key of Object.keys(file_json)) { if(key == 'path') { continue } // don't overwrite the old path else { ret[key] = file_json[key]