diff --git a/changedetectionio/blueprint/tags/templates/groups-overview.html b/changedetectionio/blueprint/tags/templates/groups-overview.html index b75762f57..8de26070c 100644 --- a/changedetectionio/blueprint/tags/templates/groups-overview.html +++ b/changedetectionio/blueprint/tags/templates/groups-overview.html @@ -10,7 +10,7 @@ Add a new organisational tag
- {{ render_simple_field(form.name, placeholder="watch label / tag") }} + {{ render_simple_field(form.name, placeholder="Watch group / tag") }}
{{ render_simple_field(form.save_button, title="Save" ) }} diff --git a/changedetectionio/blueprint/watchlist/templates/watch-overview.html b/changedetectionio/blueprint/watchlist/templates/watch-overview.html index 4b7eb2f99..60fdddbff 100644 --- a/changedetectionio/blueprint/watchlist/templates/watch-overview.html +++ b/changedetectionio/blueprint/watchlist/templates/watch-overview.html @@ -18,19 +18,20 @@ document.addEventListener('DOMContentLoaded', function() { transition: background-size 0.9s ease } -
+
- Add a new change detection watch + Add a new web page change detection watch
- {{ render_nolabel_field(form.url, placeholder="https://...", required=true) }} - {{ render_nolabel_field(form.tags, value=active_tag.title if active_tag_uuid else '', placeholder="watch label / tag") }} {{ render_nolabel_field(form.watch_submit_button, title="Watch this URL!" ) }} {{ render_nolabel_field(form.edit_and_watch_submit_button, title="Edit first then Watch") }}
+
+ {{ render_field(form.tags, value=active_tag.title if active_tag_uuid else '', placeholder="Watch group / tag", class="transparent-field") }} +
{{ render_simple_field(form.processor) }}
@@ -38,7 +39,8 @@ document.addEventListener('DOMContentLoaded', function() {
Create a shareable link Tip: You can also add 'shared' watches. More info
- +
+
diff --git a/changedetectionio/static/styles/diff.css b/changedetectionio/static/styles/diff.css index 46bc0be4e..21228b53d 100644 --- a/changedetectionio/static/styles/diff.css +++ b/changedetectionio/static/styles/diff.css @@ -71,6 +71,7 @@ --color-text-watch-tag-list: rgba(231, 0, 105, 0.4); --color-background-new-watch-form: rgba(0, 0, 0, 0.05); --color-background-new-watch-input: var(--color-white); + --color-background-new-watch-input-transparent: rgba(255, 255, 255, 0.1); --color-text-new-watch-input: var(--color-text); --color-border-input: var(--color-grey-500); --color-shadow-input: var(--color-grey-400); @@ -97,6 +98,7 @@ html[data-darkmode="true"] { --color-background-gradient-second: #1e316c; --color-background-gradient-third: #4d2c64; --color-background-new-watch-input: var(--color-grey-100); + --color-background-new-watch-input-transparent: var(--color-grey-100); --color-text-new-watch-input: var(--color-text); --color-background-table-thead: var(--color-grey-200); --color-table-background: var(--color-grey-300); diff --git a/changedetectionio/static/styles/scss/parts/_variables.scss b/changedetectionio/static/styles/scss/parts/_variables.scss index aca4ed556..ea3145043 100644 --- a/changedetectionio/static/styles/scss/parts/_variables.scss +++ b/changedetectionio/static/styles/scss/parts/_variables.scss @@ -78,6 +78,7 @@ --color-text-watch-tag-list: rgba(231, 0, 105, 0.4); --color-background-new-watch-form: rgba(0, 0, 0, 0.05); --color-background-new-watch-input: var(--color-white); + --color-background-new-watch-input-transparent: rgba(255, 255, 255, 0.1); --color-text-new-watch-input: var(--color-text); --color-border-input: var(--color-grey-500); @@ -112,6 +113,7 @@ html[data-darkmode="true"] { --color-background-gradient-third: #4d2c64; --color-background-new-watch-input: var(--color-grey-100); + --color-background-new-watch-input-transparent: var(--color-grey-100); --color-text-new-watch-input: var(--color-text); --color-background-table-thead: var(--color-grey-200); --color-table-background: var(--color-grey-300); diff --git a/changedetectionio/static/styles/scss/styles.scss b/changedetectionio/static/styles/scss/styles.scss index 2e8c5be62..431a8f0a1 100644 --- a/changedetectionio/static/styles/scss/styles.scss +++ b/changedetectionio/static/styles/scss/styles.scss @@ -280,7 +280,7 @@ a.pure-button-selected { font-size: 65%; border-bottom-left-radius: initial; border-bottom-right-radius: initial; - + margin-right: 4px; &.active { background: var(--color-background-button-tag-active); font-weight: bold; @@ -373,11 +373,32 @@ label { } } +// Some field colouring for transperant field +.pure-form input[type=text].transparent-field { + background-color: var(--color-background-new-watch-input-transparent) !important; + color: var(--color-text-new-watch-input) !important; + border: 1px solid rgba(255, 255, 255, 0.2) !important; + box-shadow: none !important; + -webkit-box-shadow: none !important; + &::placeholder { + opacity: 0.5; + color: rgba(255, 255, 255, 0.7); + font-weight: lighter; + } +} + #new-watch-form { background: var(--color-background-new-watch-form); padding: 1em; border-radius: 10px; margin-bottom: 1em; + max-width: 100%; + + #url { + &::placeholder { + font-weight: bold; + } + } input { display: inline-block; @@ -398,12 +419,13 @@ label { font-weight: bold; } - #watch-add-wrapper-zone { + #watch-add-wrapper-zone { @media only screen and (min-width: 760px) { display: flex; gap: 0.3rem; flex-direction: row; + min-width: 70vw; } /* URL field grows always, other stay static in width */ > span { @@ -425,6 +447,22 @@ label { } } } + + #watch-group-tag { + font-size: 0.9rem; + padding: 0.3rem; + display: flex; + align-items: center; + gap: 0.5rem; + color: var(--color-white); + label, input { + margin: 0; + } + + input { + flex: 1; + } + } } @@ -1140,16 +1178,14 @@ ul { color: #fff; ul { padding: 0.3rem; - li { list-style: none; - font-size: 0.8rem; + font-size: 0.9rem; > * { display: inline-block; } } } - } .restock-label { diff --git a/changedetectionio/static/styles/styles.css b/changedetectionio/static/styles/styles.css index 4ccac7472..70e30edc2 100644 --- a/changedetectionio/static/styles/styles.css +++ b/changedetectionio/static/styles/styles.css @@ -322,6 +322,7 @@ ul#requests-extra_browsers { --color-text-watch-tag-list: rgba(231, 0, 105, 0.4); --color-background-new-watch-form: rgba(0, 0, 0, 0.05); --color-background-new-watch-input: var(--color-white); + --color-background-new-watch-input-transparent: rgba(255, 255, 255, 0.1); --color-text-new-watch-input: var(--color-text); --color-border-input: var(--color-grey-500); --color-shadow-input: var(--color-grey-400); @@ -348,6 +349,7 @@ html[data-darkmode="true"] { --color-background-gradient-second: #1e316c; --color-background-gradient-third: #4d2c64; --color-background-new-watch-input: var(--color-grey-100); + --color-background-new-watch-input-transparent: var(--color-grey-100); --color-text-new-watch-input: var(--color-text); --color-background-table-thead: var(--color-grey-200); --color-table-background: var(--color-grey-300); @@ -900,7 +902,8 @@ a.pure-button-selected { color: var(--color-text-button); font-size: 65%; border-bottom-left-radius: initial; - border-bottom-right-radius: initial; } + border-bottom-right-radius: initial; + margin-right: 4px; } .button-tag.active { background: var(--color-background-button-tag-active); font-weight: bold; } @@ -963,11 +966,25 @@ label:hover { #token-table.pure-table th { font-size: 80%; } +.pure-form input[type=text].transparent-field { + background-color: var(--color-background-new-watch-input-transparent) !important; + color: var(--color-text-new-watch-input) !important; + border: 1px solid rgba(255, 255, 255, 0.2) !important; + box-shadow: none !important; + -webkit-box-shadow: none !important; } + .pure-form input[type=text].transparent-field::placeholder { + opacity: 0.5; + color: rgba(255, 255, 255, 0.7); + font-weight: lighter; } + #new-watch-form { background: var(--color-background-new-watch-form); padding: 1em; border-radius: 10px; - margin-bottom: 1em; } + margin-bottom: 1em; + max-width: 100%; } + #new-watch-form #url::placeholder { + font-weight: bold; } #new-watch-form input { display: inline-block; margin-bottom: 5px; } @@ -985,7 +1002,8 @@ label:hover { #new-watch-form #watch-add-wrapper-zone { display: flex; gap: 0.3rem; - flex-direction: row; } } + flex-direction: row; + min-width: 70vw; } } #new-watch-form #watch-add-wrapper-zone > span { flex-grow: 0; } #new-watch-form #watch-add-wrapper-zone > span input { @@ -996,6 +1014,17 @@ label:hover { @media only screen and (max-width: 760px) { #new-watch-form #watch-add-wrapper-zone #url { width: 100%; } } + #new-watch-form #watch-group-tag { + font-size: 0.9rem; + padding: 0.3rem; + display: flex; + align-items: center; + gap: 0.5rem; + color: var(--color-white); } + #new-watch-form #watch-group-tag label, #new-watch-form #watch-group-tag input { + margin: 0; } + #new-watch-form #watch-group-tag input { + flex: 1; } #diff-col { padding-left: 40px; } @@ -1505,7 +1534,7 @@ ul { padding: 0.3rem; } #quick-watch-processor-type ul li { list-style: none; - font-size: 0.8rem; } + font-size: 0.9rem; } #quick-watch-processor-type ul li > * { display: inline-block; } diff --git a/changedetectionio/templates/_common_fields.html b/changedetectionio/templates/_common_fields.html index ebc27e089..0d4a4a1c2 100644 --- a/changedetectionio/templates/_common_fields.html +++ b/changedetectionio/templates/_common_fields.html @@ -74,7 +74,7 @@ {{ '{{watch_tag}}' }} - The watch label / tag + The watch group / tag {{ '{{preview_url}}' }}