From 68ecf52594e76f3f5ac40846359fb774cd366989 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 6 Mar 2021 20:03:36 +0300 Subject: [PATCH] some small layout fixes, remove a few inline styles --- classes/pref/prefs.php | 2 +- classes/pref/system.php | 12 ++++---- classes/pref/users.php | 25 +++++++++------- js/CommonDialogs.js | 2 +- js/PrefFeedTree.js | 2 +- js/PrefHelpers.js | 25 ++++++++-------- themes/compact.css | 54 +++++++++++++++++++++++++++------- themes/compact_night.css | 54 +++++++++++++++++++++++++++------- themes/light.css | 54 +++++++++++++++++++++++++++------- themes/light/prefs.less | 62 +++++++++++++++++++++++++++++++--------- themes/night.css | 54 +++++++++++++++++++++++++++------- themes/night_blue.css | 54 +++++++++++++++++++++++++++------- 12 files changed, 298 insertions(+), 102 deletions(-) diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 7e83a6e64..ea9e6a967 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -878,7 +878,7 @@ class Pref_Prefs extends Handler_Protected { ?> --> diff --git a/classes/pref/system.php b/classes/pref/system.php index 3456cd51f..0ccbdfea1 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -117,12 +117,12 @@ class Pref_System extends Handler_Administrative { - - - - - - + + + + + + - - - - - - - + + + + + + + - - + - - + +
+ person + person + +
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js index b9b053a5a..15c2021b6 100644 --- a/js/CommonDialogs.js +++ b/js/CommonDialogs.js @@ -248,7 +248,7 @@ const CommonDialogs = { ${reply.map((row) => ` - + diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js index 0e89e1978..013c01262 100644 --- a/js/PrefFeedTree.js +++ b/js/PrefFeedTree.js @@ -513,7 +513,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
${reply.map((row) => ` -
+ diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js index 296028f44..eed55f229 100644 --- a/js/PrefHelpers.js +++ b/js/PrefHelpers.js @@ -183,7 +183,7 @@ const Helpers = { ${reply.map((profile) => ` -
+ ${App.FormFields.checkbox_tag("", false, "", {onclick: 'Tables.onRowChecked(this)'})} @@ -533,17 +533,15 @@ const Helpers = { disabled: is_installed, onclick: `App.dialogOf(this).performInstall("${App.escapeHtml(plugin.name)}")`})} -

${plugin.name} +

${plugin.name} ${App.FormFields.icon("open_in_new_window")}

-
${__("Updated: %s").replace("%s", plugin.last_update)}
+
${__("Updated: %s").replace("%s", plugin.last_update)}
-

${plugin.description}

- -
+
${plugin.description}
` } @@ -626,13 +624,14 @@ const Helpers = { container.innerHTML += ` -
  • ${p.plugin}

    +
  • +

    ${p.plugin}

    ${p.rv.e ? `
    ${p.rv.e}
    ` : ''} ${p.rv.o ? `
    ${p.rv.o}
    ` : ''} -

    +

    ${p.rv.s ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.s) : App.FormFields.icon("check") + " " + __("Update done.")} -

    +
  • ` }); @@ -642,7 +641,7 @@ const Helpers = { }); }, content: ` -
      +
      • ${__("Looking for changes...")}
      @@ -681,13 +680,13 @@ const Helpers = { container.innerHTML += ` -
    • ${p.plugin}

      +
    • ${p.plugin}

      ${p.rv.e ? `
      ${p.rv.e}
      ` : ''} ${p.rv.o ? `
      ${p.rv.o}
      ` : ''} -

      +

      ${p.rv.s ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.s) : App.FormFields.icon("check") + " " + __("Ready to update")} -

      +
    • ` }); diff --git a/themes/compact.css b/themes/compact.css index 6e17cf897..bcdcc9dcf 100644 --- a/themes/compact.css +++ b/themes/compact.css @@ -1511,8 +1511,12 @@ body.ttrss_prefs fieldset.plugin label.description { body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox { margin-right: 10px; } -body.ttrss_prefs .users-list td { - cursor: pointer; +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; @@ -1521,17 +1525,20 @@ body.ttrss_prefs ul.prefs-plugin-list { body.ttrss_prefs ul.prefs-plugin-list li { display: flex; align-items: center; - line-height: 30px; border-bottom: #ddd 1px solid; + line-height: 16px; +} +body.ttrss_prefs ul.prefs-plugin-list li.text-center { + border: 0; + display: block; } body.ttrss_prefs ul.prefs-plugin-list li > * { - padding: 4px; + padding: 8px; } body.ttrss_prefs ul.prefs-plugin-list li label.checkbox { display: flex; align-items: center; min-width: 200px; - margin-right: 16px; cursor: pointer; } body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system { @@ -1551,16 +1558,41 @@ body.ttrss_prefs ul.prefs-plugin-list li .version { min-width: 200px; text-align: right; } -body.ttrss_prefs .plugin-installer-list .plugin-installed { +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 .event-log tr td { - font-size: 10px; +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; diff --git a/themes/compact_night.css b/themes/compact_night.css index 23dd2bcda..4bcd9c9ea 100644 --- a/themes/compact_night.css +++ b/themes/compact_night.css @@ -1511,8 +1511,12 @@ body.ttrss_prefs fieldset.plugin label.description { body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox { margin-right: 10px; } -body.ttrss_prefs .users-list td { - cursor: pointer; +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; @@ -1521,17 +1525,20 @@ body.ttrss_prefs ul.prefs-plugin-list { body.ttrss_prefs ul.prefs-plugin-list li { display: flex; align-items: center; - line-height: 30px; border-bottom: #222 1px solid; + line-height: 16px; +} +body.ttrss_prefs ul.prefs-plugin-list li.text-center { + border: 0; + display: block; } body.ttrss_prefs ul.prefs-plugin-list li > * { - padding: 4px; + padding: 8px; } body.ttrss_prefs ul.prefs-plugin-list li label.checkbox { display: flex; align-items: center; min-width: 200px; - margin-right: 16px; cursor: pointer; } body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system { @@ -1551,16 +1558,41 @@ body.ttrss_prefs ul.prefs-plugin-list li .version { min-width: 200px; text-align: right; } -body.ttrss_prefs .plugin-installer-list .plugin-installed { +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 .event-log tr td { - font-size: 10px; +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; diff --git a/themes/light.css b/themes/light.css index 6fd026857..691bf13ab 100644 --- a/themes/light.css +++ b/themes/light.css @@ -1511,8 +1511,12 @@ body.ttrss_prefs fieldset.plugin label.description { body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox { margin-right: 10px; } -body.ttrss_prefs .users-list td { - cursor: pointer; +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; @@ -1521,17 +1525,20 @@ body.ttrss_prefs ul.prefs-plugin-list { body.ttrss_prefs ul.prefs-plugin-list li { display: flex; align-items: center; - line-height: 30px; border-bottom: #ddd 1px solid; + line-height: 16px; +} +body.ttrss_prefs ul.prefs-plugin-list li.text-center { + border: 0; + display: block; } body.ttrss_prefs ul.prefs-plugin-list li > * { - padding: 4px; + padding: 8px; } body.ttrss_prefs ul.prefs-plugin-list li label.checkbox { display: flex; align-items: center; min-width: 200px; - margin-right: 16px; cursor: pointer; } body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system { @@ -1551,16 +1558,41 @@ body.ttrss_prefs ul.prefs-plugin-list li .version { min-width: 200px; text-align: right; } -body.ttrss_prefs .plugin-installer-list .plugin-installed { +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 .event-log tr td { - font-size: 10px; +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; diff --git a/themes/light/prefs.less b/themes/light/prefs.less index 4ffcc5ab1..b0c04ab81 100644 --- a/themes/light/prefs.less +++ b/themes/light/prefs.less @@ -106,10 +106,16 @@ body.ttrss_prefs { } } - .users-list { - td { - cursor : pointer; + table { + th { + text-align : left; } + + td.checkbox { + text-align : center; + width : 32px; + } + } ul.prefs-plugin-list { @@ -119,18 +125,22 @@ body.ttrss_prefs { li { display : flex; align-items : center; - line-height : 30px; border-bottom: @border-default 1px solid; + line-height : 16px; + + &.text-center { + border : 0; + display : block; + } > * { - padding : 4px; + padding : 8px; } label.checkbox { display : flex; align-items : center; min-width : 200px; - margin-right : 16px; cursor : pointer; &.system { @@ -157,21 +167,45 @@ body.ttrss_prefs { } } - .plugin-installer-list { - .plugin-installed { + .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/night.css b/themes/night.css index a0d69b88b..0745f7b29 100644 --- a/themes/night.css +++ b/themes/night.css @@ -1512,8 +1512,12 @@ body.ttrss_prefs fieldset.plugin label.description { body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox { margin-right: 10px; } -body.ttrss_prefs .users-list td { - cursor: pointer; +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; @@ -1522,17 +1526,20 @@ body.ttrss_prefs ul.prefs-plugin-list { body.ttrss_prefs ul.prefs-plugin-list li { display: flex; align-items: center; - line-height: 30px; border-bottom: #222 1px solid; + line-height: 16px; +} +body.ttrss_prefs ul.prefs-plugin-list li.text-center { + border: 0; + display: block; } body.ttrss_prefs ul.prefs-plugin-list li > * { - padding: 4px; + padding: 8px; } body.ttrss_prefs ul.prefs-plugin-list li label.checkbox { display: flex; align-items: center; min-width: 200px; - margin-right: 16px; cursor: pointer; } body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system { @@ -1552,16 +1559,41 @@ body.ttrss_prefs ul.prefs-plugin-list li .version { min-width: 200px; text-align: right; } -body.ttrss_prefs .plugin-installer-list .plugin-installed { +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 .event-log tr td { - font-size: 10px; +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; diff --git a/themes/night_blue.css b/themes/night_blue.css index 9c8f7d848..36df28628 100644 --- a/themes/night_blue.css +++ b/themes/night_blue.css @@ -1512,8 +1512,12 @@ body.ttrss_prefs fieldset.plugin label.description { body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox { margin-right: 10px; } -body.ttrss_prefs .users-list td { - cursor: pointer; +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; @@ -1522,17 +1526,20 @@ body.ttrss_prefs ul.prefs-plugin-list { body.ttrss_prefs ul.prefs-plugin-list li { display: flex; align-items: center; - line-height: 30px; border-bottom: #222 1px solid; + line-height: 16px; +} +body.ttrss_prefs ul.prefs-plugin-list li.text-center { + border: 0; + display: block; } body.ttrss_prefs ul.prefs-plugin-list li > * { - padding: 4px; + padding: 8px; } body.ttrss_prefs ul.prefs-plugin-list li label.checkbox { display: flex; align-items: center; min-width: 200px; - margin-right: 16px; cursor: pointer; } body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system { @@ -1552,16 +1559,41 @@ body.ttrss_prefs ul.prefs-plugin-list li .version { min-width: 200px; text-align: right; } -body.ttrss_prefs .plugin-installer-list .plugin-installed { +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 .event-log tr td { - font-size: 10px; +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;