Skip to content

Commit 17e12b2

Browse files
AetherinoxAetherinox
authored
Merge pull request #27 from Aetherinox/main
build: v1.4.2 match stable with beta
2 parents 3b171c7 + 271b2d7 commit 17e12b2

File tree

21 files changed

+1004
-283
lines changed

21 files changed

+1004
-283
lines changed

‎dist/main.js‎

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "gistr",
33
"name": "Gistr",
4-
"version": "1.4.1",
4+
"version": "1.4.2",
55
"minAppVersion": "1.0.0",
66
"description": "Integrate OpenGist and Github gist snippets in your notes.",
77
"author": "Aetherinox",

‎dist/styles.css‎

Lines changed: 115 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ settings:
7373
default-light: '#ccac1f'
7474
default-dark: '#ccac1f'
7575
-
76-
id: gistr-status-connected
77-
title: 'Status indicator: Connected'
76+
id: gistr-status-success
77+
title: 'Status indicator: Success'
7878
description: 'Color for icon and text when indicator says "Connected"'
7979
type: variable-themed-color
8080
opacity: true
@@ -98,7 +98,7 @@ body
9898
--gistr-phrase-dark: #ff5d85;
9999
--gistr-status-connecting: #f1c638;
100100
--gistr-status-error: #e02f6a;
101-
--gistr-status-connected: #4c9155;
101+
--gistr-status-success: #4c9155;
102102
--gistr-status-issues: #ccac1f;
103103
}
104104

@@ -254,6 +254,7 @@ body
254254
{
255255
min-width: 30px;
256256
text-align: right;
257+
font-size: 9pt;
257258
}
258259

259260
.gistr-settings-lbl-important
@@ -269,11 +270,27 @@ body
269270
animation: none;
270271
}
271272

273+
.gistr-settings-icon-update
274+
{
275+
position: relative;
276+
font-size: 7px;
277+
content: url( "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' fill='%23dea11f' width='16px' height='16px'%3E%3C!--! --%3E%3Cpath d='M256 32c14.2 0 27.3 7.5 34.5 19.8l216 368c7.3 12.4 7.3 27.7 .2 40.1S486.3 480 472 480H40c-14.3 0-27.6-7.7-34.7-20.1s-7-27.8 .2-40.1l216-368C228.7 39.5 241.8 32 256 32zm0 128c-13.3 0-24 10.7-24 24V296c0 13.3 10.7 24 24 24s24-10.7 24-24V184c0-13.3-10.7-24-24-24zm32 224a32 32 0 1 0 -64 0 32 32 0 1 0 64 0z'%3E%3C/path%3E%3C/svg%3E" );
278+
animation: none;
279+
}
280+
281+
.gistr-settings-icon-update-dark
282+
{
283+
position: relative;
284+
font-size: 7px;
285+
content: url( "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' fill='%23dea11f' width='16px' height='16px'%3E%3C!--! --%3E%3Cpath d='M256 32c14.2 0 27.3 7.5 34.5 19.8l216 368c7.3 12.4 7.3 27.7 .2 40.1S486.3 480 472 480H40c-14.3 0-27.6-7.7-34.7-20.1s-7-27.8 .2-40.1l216-368C228.7 39.5 241.8 32 256 32zm0 128c-13.3 0-24 10.7-24 24V296c0 13.3 10.7 24 24 24s24-10.7 24-24V184c0-13.3-10.7-24-24-24zm32 224a32 32 0 1 0 -64 0 32 32 0 1 0 64 0z'%3E%3C/path%3E%3C/svg%3E" );
286+
animation: none;
287+
}
288+
272289
.gistr-settings-icon-invalid
273290
{
274291
position: relative;
275292
font-size: 7px;
276-
content: url( "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' fill='%23ff3e7e' width='18px' height='18px'%3E%3C!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --%3E%3Cpath d='M256 48a208 208 0 1 1 0 416 208 208 0 1 1 0-416zm0 464A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM186.3 136.5c-8.6-10.1-23.7-11.4-33.8-2.8s-11.4 23.7-2.8 33.8L224.6 256l-74.9 88.5c-8.6 10.1-7.3 25.3 2.8 33.8s25.3 7.3 33.8-2.8L256 293.2l69.7 82.3c8.6 10.1 23.7 11.4 33.8 2.8s11.4-23.7 2.8-33.8L287.4 256l74.9-88.5c8.6-10.1 7.3-25.3-2.8-33.8s-25.3-7.3-33.8 2.8L256 218.8l-69.7-82.3z'%3E%3C/path%3E%3C/svg%3E" );
293+
content: url( "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' fill='%23ff3e7e' width='18px' height='18px'%3E%3C!--! --%3E%3Cpath d='M256 48a208 208 0 1 1 0 416 208 208 0 1 1 0-416zm0 464A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM186.3 136.5c-8.6-10.1-23.7-11.4-33.8-2.8s-11.4 23.7-2.8 33.8L224.6 256l-74.9 88.5c-8.6 10.1-7.3 25.3 2.8 33.8s25.3 7.3 33.8-2.8L256 293.2l69.7 82.3c8.6 10.1 23.7 11.4 33.8 2.8s11.4-23.7 2.8-33.8L287.4 256l74.9-88.5c8.6-10.1 7.3-25.3-2.8-33.8s-25.3-7.3-33.8 2.8L256 218.8l-69.7-82.3z'%3E%3C/path%3E%3C/svg%3E" );
277294
animation: none;
278295
}
279296

@@ -473,10 +490,94 @@ body
473490
border: 0px;
474491
}
475492

493+
.gistr-settings-modal .checkbox-container input[ type='checkbox' ], .gistr-settings-modal .checkbox-container, .gistr-settings-modal button, .gistr-settings-modal select
494+
{
495+
cursor: pointer;
496+
}
497+
498+
.gistr-settings-modal .setting-item
499+
{
500+
border: 0px;
501+
}
502+
503+
.gistr-settings-modal .clickable-icon.setting-editor-extra-setting-button
504+
{
505+
cursor: pointer;
506+
}
476507

477508
.gistr-slider input[ type="range" ]
478509
{
479-
width: 90%;
510+
width: 120px;
511+
height: 3px;
512+
}
513+
514+
.gistr-dropdown .dropdown
515+
{
516+
width: 120px;
517+
}
518+
519+
/*
520+
Version Info
521+
*/
522+
523+
.gistr-settings-ver-int-l
524+
{
525+
cursor: pointer;
526+
float: left;
527+
width: 40%;
528+
margin-top: 2px;
529+
margin-bottom: 2px;
530+
}
531+
532+
.gistr-settings-ver::before, .gistr-settings-ver-int-l::before
533+
{
534+
padding-top: 2px;
535+
}
536+
537+
.gistr-settings-ver-int-r
538+
{
539+
cursor: pointer;
540+
float: right;
541+
width: 8%;
542+
margin-top: 2px;
543+
margin-bottom: 2px;
544+
height: 0px;
545+
}
546+
547+
.gistr-settings-ver-int-r .setting-item-info
548+
{
549+
display: none;
550+
}
551+
552+
.gistr-settings-ver-int-r .setting-item
553+
{
554+
padding: 0px !important;
555+
width: 100%;
556+
margin-top: -7px;
557+
}
558+
559+
.gistr-settings-ver-int-r .setting-item-control
560+
{
561+
flex: none;
562+
width: 100%;
563+
}
564+
565+
.gistr-settings-ver-int-r .setting-item-control > input
566+
{
567+
background: none;
568+
border: 0px;
569+
text-align: right;
570+
}
571+
572+
.gistr-settings-ver-int-r .setting-item-control > input:hover, input:active
573+
{
574+
background: none;
575+
border: 0px;
576+
}
577+
578+
.gistr-settings-ver-int-c
579+
{
580+
clear: both;
480581
}
481582

482583
/*
@@ -495,18 +596,24 @@ h2.gistr-settings-header + div > div > div > .setting-item-description
495596
}
496597
*/
497598

498-
.gistr-settings-status-connected > input
599+
.gistr-settings-status-success > input
499600
{
500-
color: var( --gistr-status-connected ) !important;
601+
color: var( --gistr-status-success ) !important;
501602
font-weight: bold;
502603
}
503604

504-
.gistr-settings-status-issues > input
605+
.gistr-settings-status-warning > input
505606
{
506607
color: var( --gistr-status-issues ) !important;
507608
font-weight: bold;
508609
}
509610

611+
.gistr-settings-status-error > input
612+
{
613+
color: var( --gistr-status-error ) !important;
614+
font-weight: bold;
615+
}
616+
510617
/*
511618
Modal > Getting Started
512619
*/

‎manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "gistr",
33
"name": "Gistr",
4-
"version": "1.4.1",
4+
"version": "1.4.2",
55
"minAppVersion": "1.0.0",
66
"description": "Integrate OpenGist and Github gist snippets in your notes.",
77
"author": "Aetherinox",

‎package-lock.json‎

Lines changed: 17 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gistr",
3-
"version": "1.4.1",
3+
"version": "1.4.2",
44
"description": "Integrate OpenGist and Github gist snippets in your notes.",
55
"main": "main.js",
66
"repository": {
@@ -37,7 +37,8 @@
3737
"rollup-plugin-define": "^1.0.1",
3838
"rollup-plugin-license": "^3.2.0",
3939
"tslib": "^2.2.0",
40-
"typescript": "^4.2.4"
40+
"typescript": "^4.2.4",
41+
"uuid": "^9.0.1"
4142
},
4243
"dependencies": {
4344
"@aetherinox/noxkit": "^1.1.0",

‎rollup.config.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import { nodeResolve } from '@rollup/plugin-node-resolve';
1010
import commonjs from '@rollup/plugin-commonjs';
1111
import terser from '@rollup/plugin-terser';
1212
import define from 'rollup-plugin-define';
13-
import license from 'rollup-plugin-license'
13+
import license from 'rollup-plugin-license';
14+
import { v5 as uuidv5 } from 'uuid';
1415
import {readFileSync} from 'fs';
1516

1617
const { name, author, version, repository } = JSON.parse(readFileSync('./package.json'));
@@ -24,7 +25,8 @@ const topBanner = `
2425
@url: ${ repository.url }
2526
@copyright: (c) ${ year } ${ author }
2627
@license: MIT
27-
@build: ${ new Date( ).toLocaleString( ) }
28+
@build: ${ new Date( ).toISOString( ) }
29+
@build-id: ${ uuidv5( ` + repository + `, uuidv5.URL ) }
2830
`;
2931

3032
console.log( topBanner );

‎src/lang/locale/en.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export default
1717
base_theme_dark: 'Dark',
1818
base_time_am: 'AM',
1919
base_time_pm: 'PM',
20+
base_component_reset: 'Reset to Default',
2021
base_debug_loading: 'Loading {0} v{1} [ {2} ]',
2122
base_debug_updater_1: '{0} Update Check',
2223
base_debug_updater_2: '{0} {1}',
@@ -53,7 +54,7 @@ export default
5354
cfg_tab_ge_keyword_name: 'Trigger keyword',
5455
cfg_tab_ge_keyword_desc: 'Word to use inside codeblocks to designate as a portal for showing gists',
5556
cfg_tab_ge_theme_name: 'Theme',
56-
cfg_tab_ge_theme_desc: 'This determines what color scheme will be used for gists. You can however, customize the colors in the Github and OpenGist categories below. MUST reload your note for the new stylesheet to be loaded.',
57+
cfg_tab_ge_theme_desc: 'This determines what color scheme will be used for gists. You can however, customize the colors in the Github and OpenGist categories below.<br><br><b>Note:</b> When this is changed, place your cursor in the codeblock and then leave the codeblock to refresh it. Automatic refreshing only works in <span class="gistr-settings-elm-note">reading mode</span>',
5758
cfg_tab_ge_wrap_name: 'Text wrapping',
5859
cfg_tab_ge_wrap_desc: 'If enabled, text will wrap to the next line. If disabled, you will see a horizontal scrollbar. This does not include gists that have no spaces anywhere in the body.',
5960
cfg_tab_ge_notitime_name: 'Notification duration',
@@ -158,6 +159,17 @@ export default
158159
cfg_tab_su_gist_url: 'https://gist.github.com/',
159160
cfg_tab_su_gist_btn: 'View',
160161

162+
cfg_tab_su_ver_cur: 'Current version',
163+
cfg_tab_su_ver_stable: 'Latest stable release ',
164+
cfg_tab_su_ver_beta: 'Latest beta release ',
165+
cfg_tab_su_ver_connection_issues: 'Server communication failed',
166+
cfg_tab_su_ver_status_checking: 'Checking for newer version of Gistr',
167+
cfg_tab_su_ver_status_uptodate: 'You are running the latest version of Gistr',
168+
cfg_tab_su_ver_status_stable_avail: 'A newer stable release of Gistr is available',
169+
cfg_tab_su_ver_status_beta_avail: 'A newer beta release of Gistr is available',
170+
cfg_tab_su_ver_status_tip_conn_error: 'Could not communicate with the gistr server, retrying later',
171+
cfg_tab_su_ver_releases: 'https://github.com/Aetherinox/obsidian-gistr/releases',
172+
161173
/*
162174
Tab > Sync
163175
*/

0 commit comments

Comments
 (0)