summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
Diffstat (limited to 'themes')
-rw-r--r--themes/compact.css120
-rw-r--r--themes/compact_night.css120
-rw-r--r--themes/light.css120
-rw-r--r--themes/light/defines.less8
-rw-r--r--themes/light/dijit_basic.less11
-rw-r--r--themes/light/prefs.less115
-rw-r--r--themes/light/tt-rss.less14
-rw-r--r--themes/night.css120
-rw-r--r--themes/night_blue.css120
9 files changed, 642 insertions, 106 deletions
diff --git a/themes/compact.css b/themes/compact.css
index 16058309f..5a3a00cfe 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -763,6 +763,10 @@ body.ttrss_main #header i.log-alert {
color: #ddba1c;
cursor: pointer;
}
+body.ttrss_main #header #updates-available {
+ color: #69C671;
+ padding-right: 4px;
+}
body.ttrss_main #header i {
margin: 0 4px;
}
@@ -984,6 +988,10 @@ body.ttrss_main .panel-scrollable {
overflow: auto;
height: 200px;
}
+body.ttrss_main .panel-scrollable-400px {
+ overflow: auto;
+ height: 400px;
+}
body.ttrss_main ul.list li {
padding: 2px;
}
@@ -1030,6 +1038,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left {
float: left;
}
+body.ttrss_main .pre-wrap,
+body.ttrss_utility .pre-wrap {
+ white-space: pre-wrap;
+}
body.ttrss_main .text-error,
body.ttrss_utility .text-error {
color: #b94a48;
@@ -1415,13 +1427,6 @@ body.ttrss_prefs {
background-color: #f5f5f5;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
- /*.dijitContentPane {
- h1:first-of-type,
- h2:first-of-type,
- h3:first-of-type {
- margin-top: 0px;
- }
- }*/
}
body.ttrss_prefs h1,
body.ttrss_prefs h2,
@@ -1431,6 +1436,11 @@ body.ttrss_prefs h4 {
font-weight: 600;
color: #555;
}
+body.ttrss_prefs .dijitContentPane > h1:first-of-type,
+body.ttrss_prefs .dijitContentPane > h2:first-of-type,
+body.ttrss_prefs .dijitContentPane > h3:first-of-type {
+ margin-top: 0;
+}
body.ttrss_prefs #footer,
body.ttrss_prefs #header {
padding: 8px;
@@ -1494,23 +1504,95 @@ body.ttrss_prefs fieldset.prefs .help-text-bottom {
margin-top: 10px;
}
body.ttrss_prefs fieldset.plugin label.description {
- width: 600px;
+ width: 550px;
margin-right: 150px;
display: inline-block;
}
body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
margin-right: 10px;
}
-body.ttrss_prefs .users-list td {
+body.ttrss_prefs table th {
+ text-align: left;
+}
+body.ttrss_prefs table td.checkbox {
+ text-align: center;
+ width: 32px;
+}
+body.ttrss_prefs ul.prefs-plugin-list {
+ margin: 0;
+ padding: 0;
+}
+body.ttrss_prefs ul.prefs-plugin-list li {
+ display: flex;
+ align-items: center;
+ border-bottom: #ddd 1px solid;
+ line-height: 30px;
+}
+body.ttrss_prefs ul.prefs-plugin-list li.text-center {
+ border: 0;
+ display: block;
+}
+body.ttrss_prefs ul.prefs-plugin-list li > * {
+ padding: 8px;
+}
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox {
+ display: flex;
+ align-items: center;
+ min-width: 300px;
cursor: pointer;
}
-body.ttrss_prefs .event-log tr td {
- font-size: 10px;
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system {
+ cursor: auto;
+}
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox .name {
+ flex-grow: 2;
+ display: inline-block;
+ text-align: right;
+ font-weight: bold;
+}
+body.ttrss_prefs ul.prefs-plugin-list li .actions {
+ flex-grow: 2;
+ text-align: right;
+}
+body.ttrss_prefs ul.prefs-plugin-list li .version {
+ min-width: 200px;
+ text-align: right;
+}
+body.ttrss_prefs .plugin-installer-list li,
+body.ttrss_prefs .plugin-updater-list li {
+ border-bottom: #ddd 1px solid;
+}
+body.ttrss_prefs .plugin-installer-list li > *,
+body.ttrss_prefs .plugin-updater-list li > * {
+ padding: 8px 4px;
+}
+body.ttrss_prefs .plugin-installer-list li > pre,
+body.ttrss_prefs .plugin-updater-list li > pre {
+ margin: 0;
+}
+body.ttrss_prefs .plugin-installer-list li h3,
+body.ttrss_prefs .plugin-updater-list li h3 {
+ margin: 0;
+}
+body.ttrss_prefs .plugin-installer-list li.text-center,
+body.ttrss_prefs .plugin-updater-list li.text-center {
+ border: 0;
+}
+body.ttrss_prefs .plugin-installer-list .plugin-installed > *,
+body.ttrss_prefs .plugin-updater-list .plugin-installed > * {
+ opacity: 0.5;
+}
+body.ttrss_prefs .users-list td,
+body.ttrss_prefs .event-log td,
+body.ttrss_prefs .users-list th,
+body.ttrss_prefs .event-log th {
+ cursor: pointer;
padding: 8px;
+ border-bottom: #ddd 1px solid;
+}
+body.ttrss_prefs .event-log tr td,
+body.ttrss_prefs .event-log tr th {
vertical-align: top;
- border-width: 0 0 1px 0;
- border-style: solid;
- border-color: #ddd;
}
body.ttrss_prefs .event-log tr .errno {
font-style: italic;
@@ -1707,9 +1789,13 @@ body.ttrss_utility.share_popup .content {
font-size: 13px;
padding: 0px;
}
-.flat .dijitToolbar .dijitTextBox .dijitInputInner {
+.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner {
line-height: 10px;
}
+.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitPlaceHolder {
+ line-height: 15px;
+ margin-left: 0;
+}
.flat .dijitToolbar label {
position: relative;
top: 2px;
@@ -1813,9 +1899,9 @@ body.ttrss_utility.share_popup .content {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
- src: url(../lib/iconfont/MaterialIcons-Regular.eot);
+ src: url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.eot);
/* For IE6-8 */
- src: local('Material Icons'), local('MaterialIcons-Regular'), url(../lib/iconfont/MaterialIcons-Regular.woff2) format('woff2'), url(../lib/iconfont/MaterialIcons-Regular.woff) format('woff'), url(../lib/iconfont/MaterialIcons-Regular.ttf) format('truetype');
+ src: local('Material Icons'), local('MaterialIcons-Regular'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.woff2) format('woff2'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.woff) format('woff'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.ttf) format('truetype');
}
.material-icons {
font-family: 'Material Icons';
diff --git a/themes/compact_night.css b/themes/compact_night.css
index f1894f4de..c9f9b12a8 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -763,6 +763,10 @@ body.ttrss_main #header i.log-alert {
color: #ddba1c;
cursor: pointer;
}
+body.ttrss_main #header #updates-available {
+ color: #69C671;
+ padding-right: 4px;
+}
body.ttrss_main #header i {
margin: 0 4px;
}
@@ -984,6 +988,10 @@ body.ttrss_main .panel-scrollable {
overflow: auto;
height: 200px;
}
+body.ttrss_main .panel-scrollable-400px {
+ overflow: auto;
+ height: 400px;
+}
body.ttrss_main ul.list li {
padding: 2px;
}
@@ -1030,6 +1038,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left {
float: left;
}
+body.ttrss_main .pre-wrap,
+body.ttrss_utility .pre-wrap {
+ white-space: pre-wrap;
+}
body.ttrss_main .text-error,
body.ttrss_utility .text-error {
color: #b94a48;
@@ -1415,13 +1427,6 @@ body.ttrss_prefs {
background-color: #222;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
- /*.dijitContentPane {
- h1:first-of-type,
- h2:first-of-type,
- h3:first-of-type {
- margin-top: 0px;
- }
- }*/
}
body.ttrss_prefs h1,
body.ttrss_prefs h2,
@@ -1431,6 +1436,11 @@ body.ttrss_prefs h4 {
font-weight: 600;
color: #ccc;
}
+body.ttrss_prefs .dijitContentPane > h1:first-of-type,
+body.ttrss_prefs .dijitContentPane > h2:first-of-type,
+body.ttrss_prefs .dijitContentPane > h3:first-of-type {
+ margin-top: 0;
+}
body.ttrss_prefs #footer,
body.ttrss_prefs #header {
padding: 8px;
@@ -1494,23 +1504,95 @@ body.ttrss_prefs fieldset.prefs .help-text-bottom {
margin-top: 10px;
}
body.ttrss_prefs fieldset.plugin label.description {
- width: 600px;
+ width: 550px;
margin-right: 150px;
display: inline-block;
}
body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
margin-right: 10px;
}
-body.ttrss_prefs .users-list td {
+body.ttrss_prefs table th {
+ text-align: left;
+}
+body.ttrss_prefs table td.checkbox {
+ text-align: center;
+ width: 32px;
+}
+body.ttrss_prefs ul.prefs-plugin-list {
+ margin: 0;
+ padding: 0;
+}
+body.ttrss_prefs ul.prefs-plugin-list li {
+ display: flex;
+ align-items: center;
+ border-bottom: #222 1px solid;
+ line-height: 30px;
+}
+body.ttrss_prefs ul.prefs-plugin-list li.text-center {
+ border: 0;
+ display: block;
+}
+body.ttrss_prefs ul.prefs-plugin-list li > * {
+ padding: 8px;
+}
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox {
+ display: flex;
+ align-items: center;
+ min-width: 300px;
cursor: pointer;
}
-body.ttrss_prefs .event-log tr td {
- font-size: 10px;
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system {
+ cursor: auto;
+}
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox .name {
+ flex-grow: 2;
+ display: inline-block;
+ text-align: right;
+ font-weight: bold;
+}
+body.ttrss_prefs ul.prefs-plugin-list li .actions {
+ flex-grow: 2;
+ text-align: right;
+}
+body.ttrss_prefs ul.prefs-plugin-list li .version {
+ min-width: 200px;
+ text-align: right;
+}
+body.ttrss_prefs .plugin-installer-list li,
+body.ttrss_prefs .plugin-updater-list li {
+ border-bottom: #222 1px solid;
+}
+body.ttrss_prefs .plugin-installer-list li > *,
+body.ttrss_prefs .plugin-updater-list li > * {
+ padding: 8px 4px;
+}
+body.ttrss_prefs .plugin-installer-list li > pre,
+body.ttrss_prefs .plugin-updater-list li > pre {
+ margin: 0;
+}
+body.ttrss_prefs .plugin-installer-list li h3,
+body.ttrss_prefs .plugin-updater-list li h3 {
+ margin: 0;
+}
+body.ttrss_prefs .plugin-installer-list li.text-center,
+body.ttrss_prefs .plugin-updater-list li.text-center {
+ border: 0;
+}
+body.ttrss_prefs .plugin-installer-list .plugin-installed > *,
+body.ttrss_prefs .plugin-updater-list .plugin-installed > * {
+ opacity: 0.5;
+}
+body.ttrss_prefs .users-list td,
+body.ttrss_prefs .event-log td,
+body.ttrss_prefs .users-list th,
+body.ttrss_prefs .event-log th {
+ cursor: pointer;
padding: 8px;
+ border-bottom: #222 1px solid;
+}
+body.ttrss_prefs .event-log tr td,
+body.ttrss_prefs .event-log tr th {
vertical-align: top;
- border-width: 0 0 1px 0;
- border-style: solid;
- border-color: #222;
}
body.ttrss_prefs .event-log tr .errno {
font-style: italic;
@@ -1609,9 +1691,13 @@ body.ttrss_utility fieldset > label.checkbox {
font-size: 13px;
padding: 0px;
}
-.flat .dijitToolbar .dijitTextBox .dijitInputInner {
+.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner {
line-height: 10px;
}
+.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitPlaceHolder {
+ line-height: 15px;
+ margin-left: 0;
+}
.flat .dijitToolbar label {
position: relative;
top: 2px;
@@ -1715,9 +1801,9 @@ body.ttrss_utility fieldset > label.checkbox {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
- src: url(../lib/iconfont/MaterialIcons-Regular.eot);
+ src: url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.eot);
/* For IE6-8 */
- src: local('Material Icons'), local('MaterialIcons-Regular'), url(../lib/iconfont/MaterialIcons-Regular.woff2) format('woff2'), url(../lib/iconfont/MaterialIcons-Regular.woff) format('woff'), url(../lib/iconfont/MaterialIcons-Regular.ttf) format('truetype');
+ src: local('Material Icons'), local('MaterialIcons-Regular'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.woff2) format('woff2'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.woff) format('woff'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.ttf) format('truetype');
}
.material-icons {
font-family: 'Material Icons';
diff --git a/themes/light.css b/themes/light.css
index c014858ef..9a4ac98c0 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -763,6 +763,10 @@ body.ttrss_main #header i.log-alert {
color: #ddba1c;
cursor: pointer;
}
+body.ttrss_main #header #updates-available {
+ color: #69C671;
+ padding-right: 4px;
+}
body.ttrss_main #header i {
margin: 0 4px;
}
@@ -984,6 +988,10 @@ body.ttrss_main .panel-scrollable {
overflow: auto;
height: 200px;
}
+body.ttrss_main .panel-scrollable-400px {
+ overflow: auto;
+ height: 400px;
+}
body.ttrss_main ul.list li {
padding: 2px;
}
@@ -1030,6 +1038,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left {
float: left;
}
+body.ttrss_main .pre-wrap,
+body.ttrss_utility .pre-wrap {
+ white-space: pre-wrap;
+}
body.ttrss_main .text-error,
body.ttrss_utility .text-error {
color: #b94a48;
@@ -1415,13 +1427,6 @@ body.ttrss_prefs {
background-color: #f5f5f5;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
- /*.dijitContentPane {
- h1:first-of-type,
- h2:first-of-type,
- h3:first-of-type {
- margin-top: 0px;
- }
- }*/
}
body.ttrss_prefs h1,
body.ttrss_prefs h2,
@@ -1431,6 +1436,11 @@ body.ttrss_prefs h4 {
font-weight: 600;
color: #555;
}
+body.ttrss_prefs .dijitContentPane > h1:first-of-type,
+body.ttrss_prefs .dijitContentPane > h2:first-of-type,
+body.ttrss_prefs .dijitContentPane > h3:first-of-type {
+ margin-top: 0;
+}
body.ttrss_prefs #footer,
body.ttrss_prefs #header {
padding: 8px;
@@ -1494,23 +1504,95 @@ body.ttrss_prefs fieldset.prefs .help-text-bottom {
margin-top: 10px;
}
body.ttrss_prefs fieldset.plugin label.description {
- width: 600px;
+ width: 550px;
margin-right: 150px;
display: inline-block;
}
body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
margin-right: 10px;
}
-body.ttrss_prefs .users-list td {
+body.ttrss_prefs table th {
+ text-align: left;
+}
+body.ttrss_prefs table td.checkbox {
+ text-align: center;
+ width: 32px;
+}
+body.ttrss_prefs ul.prefs-plugin-list {
+ margin: 0;
+ padding: 0;
+}
+body.ttrss_prefs ul.prefs-plugin-list li {
+ display: flex;
+ align-items: center;
+ border-bottom: #ddd 1px solid;
+ line-height: 30px;
+}
+body.ttrss_prefs ul.prefs-plugin-list li.text-center {
+ border: 0;
+ display: block;
+}
+body.ttrss_prefs ul.prefs-plugin-list li > * {
+ padding: 8px;
+}
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox {
+ display: flex;
+ align-items: center;
+ min-width: 300px;
cursor: pointer;
}
-body.ttrss_prefs .event-log tr td {
- font-size: 10px;
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system {
+ cursor: auto;
+}
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox .name {
+ flex-grow: 2;
+ display: inline-block;
+ text-align: right;
+ font-weight: bold;
+}
+body.ttrss_prefs ul.prefs-plugin-list li .actions {
+ flex-grow: 2;
+ text-align: right;
+}
+body.ttrss_prefs ul.prefs-plugin-list li .version {
+ min-width: 200px;
+ text-align: right;
+}
+body.ttrss_prefs .plugin-installer-list li,
+body.ttrss_prefs .plugin-updater-list li {
+ border-bottom: #ddd 1px solid;
+}
+body.ttrss_prefs .plugin-installer-list li > *,
+body.ttrss_prefs .plugin-updater-list li > * {
+ padding: 8px 4px;
+}
+body.ttrss_prefs .plugin-installer-list li > pre,
+body.ttrss_prefs .plugin-updater-list li > pre {
+ margin: 0;
+}
+body.ttrss_prefs .plugin-installer-list li h3,
+body.ttrss_prefs .plugin-updater-list li h3 {
+ margin: 0;
+}
+body.ttrss_prefs .plugin-installer-list li.text-center,
+body.ttrss_prefs .plugin-updater-list li.text-center {
+ border: 0;
+}
+body.ttrss_prefs .plugin-installer-list .plugin-installed > *,
+body.ttrss_prefs .plugin-updater-list .plugin-installed > * {
+ opacity: 0.5;
+}
+body.ttrss_prefs .users-list td,
+body.ttrss_prefs .event-log td,
+body.ttrss_prefs .users-list th,
+body.ttrss_prefs .event-log th {
+ cursor: pointer;
padding: 8px;
+ border-bottom: #ddd 1px solid;
+}
+body.ttrss_prefs .event-log tr td,
+body.ttrss_prefs .event-log tr th {
vertical-align: top;
- border-width: 0 0 1px 0;
- border-style: solid;
- border-color: #ddd;
}
body.ttrss_prefs .event-log tr .errno {
font-style: italic;
@@ -1707,9 +1789,13 @@ body.ttrss_utility.share_popup .content {
font-size: 13px;
padding: 0px;
}
-.flat .dijitToolbar .dijitTextBox .dijitInputInner {
+.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner {
line-height: 10px;
}
+.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitPlaceHolder {
+ line-height: 15px;
+ margin-left: 0;
+}
.flat .dijitToolbar label {
position: relative;
top: 2px;
@@ -1813,9 +1899,9 @@ body.ttrss_utility.share_popup .content {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
- src: url(../lib/iconfont/MaterialIcons-Regular.eot);
+ src: url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.eot);
/* For IE6-8 */
- src: local('Material Icons'), local('MaterialIcons-Regular'), url(../lib/iconfont/MaterialIcons-Regular.woff2) format('woff2'), url(../lib/iconfont/MaterialIcons-Regular.woff) format('woff'), url(../lib/iconfont/MaterialIcons-Regular.ttf) format('truetype');
+ src: local('Material Icons'), local('MaterialIcons-Regular'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.woff2) format('woff2'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.woff) format('woff'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.ttf) format('truetype');
}
.material-icons {
font-family: 'Material Icons';
diff --git a/themes/light/defines.less b/themes/light/defines.less
index 7de7a7686..dd3f62251 100644
--- a/themes/light/defines.less
+++ b/themes/light/defines.less
@@ -40,12 +40,12 @@ body.ttrss_prefs,
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
- src: url(../lib/iconfont/MaterialIcons-Regular.eot); /* For IE6-8 */
+ src: url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */
src: local('Material Icons'),
local('MaterialIcons-Regular'),
- url(../lib/iconfont/MaterialIcons-Regular.woff2) format('woff2'),
- url(../lib/iconfont/MaterialIcons-Regular.woff) format('woff'),
- url(../lib/iconfont/MaterialIcons-Regular.ttf) format('truetype');
+ url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.woff2) format('woff2'),
+ url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.woff) format('woff'),
+ url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.ttf) format('truetype');
}
.material-icons {
diff --git a/themes/light/dijit_basic.less b/themes/light/dijit_basic.less
index 0582ddc5c..da1138986 100644
--- a/themes/light/dijit_basic.less
+++ b/themes/light/dijit_basic.less
@@ -41,8 +41,15 @@
font-size: 13px;
padding: 0px;
- .dijitTextBox .dijitInputInner {
- line-height : 10px;
+ .dijitTextBox .dijitInputContainer {
+ .dijitInputInner {
+ line-height : 10px;
+ }
+
+ .dijitPlaceHolder {
+ line-height : 15px;
+ margin-left : 0;
+ }
}
label {
diff --git a/themes/light/prefs.less b/themes/light/prefs.less
index 510388391..15345bcb4 100644
--- a/themes/light/prefs.less
+++ b/themes/light/prefs.less
@@ -9,13 +9,13 @@ body.ttrss_prefs {
color : @default-text;
}
- /*.dijitContentPane {
- h1:first-of-type,
- h2:first-of-type,
- h3:first-of-type {
- margin-top: 0px;
+ .dijitContentPane {
+ > h1:first-of-type,
+ > h2:first-of-type,
+ > h3:first-of-type {
+ margin-top: 0;
}
- }*/
+ }
#footer, #header {
padding : 8px;
@@ -96,7 +96,7 @@ body.ttrss_prefs {
fieldset.plugin {
label.description {
- width : 600px;
+ width : 550px;
margin-right : 150px;
display : inline-block;
@@ -106,21 +106,106 @@ body.ttrss_prefs {
}
}
- .users-list {
- td {
+ table {
+ th {
+ text-align : left;
+ }
+
+ td.checkbox {
+ text-align : center;
+ width : 32px;
+ }
+
+ }
+
+ ul.prefs-plugin-list {
+ margin : 0;
+ padding : 0;
+
+ li {
+ display : flex;
+ align-items : center;
+ border-bottom: @border-default 1px solid;
+ line-height : 30px;
+
+ &.text-center {
+ border : 0;
+ display : block;
+ }
+
+ > * {
+ padding : 8px;
+ }
+
+ label.checkbox {
+ display : flex;
+ align-items : center;
+ min-width : 300px;
+ cursor : pointer;
+
+ &.system {
+ cursor : auto;
+ }
+
+ .name {
+ flex-grow: 2;
+ display: inline-block;
+ text-align: right;
+ font-weight : bold;
+ }
+ }
+
+ .actions {
+ flex-grow : 2;
+ text-align: right;
+ }
+
+ .version {
+ min-width: 200px;
+ text-align: right;
+ }
+ }
+ }
+
+ .plugin-installer-list, .plugin-updater-list {
+ li {
+ border-bottom: @border-default 1px solid;
+
+ > * {
+ padding : 8px 4px;
+ }
+
+ > pre {
+ margin : 0;
+ }
+
+ h3 {
+ margin : 0;
+ }
+
+ &.text-center {
+ border : 0;
+ }
+ }
+
+ .plugin-installed > * {
+ opacity : 0.5;
+ }
+ }
+
+ .users-list,
+ .event-log {
+ td, th {
cursor : pointer;
+ padding : 8px;
+ border-bottom: @border-default 1px solid;
}
}
.event-log {
tr {
- td {
- font-size: 10px;
- padding : 8px;
+ td, th {
vertical-align : top;
- border-width : 0 0 1px 0;
- border-style : solid;
- border-color : @border-default;
}
.errno {
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index 35eec3e48..36b73b4f4 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -888,6 +888,11 @@ body.ttrss_main {
cursor : pointer;
}
+ #updates-available {
+ color : @color-checked;
+ padding-right : 4px;
+ }
+
i {
margin : 0 4px;
}
@@ -1166,6 +1171,11 @@ body.ttrss_main {
height : 200px;
}
+ .panel-scrollable-400px {
+ overflow : auto;
+ height : 400px;
+ }
+
ul.list li {
padding : 2px;
}
@@ -1224,6 +1234,10 @@ body.ttrss_main, body.ttrss_utility {
float : left;
}
+ .pre-wrap {
+ white-space : pre-wrap;
+ }
+
.text-error {
color: #b94a48;
}
diff --git a/themes/night.css b/themes/night.css
index 1e397ee74..22eb17e9f 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -764,6 +764,10 @@ body.ttrss_main #header i.log-alert {
color: #ddba1c;
cursor: pointer;
}
+body.ttrss_main #header #updates-available {
+ color: #69C671;
+ padding-right: 4px;
+}
body.ttrss_main #header i {
margin: 0 4px;
}
@@ -985,6 +989,10 @@ body.ttrss_main .panel-scrollable {
overflow: auto;
height: 200px;
}
+body.ttrss_main .panel-scrollable-400px {
+ overflow: auto;
+ height: 400px;
+}
body.ttrss_main ul.list li {
padding: 2px;
}
@@ -1031,6 +1039,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left {
float: left;
}
+body.ttrss_main .pre-wrap,
+body.ttrss_utility .pre-wrap {
+ white-space: pre-wrap;
+}
body.ttrss_main .text-error,
body.ttrss_utility .text-error {
color: #b94a48;
@@ -1416,13 +1428,6 @@ body.ttrss_prefs {
background-color: #222;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
- /*.dijitContentPane {
- h1:first-of-type,
- h2:first-of-type,
- h3:first-of-type {
- margin-top: 0px;
- }
- }*/
}
body.ttrss_prefs h1,
body.ttrss_prefs h2,
@@ -1432,6 +1437,11 @@ body.ttrss_prefs h4 {
font-weight: 600;
color: #ccc;
}
+body.ttrss_prefs .dijitContentPane > h1:first-of-type,
+body.ttrss_prefs .dijitContentPane > h2:first-of-type,
+body.ttrss_prefs .dijitContentPane > h3:first-of-type {
+ margin-top: 0;
+}
body.ttrss_prefs #footer,
body.ttrss_prefs #header {
padding: 8px;
@@ -1495,23 +1505,95 @@ body.ttrss_prefs fieldset.prefs .help-text-bottom {
margin-top: 10px;
}
body.ttrss_prefs fieldset.plugin label.description {
- width: 600px;
+ width: 550px;
margin-right: 150px;
display: inline-block;
}
body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
margin-right: 10px;
}
-body.ttrss_prefs .users-list td {
+body.ttrss_prefs table th {
+ text-align: left;
+}
+body.ttrss_prefs table td.checkbox {
+ text-align: center;
+ width: 32px;
+}
+body.ttrss_prefs ul.prefs-plugin-list {
+ margin: 0;
+ padding: 0;
+}
+body.ttrss_prefs ul.prefs-plugin-list li {
+ display: flex;
+ align-items: center;
+ border-bottom: #222 1px solid;
+ line-height: 30px;
+}
+body.ttrss_prefs ul.prefs-plugin-list li.text-center {
+ border: 0;
+ display: block;
+}
+body.ttrss_prefs ul.prefs-plugin-list li > * {
+ padding: 8px;
+}
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox {
+ display: flex;
+ align-items: center;
+ min-width: 300px;
cursor: pointer;
}
-body.ttrss_prefs .event-log tr td {
- font-size: 10px;
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system {
+ cursor: auto;
+}
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox .name {
+ flex-grow: 2;
+ display: inline-block;
+ text-align: right;
+ font-weight: bold;
+}
+body.ttrss_prefs ul.prefs-plugin-list li .actions {
+ flex-grow: 2;
+ text-align: right;
+}
+body.ttrss_prefs ul.prefs-plugin-list li .version {
+ min-width: 200px;
+ text-align: right;
+}
+body.ttrss_prefs .plugin-installer-list li,
+body.ttrss_prefs .plugin-updater-list li {
+ border-bottom: #222 1px solid;
+}
+body.ttrss_prefs .plugin-installer-list li > *,
+body.ttrss_prefs .plugin-updater-list li > * {
+ padding: 8px 4px;
+}
+body.ttrss_prefs .plugin-installer-list li > pre,
+body.ttrss_prefs .plugin-updater-list li > pre {
+ margin: 0;
+}
+body.ttrss_prefs .plugin-installer-list li h3,
+body.ttrss_prefs .plugin-updater-list li h3 {
+ margin: 0;
+}
+body.ttrss_prefs .plugin-installer-list li.text-center,
+body.ttrss_prefs .plugin-updater-list li.text-center {
+ border: 0;
+}
+body.ttrss_prefs .plugin-installer-list .plugin-installed > *,
+body.ttrss_prefs .plugin-updater-list .plugin-installed > * {
+ opacity: 0.5;
+}
+body.ttrss_prefs .users-list td,
+body.ttrss_prefs .event-log td,
+body.ttrss_prefs .users-list th,
+body.ttrss_prefs .event-log th {
+ cursor: pointer;
padding: 8px;
+ border-bottom: #222 1px solid;
+}
+body.ttrss_prefs .event-log tr td,
+body.ttrss_prefs .event-log tr th {
vertical-align: top;
- border-width: 0 0 1px 0;
- border-style: solid;
- border-color: #222;
}
body.ttrss_prefs .event-log tr .errno {
font-style: italic;
@@ -1610,9 +1692,13 @@ body.ttrss_utility fieldset > label.checkbox {
font-size: 13px;
padding: 0px;
}
-.flat .dijitToolbar .dijitTextBox .dijitInputInner {
+.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner {
line-height: 10px;
}
+.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitPlaceHolder {
+ line-height: 15px;
+ margin-left: 0;
+}
.flat .dijitToolbar label {
position: relative;
top: 2px;
@@ -1716,9 +1802,9 @@ body.ttrss_utility fieldset > label.checkbox {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
- src: url(../lib/iconfont/MaterialIcons-Regular.eot);
+ src: url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.eot);
/* For IE6-8 */
- src: local('Material Icons'), local('MaterialIcons-Regular'), url(../lib/iconfont/MaterialIcons-Regular.woff2) format('woff2'), url(../lib/iconfont/MaterialIcons-Regular.woff) format('woff'), url(../lib/iconfont/MaterialIcons-Regular.ttf) format('truetype');
+ src: local('Material Icons'), local('MaterialIcons-Regular'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.woff2) format('woff2'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.woff) format('woff'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.ttf) format('truetype');
}
.material-icons {
font-family: 'Material Icons';
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 361cd4fbf..8a3d7f8a5 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -764,6 +764,10 @@ body.ttrss_main #header i.log-alert {
color: #ddba1c;
cursor: pointer;
}
+body.ttrss_main #header #updates-available {
+ color: #69C671;
+ padding-right: 4px;
+}
body.ttrss_main #header i {
margin: 0 4px;
}
@@ -985,6 +989,10 @@ body.ttrss_main .panel-scrollable {
overflow: auto;
height: 200px;
}
+body.ttrss_main .panel-scrollable-400px {
+ overflow: auto;
+ height: 400px;
+}
body.ttrss_main ul.list li {
padding: 2px;
}
@@ -1031,6 +1039,10 @@ body.ttrss_main .pull-left,
body.ttrss_utility .pull-left {
float: left;
}
+body.ttrss_main .pre-wrap,
+body.ttrss_utility .pre-wrap {
+ white-space: pre-wrap;
+}
body.ttrss_main .text-error,
body.ttrss_utility .text-error {
color: #b94a48;
@@ -1416,13 +1428,6 @@ body.ttrss_prefs {
background-color: #222;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
- /*.dijitContentPane {
- h1:first-of-type,
- h2:first-of-type,
- h3:first-of-type {
- margin-top: 0px;
- }
- }*/
}
body.ttrss_prefs h1,
body.ttrss_prefs h2,
@@ -1432,6 +1437,11 @@ body.ttrss_prefs h4 {
font-weight: 600;
color: #ccc;
}
+body.ttrss_prefs .dijitContentPane > h1:first-of-type,
+body.ttrss_prefs .dijitContentPane > h2:first-of-type,
+body.ttrss_prefs .dijitContentPane > h3:first-of-type {
+ margin-top: 0;
+}
body.ttrss_prefs #footer,
body.ttrss_prefs #header {
padding: 8px;
@@ -1495,23 +1505,95 @@ body.ttrss_prefs fieldset.prefs .help-text-bottom {
margin-top: 10px;
}
body.ttrss_prefs fieldset.plugin label.description {
- width: 600px;
+ width: 550px;
margin-right: 150px;
display: inline-block;
}
body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
margin-right: 10px;
}
-body.ttrss_prefs .users-list td {
+body.ttrss_prefs table th {
+ text-align: left;
+}
+body.ttrss_prefs table td.checkbox {
+ text-align: center;
+ width: 32px;
+}
+body.ttrss_prefs ul.prefs-plugin-list {
+ margin: 0;
+ padding: 0;
+}
+body.ttrss_prefs ul.prefs-plugin-list li {
+ display: flex;
+ align-items: center;
+ border-bottom: #222 1px solid;
+ line-height: 30px;
+}
+body.ttrss_prefs ul.prefs-plugin-list li.text-center {
+ border: 0;
+ display: block;
+}
+body.ttrss_prefs ul.prefs-plugin-list li > * {
+ padding: 8px;
+}
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox {
+ display: flex;
+ align-items: center;
+ min-width: 300px;
cursor: pointer;
}
-body.ttrss_prefs .event-log tr td {
- font-size: 10px;
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system {
+ cursor: auto;
+}
+body.ttrss_prefs ul.prefs-plugin-list li label.checkbox .name {
+ flex-grow: 2;
+ display: inline-block;
+ text-align: right;
+ font-weight: bold;
+}
+body.ttrss_prefs ul.prefs-plugin-list li .actions {
+ flex-grow: 2;
+ text-align: right;
+}
+body.ttrss_prefs ul.prefs-plugin-list li .version {
+ min-width: 200px;
+ text-align: right;
+}
+body.ttrss_prefs .plugin-installer-list li,
+body.ttrss_prefs .plugin-updater-list li {
+ border-bottom: #222 1px solid;
+}
+body.ttrss_prefs .plugin-installer-list li > *,
+body.ttrss_prefs .plugin-updater-list li > * {
+ padding: 8px 4px;
+}
+body.ttrss_prefs .plugin-installer-list li > pre,
+body.ttrss_prefs .plugin-updater-list li > pre {
+ margin: 0;
+}
+body.ttrss_prefs .plugin-installer-list li h3,
+body.ttrss_prefs .plugin-updater-list li h3 {
+ margin: 0;
+}
+body.ttrss_prefs .plugin-installer-list li.text-center,
+body.ttrss_prefs .plugin-updater-list li.text-center {
+ border: 0;
+}
+body.ttrss_prefs .plugin-installer-list .plugin-installed > *,
+body.ttrss_prefs .plugin-updater-list .plugin-installed > * {
+ opacity: 0.5;
+}
+body.ttrss_prefs .users-list td,
+body.ttrss_prefs .event-log td,
+body.ttrss_prefs .users-list th,
+body.ttrss_prefs .event-log th {
+ cursor: pointer;
padding: 8px;
+ border-bottom: #222 1px solid;
+}
+body.ttrss_prefs .event-log tr td,
+body.ttrss_prefs .event-log tr th {
vertical-align: top;
- border-width: 0 0 1px 0;
- border-style: solid;
- border-color: #222;
}
body.ttrss_prefs .event-log tr .errno {
font-style: italic;
@@ -1610,9 +1692,13 @@ body.ttrss_utility fieldset > label.checkbox {
font-size: 13px;
padding: 0px;
}
-.flat .dijitToolbar .dijitTextBox .dijitInputInner {
+.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner {
line-height: 10px;
}
+.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitPlaceHolder {
+ line-height: 15px;
+ margin-left: 0;
+}
.flat .dijitToolbar label {
position: relative;
top: 2px;
@@ -1716,9 +1802,9 @@ body.ttrss_utility fieldset > label.checkbox {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
- src: url(../lib/iconfont/MaterialIcons-Regular.eot);
+ src: url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.eot);
/* For IE6-8 */
- src: local('Material Icons'), local('MaterialIcons-Regular'), url(../lib/iconfont/MaterialIcons-Regular.woff2) format('woff2'), url(../lib/iconfont/MaterialIcons-Regular.woff) format('woff'), url(../lib/iconfont/MaterialIcons-Regular.ttf) format('truetype');
+ src: local('Material Icons'), local('MaterialIcons-Regular'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.woff2) format('woff2'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.woff) format('woff'), url(../vendor/mervick/material-design-icons/fonts/MaterialIcons-Regular.ttf) format('truetype');
}
.material-icons {
font-family: 'Material Icons';