Modified Theme button to use background images.

pull/2/head
David Tookey 5 years ago
parent cf76daee74
commit 5ce9cdd25f

@ -34,6 +34,7 @@
<a class="navbar-brand text-navbartext" href="#"> <a class="navbar-brand text-navbartext" href="#">
<img src="../images/jdsfaulkner-logo-lt-theme.png" height="50" class="d-inline-block align-middle" alt="JDSfaulkner logo"> <img src="../images/jdsfaulkner-logo-lt-theme.png" height="50" class="d-inline-block align-middle" alt="JDSfaulkner logo">
</a> </a>
<div id="theme-toggle" class="theme-button mb-2"></div>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarHeader" <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarHeader"
aria-controls="navbarHeader" aria-expanded="false" aria-label="Toggle navigation"> aria-controls="navbarHeader" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
@ -45,7 +46,7 @@
<main> <main>
<div class="album py-5 bg-secondary"> <div class="album py-5 bg-secondary">
<button id="theme-toggle" class="btn btn-light mb-2">Push to change theme</button>
<div class="container"> <div class="container">
<input class="form-control form-control-dark w-100 bg-info border border-boxborder text-searchfont" placeholder="Search" <input class="form-control form-control-dark w-100 bg-info border border-boxborder text-searchfont" placeholder="Search"
aria-label="Search"> aria-label="Search">

@ -18,4 +18,14 @@ $theme-colors: (
"paragraphtextcolorhover":#202022, "paragraphtextcolorhover":#202022,
); );
.theme-button{
width:40px;
height: 30px;
background-size: contain;
background-color: transparent;
background-image: url("../../images/theme-toggle-dark.png");
cursor: pointer;
}
@import "theme-base"; @import "theme-base";

@ -18,4 +18,13 @@ $theme-colors: (
"paragraphtextcolorhover":#ffffff, "paragraphtextcolorhover":#ffffff,
); );
.theme-button{
width:40px;
height: 30px;
background-size: contain;
background-color: transparent;
background-image: url("../../images/theme-toggle-light.png");
cursor: pointer;
}
@import "theme-base"; @import "theme-base";

@ -13,15 +13,15 @@ export module Themes {
applyTheme(initTheme); applyTheme(initTheme);
let initToggle = $('#theme-toggle'); let initToggle = $('#theme-toggle');
let initThemeEnum = getThemeFromValue(initTheme); let initThemeEnum = getThemeFromValue(initTheme);
initToggle.addClass(getButtonClassFromAppTheme(initThemeEnum)); // initToggle.addClass(getButtonClassFromAppTheme(initThemeEnum));
initToggle.on("click", () => { initToggle.on("click", () => {
let conf = Configurator.loadUserConfig(ConfigPaths.UserConfigName); let conf = Configurator.loadUserConfig(ConfigPaths.UserConfigName);
let toggle = $("#theme-toggle"); let toggle = $("#theme-toggle");
let themeValue = conf['theme']; let themeValue = conf['theme'];
let currTheme = getThemeFromValue(themeValue); let currTheme = getThemeFromValue(themeValue);
let opposite = getOppositeTheme(currTheme); let opposite = getOppositeTheme(currTheme);
toggle.removeClass(getButtonClassFromAppTheme(currTheme)); // toggle.removeClass(getButtonClassFromAppTheme(currTheme));
toggle.addClass(getButtonClassFromAppTheme(opposite)); // toggle.addClass(getButtonClassFromAppTheme(opposite));
applyTheme(opposite); applyTheme(opposite);
conf['theme'] = opposite; conf['theme'] = opposite;
Configurator.saveUserConfig(ConfigPaths.UserConfigName, conf); Configurator.saveUserConfig(ConfigPaths.UserConfigName, conf);

@ -47,7 +47,7 @@ export function buildWebCardsFromConfig(configName: string) {
let key = keys[i]; let key = keys[i];
let contentList = elementConfig[key]; let contentList = elementConfig[key];
let element = $(`#${key}`); let element = $(`#${key}`);
console.log(element);
for (let j = 0, m = contentList.length; j<m;j++){ for (let j = 0, m = contentList.length; j<m;j++){
let content = contentList[j]; let content = contentList[j];
buildWebCard(element, content, true, $); buildWebCard(element, content, true, $);
@ -65,7 +65,6 @@ export function buildWebCard(elem: JQuery<HTMLElement>, obj, append: boolean = f
); );
loadTemplateSingle("web-card.mustache", model, (content: string, id: string) => { loadTemplateSingle("web-card.mustache", model, (content: string, id: string) => {
console.log(elem);
if (append) { if (append) {
elem.append(content); elem.append(content);
} else { } else {
@ -100,11 +99,9 @@ function getImagePathFromDocumentName(name: string): string {
function launchDocument(filename: string) { function launchDocument(filename: string) {
let fullPath = FileUtils.getPathToDocument(filename); let fullPath = FileUtils.getPathToDocument(filename);
console.log(`Attempting to open file: ${fullPath}`);
shell.openItem(fullPath); shell.openItem(fullPath);
} }
function launchWebsite(url: string) { function launchWebsite(url: string) {
console.log("Attempting to launch " + url)
shell.openItem(url); shell.openItem(url);
} }
Loading…
Cancel
Save