Skip to content

Commit

Permalink
Merge branch 'main' of [email protected]:extratone/bilge.git
Browse files Browse the repository at this point in the history
  • Loading branch information
extratone committed Nov 14, 2021
2 parents 056fa80 + 9eef92f commit 90538d4
Show file tree
Hide file tree
Showing 21 changed files with 212 additions and 97 deletions.
2 changes: 2 additions & 0 deletions $/Pitch - Social Media Consultation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
![](Pitch_%20Social%20Consumption%20Consultation.mp3)
[Pitch: Social Consumption Consultation | Whyp](https://whyp.it/t/pitch-social-consumption-consultation-KJ57o)
2 changes: 1 addition & 1 deletion .sophie/appearance.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"baseFontSize": 18,
"theme": "moonstone",
"theme": "obsidian",
"cssTheme": "Minimal",
"enabledCssSnippets": [
"Type",
Expand Down
8 changes: 6 additions & 2 deletions .sophie/plugins/obsidian-activity-history/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"checkpointList": [
{
"path": "/",
"date": "2021-11-13",
"size": 11131567
"date": "2021-11-14",
"size": 11132581
}
],
"activityHistory": [
Expand Down Expand Up @@ -59,6 +59,10 @@
{
"date": "2021-11-13",
"value": 19504
},
{
"date": "2021-11-14",
"value": 3430
}
]
}
Expand Down
40 changes: 20 additions & 20 deletions .sophie/plugins/obsidian-charts/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .sophie/plugins/obsidian-charts/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "obsidian-charts",
"name": "Obsidian Charts",
"version": "3.0.2",
"version": "3.0.4",
"minAppVersion": "0.12.7",
"description": "This Plugin lets you create Charts within Obsidian",
"author": "phibr0",
Expand Down
8 changes: 4 additions & 4 deletions .sophie/plugins/obsidian-dictionary-plugin/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .sophie/plugins/obsidian-dictionary-plugin/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "obsidian-dictionary-plugin",
"name": "Dictionary",
"version": "2.18.9",
"version": "2.18.10",
"minAppVersion": "0.12.11",
"description": "This is a simple dictionary for the Obsidian Note-Taking Tool.",
"author": "phibr0",
Expand Down
2 changes: 1 addition & 1 deletion .sophie/plugins/obsidian-kindle-plugin/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .sophie/plugins/obsidian-kindle-plugin/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "obsidian-kindle-plugin",
"name": "Kindle Highlights",
"version": "1.1.2",
"version": "1.2.0",
"minAppVersion": "0.10.2",
"description": "Sync your Kindle book highlights using your Amazon login or uploading your My Clippings file",
"author": "Hady Osman",
Expand Down
163 changes: 132 additions & 31 deletions .sophie/plugins/obsidian-style-settings/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3733,6 +3733,95 @@ var pickr_min = createCommonjsModule(function (module, exports) {

var Pickr = /*@__PURE__*/getDefaultExportFromCjs(pickr_min);

const ar = {};

const cz = {};

const da = {};

const de = {};

const en = {
"Default:": "Default:",
"Error:": "Error:",
"missing default light value, or value is not in a valid color format": "missing default light value, or value is not in a valid color format",
"missing default dark value, or value is not in a valid color format": "missing default dark value, or value is not in a valid color format",
"missing default value, or value is not in a valid color format": "missing default value, or value is not in a valid color format",
"missing default value": "missing default value",
};

const es = {};

const fr = {};

const hi = {};

const id = {};

const it = {};

const ja = {};

const ko = {};

const nl = {};

const no = {};

const pl = {};

const pt = {};

const ptBr = {};

const ro = {};

const ru = {};

const sq = {};

const tr = {};

const uk = {};

const zh = {};

const zhTw = {};

const lang = window.localStorage.getItem("language");
const localeMap = {
ar,
cz,
da,
de,
es,
fr,
hi,
id,
it,
ja,
ko,
nl,
no,
pl,
"pt-BR": ptBr,
pt,
ro,
ru,
sq,
tr,
uk,
"zh-TW": zhTw,
zh,
};
const locale = localeMap[lang || "en"];
function t(str) {
if (!locale) {
console.error("Error: Style Settings locale not found", lang);
}
return (locale && locale[str]) || en[str];
}

const resetTooltip = "Restore default";
function sanitizeText(str) {
if (str === "") {
Expand All @@ -3747,20 +3836,32 @@ function createDescription(description, def, defLabel) {
}
if (def) {
const small = createEl("small");
small.appendChild(createEl("strong", { text: "Default: " }));
small.appendChild(createEl("strong", { text: `${t('Default:')} ` }));
small.appendChild(document.createTextNode(defLabel || def));
const div = createEl("div");
div.appendChild(small);
fragment.appendChild(div);
}
return fragment;
}
function getTitle(config) {
if (lang) {
return config[`title.${lang}`] || config.title;
}
return config.title;
}
function getDescription(config) {
if (lang) {
return config[`description.${lang}`] || config.description;
}
return config.description;
}
function createHeading(opts) {
new obsidian.Setting(opts.containerEl)
.setHeading()
.setClass("style-settings-heading")
.setName(opts.config.title)
.setDesc(opts.config.description ? opts.config.description : "")
.setName(getTitle(opts.config))
.setDesc(getDescription(opts.config) ? getDescription(opts.config) : "")
.then((setting) => {
if (opts.config.collapsed)
setting.settingEl.addClass("is-collapsed");
Expand All @@ -3787,9 +3888,9 @@ function createHeading(opts) {
.then((b) => {
b.extraSettingsEl.onClickEvent((e) => {
e.stopPropagation();
const title = opts.sectionName === opts.config.title
? opts.config.title
: `${opts.sectionName} > ${opts.config.title}`;
const title = opts.sectionName === getTitle(opts.config)
? getTitle(opts.config)
: `${opts.sectionName} > ${getTitle(opts.config)}`;
opts.settingsManager.export(title, opts.settingsManager.getSettings(opts.sectionId, opts.children));
});
});
Expand All @@ -3800,8 +3901,8 @@ function createClassToggle(opts) {
const { sectionId, config, containerEl, settingsManager } = opts;
let toggleComponent;
new obsidian.Setting(containerEl)
.setName(config.title)
.setDesc(config.description || "")
.setName(getTitle(config))
.setDesc(getDescription(config) || "")
.addToggle((toggle) => {
const value = settingsManager.getSetting(sectionId, config.id);
toggle
Expand Down Expand Up @@ -3840,7 +3941,7 @@ function createClassMultiToggle(opts) {
const { sectionId, config, containerEl, settingsManager } = opts;
let dropdownComponent;
if (typeof config.default !== "string") {
return console.error(`Error: ${config.title} missing default value`);
return console.error(`${t('Error:')} ${getTitle(config)} ${t('missing default value')}`);
}
let prevValue = settingsManager.getSetting(sectionId, config.id);
if (prevValue === undefined && !!config.default) {
Expand All @@ -3865,8 +3966,8 @@ function createClassMultiToggle(opts) {
defaultLabel = defaultOption.label;
}
new obsidian.Setting(containerEl)
.setName(config.title)
.setDesc(createDescription(config.description, config.default, defaultLabel))
.setName(getTitle(config))
.setDesc(createDescription(getDescription(config), config.default, defaultLabel))
.addDropdown((dropdown) => {
if (config.allowEmpty) {
dropdown.addOption("none", "");
Expand Down Expand Up @@ -3914,11 +4015,11 @@ function createVariableText(opts) {
const { sectionId, config, containerEl, settingsManager } = opts;
let textComponent;
if (typeof config.default !== "string") {
return console.error(`Error: ${config.title} missing default value`);
return console.error(`${t('Error:')} ${getTitle(config)} ${t('missing default value')}`);
}
new obsidian.Setting(containerEl)
.setName(config.title)
.setDesc(createDescription(config.description, config.default))
.setName(getTitle(config))
.setDesc(createDescription(getDescription(config), config.default))
.addText((text) => {
const value = settingsManager.getSetting(sectionId, config.id);
const onChange = obsidian.debounce((value) => {
Expand All @@ -3945,11 +4046,11 @@ function createVariableNumber(opts) {
const { sectionId, config, containerEl, settingsManager } = opts;
let textComponent;
if (typeof config.default !== "number") {
return console.error(`Error: ${config.title} missing default value`);
return console.error(`${t('Error:')} ${getTitle(config)} ${t('missing default value')}`);
}
new obsidian.Setting(containerEl)
.setName(config.title)
.setDesc(createDescription(config.description, config.default.toString(10)))
.setName(getTitle(config))
.setDesc(createDescription(getDescription(config), config.default.toString(10)))
.addText((text) => {
const value = settingsManager.getSetting(sectionId, config.id);
const onChange = obsidian.debounce((value) => {
Expand Down Expand Up @@ -3977,11 +4078,11 @@ function createVariableNumberSlider(opts) {
const { sectionId, config, containerEl, settingsManager } = opts;
let sliderComponent;
if (typeof config.default !== "number") {
return console.error(`Error: ${config.title} missing default value`);
return console.error(`${t('Error:')} ${getTitle(config)} ${t('missing default value')}`);
}
new obsidian.Setting(containerEl)
.setName(config.title)
.setDesc(createDescription(config.description, config.default.toString(10)))
.setName(getTitle(config))
.setDesc(createDescription(getDescription(config), config.default.toString(10)))
.addSlider((slider) => {
const value = settingsManager.getSetting(sectionId, config.id);
const onChange = obsidian.debounce((value) => {
Expand Down Expand Up @@ -4010,7 +4111,7 @@ function createVariableSelect(opts) {
const { sectionId, config, containerEl, settingsManager } = opts;
let dropdownComponent;
if (typeof config.default !== "string") {
return console.error(`Error: ${config.title} missing default value`);
return console.error(`${t('Error:')} ${getTitle(config)} ${t('missing default value')}`);
}
const defaultOption = config.default
? config.options.find((o) => {
Expand All @@ -4028,8 +4129,8 @@ function createVariableSelect(opts) {
defaultLabel = defaultOption.label;
}
new obsidian.Setting(containerEl)
.setName(config.title)
.setDesc(createDescription(config.description, config.default, defaultLabel))
.setName(getTitle(config))
.setDesc(createDescription(getDescription(config), config.default, defaultLabel))
.addDropdown((dropdown) => {
const value = settingsManager.getSetting(sectionId, config.id);
config.options.forEach((o) => {
Expand Down Expand Up @@ -4093,7 +4194,7 @@ function createVariableColor(opts) {
const { sectionId, config, containerEl, settingsManager } = opts;
if (typeof config.default !== "string" ||
!isValidDefaultColor(config.default)) {
return console.error(`Error: ${config.title} missing default value, or value is not in a valid color format`);
return console.error(`${t('Error:')} ${getTitle(config)} ${t('missing default value, or value is not in a valid color format')}`);
}
const value = settingsManager.getSetting(sectionId, config.id);
const swatches = [];
Expand All @@ -4105,8 +4206,8 @@ function createVariableColor(opts) {
swatches.push(value);
}
new obsidian.Setting(containerEl)
.setName(config.title)
.setDesc(createDescription(config.description, config.default))
.setName(getTitle(config))
.setDesc(createDescription(getDescription(config), config.default))
.then((setting) => {
setting.settingEl.dataset.id = opts.config.id;
pickr = Pickr.create(getPickrSettings({
Expand Down Expand Up @@ -4143,11 +4244,11 @@ function createVariableThemedColor(opts) {
const { sectionId, config, containerEl, settingsManager } = opts;
if (typeof config["default-light"] !== "string" ||
!isValidDefaultColor(config["default-light"])) {
return console.error(`Error: ${config.title} missing default light value, or value is not in a valid color format`);
return console.error(`${t('Error:')} ${getTitle(config)} ${t('missing default light value, or value is not in a valid color format')}`);
}
if (typeof config["default-dark"] !== "string" ||
!isValidDefaultColor(config["default-dark"])) {
return console.error(`Error: ${config.title} missing default dark value, or value is not in a valid color format`);
return console.error(`${t('Error:')} ${getTitle(config)} ${t('missing default dark value, or value is not in a valid color format')}`);
}
const idLight = `${config.id}@@light`;
const idDark = `${config.id}@@dark`;
Expand Down Expand Up @@ -4177,13 +4278,13 @@ function createVariableThemedColor(opts) {
instance.addSwatch(color.toHEXA().toString());
};
new obsidian.Setting(containerEl)
.setName(config.title)
.setName(getTitle(config))
.then((setting) => {
setting.settingEl.dataset.id = opts.config.id;
// Construct description
setting.descEl.createSpan({}, (span) => {
if (config.description) {
span.appendChild(document.createTextNode(config.description));
if (getDescription(config)) {
span.appendChild(document.createTextNode(getDescription(config)));
}
});
setting.descEl.createDiv({}, (div) => {
Expand Down
2 changes: 1 addition & 1 deletion .sophie/plugins/obsidian-style-settings/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "obsidian-style-settings",
"name": "Style Settings",
"version": "0.3.8",
"version": "0.4.0",
"minAppVersion": "0.11.5",
"description": "Offers controls for adjusting theme, plugin, and snippet CSS variables.",
"author": "mgmeyers",
Expand Down
Loading

0 comments on commit 90538d4

Please sign in to comment.