Update to 1.1.6

greyaz · Nov 11, 2022 · f82020d · f82020d
1 parent da024c7
commit f82020d
Show file tree

Hide file tree

Showing 15 changed files with 97 additions and 59 deletions.
diff --git a/Asset/dev/css/basics.css b/Asset/dev/css/basics.css
@@ -222,8 +222,7 @@ body.TR a:hover i.fa{
 	overflow-wrap: break-word;
     padding: 1rem;
     background: var(--color-greyscale-6);
-    border: none;
-	border-bottom: var(--style-border);
+	border: var(--style-border);
     border-radius: var(--size-radius-def);
     box-shadow: var(--style-shadow-heavy);
     position: absolute;

diff --git a/Asset/dev/css/board-task-list.css b/Asset/dev/css/board-task-list.css
@@ -58,6 +58,7 @@
     position: relative;
     margin-right: 0.5rem;
     color: var(--color-brand-prim);
+	text-shadow: 0 0 2rem var(--color-brand-prim);
 }
 .task-board-sort-handle i.fa-arrows-alt{
 	padding: 1rem;
@@ -163,31 +164,34 @@ body.TR .task-board-title a, body.TR .table-list-title a {
 }
 .task-board-category, .task-tags li, .table-list-category, .task-list-tag {
     border: none;
+	border-bottom: 1.55em solid var(--color-greyscale-2);
     border-radius: var(--size-radius-def);
+	height: 0;
     line-height: 1.5rem;
     padding: 0 4px;
-    margin: 0 .5rem 1rem 0 !important;
-    font-weight: normal;
+    margin: 0 .5rem .5rem 0 !important;
+    font-weight: bold;
     font-size: var(--size-font-min);;
 	color: var(--color-greyscale-6);
-    background: var(--color-greyscale-1);
+    background: none;
 	float: left;
-	opacity: .1;
+	opacity: .8;
+}
+body.TR .task-board-category a, body.TR .task-tags li a, body.TR .table-list-category a, body.TR .task-list-tag a{
+    color: var(--color-greyscale-6);
+    font-weight: bold;
 }
 .task-board-category:hover, .task-tags li:hover, .table-list-category:hover, .task-list-tag:hover{
 	opacity: 1;
 }
+body.TR .task-board-category a:hover, body.TR .task-tags li a:hover, body.TR .table-list-category a:hover, body.TR .task-list-tag a:hover{
+    color: var(--color-greyscale-6);
+}
 .table-list-category, .task-list-tag {
 	float: none;
 	display: inline-block;
 	margin-bottom: 0 !important;
 }
-.task-board-category:hover, .table-list-category:hover {
-	opacity: 1;
-}
-body.TR .task-board-category a:hover, body.TR .table-list-category a:hover {
-	color: var(--color-greyscale-6);
-}
 
 /* icons */
 .task-board-icons, .task-list-icons {
@@ -196,10 +200,14 @@ body.TR .task-board-category a:hover, body.TR .table-list-category a:hover {
 	text-align: left;
     line-height: 2rem;
     margin-top: 0;
-    opacity: .15;
+    opacity: .1;
 }
 .task-board-icons .task-board-icons-row {
 	line-height: 2rem;
+	display: inline;
+}
+.task-board-icons .task-board-icons-row br {
+	display: none;
 }
 .task-board-icons:hover, .task-list-icons:hover {
     opacity: 1;
@@ -218,7 +226,6 @@ body.TR .task-board-category a:hover, body.TR .table-list-category a:hover {
 .task-board-icons .task-board-icons-row .task-date-overdue, .task-list-icons .task-date-overdue,
 .task-board-icons .task-board-icons-row .task-date-overdue i.fa, .task-list-icons .task-date-overdue i.fa {
 	color: var(--color-warning-prim) !important;
-	background: var(--color-warning-cont);
 }
 .task-board-icons .task-board-icons-row .task-icon-age .task-icon-age-total,
 .task-board-icons .task-board-icons-row .task-icon-age .task-icon-age-column,

diff --git a/Asset/dev/css/board.css b/Asset/dev/css/board.css
@@ -74,6 +74,9 @@
 .board-column-expanded-header .board-column-title{
 	display: inline-block;
 }
+.board-column-expanded-header .board-column-title a{
+	font-weight: normal;
+}
 #board td.board-column-task-collapsed {
     line-height: 3rem;
 }

diff --git a/Asset/dev/css/header.css b/Asset/dev/css/header.css
@@ -30,6 +30,10 @@ header h1 .tooltip {
 	font-size: 1rem;
 	line-height: 2rem;
 	padding-left: 0.5rem;
+	opacity: 1;
+}
+header h1 .tooltip i.fa{
+	color: var(--color-greyscale-2);
 }
 header .board-selector-container {
 	display: contents;
@@ -45,7 +49,7 @@ header .menus-container {
 .notification {
 	line-height: 2rem;
 }
-
 header .notification i.web-notification-icon{
 	color: var(--color-brand-prim) !important;
+	text-shadow: 0 0 2rem var(--color-brand-prim);
 }
diff --git a/Asset/dev/css/login.css b/Asset/dev/css/login.css
@@ -7,26 +7,29 @@
     box-shadow: var(--style-shadow-light);
     border-radius: var(--size-radius-def);
     border-bottom: var(--style-border);
+    text-align: center;
 }
 .TR .form-login > .page-header {
-    position: fixed;
+    position: absolute;
     display: block;
     height: 4.5vh;
-    width: 430px;
-    top: 8.5vh;
-    left: calc(50vw - 215px);
+    width: auto;
+    top: 5.5vh;
+    left: 1rem;
+    right: 1rem;
 }
 .TR .form-login > .logo{
     background: var(--color-greyscale-6);
-    margin: 11vh 1.25rem .25rem;
-    height: 2.5rem;
+    margin: 10vh 1.25rem .25rem;
+    height: 2.7rem;
     border-radius: var(--size-radius-def);
     box-shadow: var(--style-shadow-heavy);
     border-bottom: var(--style-border);
     z-index: 999;
     position: relative;
 }
 .TR .form-login > form{
+    text-align: left;
     padding: 2rem;
     background-color: var(--color-greyscale-6);
     box-shadow: inset 0 15rem 10rem 0 var(--color-greyscale-5); 

diff --git a/Asset/dev/css/table-list.css b/Asset/dev/css/table-list.css
@@ -106,7 +106,7 @@ div[class^="table-list-row color-"] {
 }
 .table-list-row .table-list-details small {
 	padding-right: 1rem;
-	color: var(--color-greyscale-2);
+	color: var(--color-greyscale-1);
 }
 .table-list-row .table-list-details span:first-child{
 	margin-left: .5rem !important;

diff --git a/Asset/dev/css/table.css b/Asset/dev/css/table.css
@@ -67,9 +67,21 @@ table select{
 table td > a{
 	text-decoration: underline;
 }
+.subtasks-table .column-30{
+    width: unset;
+}
 .subtasks-table .subtask-table-td{
 	align-items: center;
+	min-width: unset;
 }
 .subtasks-table .subtask-table-td > *{
 	margin-right: .5rem;
 }
+.subtasks-table tr[data-subtask-id] td > p:last-child{
+    margin-bottom: 0;
+}
+.js-subtask-toggle-status{
+	align-items: center;
+	display: inline;
+    word-break: break-all;
+}
diff --git a/Asset/dev/css/task-detail.css b/Asset/dev/css/task-detail.css
@@ -229,10 +229,6 @@ body.TR .file-thumbnail-description .tooltip > i.fa {
 	color: var(--color-greyscale-1);
 }
 
-.js-subtask-toggle-status{
-	align-items: center;
-}
-
 .public-task > *{
     width: 100%;
 }

diff --git a/Asset/main.min.css b/Asset/main.min.css
diff --git a/Controller/PluginConfigsController.php b/Controller/PluginConfigsController.php
@@ -22,6 +22,8 @@ public function save(){
             //checkbox value fix
             $values['overwrite_default_task_color'] = isset($values['overwrite_default_task_color']);
             $values['enable_google_material_icons'] = isset($values['enable_google_material_icons']);
+            //add version info
+            $values['version'] = $this->helper->configsDataHelper->getVersion();
 
             $this->helper->configsDataHelper->saveConfigs($values);
             $this->response->redirect($this->helper->url->to('PluginConfigsController', 'show', array('plugin' => 'ThemeRevision',)));
@@ -53,4 +55,4 @@ private function getEndKeys($palette){
         }
         return $keys;
     }
-}
+}
diff --git a/Helper/ConfigsDataHelper.php b/Helper/ConfigsDataHelper.php
@@ -114,6 +114,10 @@ public function getDefaultConfigs(){
         return $this->defConfigsModel->getDefaultConfigs();
     }
 
+    public function getVersion(){
+        return $this->defConfigsModel->getVersion();
+    }
+
     private function toV2Format(array $config){
         $return = (object)[];
         foreach($config as $key => $value){

diff --git a/Locale/zh_CN/translations.php b/Locale/zh_CN/translations.php
@@ -19,7 +19,7 @@
     'Overwrite with "task-grey"' => '锁定为“task-grey”',
     'Light Palette' => '亮色色板',
     'Dark Palette' => '暗色色板',
-    'Reset Configs' => '重置设置',
+    'Reset Configs' => '恢复默认配置',
     'Reset' => '重置',
     'Development mode will introduce raw CSS files for easier customization and minify automatically after switching back. <span style="color:var(--color-warning-prim)">Make sure the "Asset" folder in plugin\'s root directory is writable and executable before switching</span>' => '开发模式将引入多个未压缩的CSS文件。<span style="color:var(--color-warning-prim)">切换前，请确保插件根目录下的“Asset”文件夹可写入且可执行</span>，用以在生产模式自动压缩',
     'Icons' => '图标',
@@ -36,5 +36,7 @@
     'More' => '更多',
     'Notice' => '注意',
     'Some colors have been changed after last upgrading.' => '部分色值在升级后发生了变化。',
-    'Dismiss' => '忽略'
+    'Dismiss' => '忽略',
+    'Header Logo' => '页头Logo',
+    'ThemeRevision utilize the file "favicon.png" in the directory "your_kanboard_root/assets/img" as the header logo, replace it if needed.' => 'ThemeRevision利用“your_kanboard_root/assets/img”目录下的“favicon.png”文件作为页头logo。如需自定义，请替换该文件。',
 );
diff --git a/Model/DefaultConfigsModel.php b/Model/DefaultConfigsModel.php
@@ -5,7 +5,7 @@
 class DefaultConfigsModel
 {
     private $default_Configs_Schema = array(
-        'version'                           => array('default' => '20221026v1'),
+        'version'                           => array('default' => '20221111v1'),
 
         // Development mode will introduce raw CSS files for easier customization and minify automatically after switching back. 
         // Make sure the "Asset" folder in plugin's root directory is WRITABLE and EXECUTABLE before switching !
@@ -54,22 +54,22 @@ class DefaultConfigsModel
             'brand-cont'                    => array('default' => '#fff'),
             'brand-secd'                    => array('default' => '#dae4fe'),
 
-            'info-prim'                     => array('default' => '#5574e3'),
-            'info-cont'                     => array('default' => '#e3ebff'),
+            'info-prim'                     => array('default' => '#3860f4'),
+            'info-cont'                     => array('default' => '#d9e7ff'),
 
             'reminder-prim'                 => array('default' => '#be7b04'),
             'reminder-cont'                 => array('default' => '#ffed9d'),
 
-            'warning-prim'                  => array('default' => '#cf5555'),
-            'warning-cont'                  => array('default' => '#fdd4d4'),
+            'warning-prim'                  => array('default' => '#d9371c'),
+            'warning-cont'                  => array('default' => '#ffd9d9'),
             'warning-secd'                  => array('default' => '#e79392'),
 
             'success-prim'                  => array('default' => '#428b43'),
             'success-cont'                  => array('default' => '#c4f7c5'),
 
             // Greyscales
             'greyscale-1'                   => array('default' => '#02021d'),
-            'greyscale-2'                   => array('default' => '#bec3d0'),
+            'greyscale-2'                   => array('default' => 'rgba(0, 0, 0, .15)'),
             'greyscale-3'                   => array('default' => '#e4e9f0'),
             'greyscale-4'                   => array('default' => '#f0f3f7'),
             'greyscale-5'                   => array('default' => '#f7f9fc'),
@@ -133,36 +133,36 @@ class DefaultConfigsModel
         'dark_palette' => array(
             // Messages & Actions
             'brand-prim'                    => array('default' => '#3860f4'),
-            'brand-cont'                    => array('default' => '#183086'),
+            'brand-cont'                    => array('default' => '#e7f0ff'),
             'brand-secd'                    => array('default' => '#051646'),
 
-            'info-prim'                     => array('default' => '#7894ff'),
-            'info-cont'                     => array('default' => '#183086'),
+            'info-prim'                     => array('default' => '#3860f4'),
+            'info-cont'                     => array('default' => '#d4d7ff'),
 
-            'reminder-prim'                 => array('default' => '#ffeb9e'),
-            'reminder-cont'                 => array('default' => '#a67100'),
+            'reminder-prim'                 => array('default' => '#a46a01'),
+            'reminder-cont'                 => array('default' => '#ffe4be'),
 
-            'warning-prim'                  => array('default' => '#e33e3e'),
-            'warning-cont'                  => array('default' => '#7b1900'),
+            'warning-prim'                  => array('default' => '#b62500'),
+            'warning-cont'                  => array('default' => '#fbd0d6'),
             'warning-secd'                  => array('default' => '#450909'),
 
-            'success-prim'                  => array('default' => '#55a256'),
-            'success-cont'                  => array('default' => '#054208'),
+            'success-prim'                  => array('default' => '#09590d'),
+            'success-cont'                  => array('default' => '#82c483'),
 
             // Greyscales
             'greyscale-1'                   => array('default' => '#a3a3a3'),
-            'greyscale-2'                   => array('default' => '#3f3f44'),
-            'greyscale-3'                   => array('default' => '#2b2b32'),
-            'greyscale-4'                   => array('default' => '#1c1a21'),
-            'greyscale-5'                   => array('default' => '#1f1d24'),
-            'greyscale-6'                   => array('default' => '#27252c'),
+            'greyscale-2'                   => array('default' => 'rgba(255, 255, 255, .15)'),
+            'greyscale-3'                   => array('default' => 'rgba(255, 255, 255, .043)'),
+            'greyscale-4'                   => array('default' => '#29272d'),
+            'greyscale-5'                   => array('default' => '#2b292f'),
+            'greyscale-6'                   => array('default' => '#302e35'),
 
             // Tasks
             // Grey
-            'task-grey-bg'                  => array('default' => '#27252c'),
-            'task-grey-bdr'                 => array('default' => '#363439'),
-            'task-dark-grey-bg'             => array('default' => '#1c1a21'),
-            'task-dark-grey-bdr'            => array('default' => '#2b2835'),
+            'task-grey-bg'                  => array('default' => '#302e35'),
+            'task-grey-bdr'                 => array('default' => 'rgba(255, 255, 255, .043)'),
+            'task-dark-grey-bg'             => array('default' => '#29272d'),
+            'task-dark-grey-bdr'            => array('default' => 'rgba(255, 255, 255, .07)'),
             // Red
             'task-pink-bg'                  => array('default' => '#995457'),
             'task-pink-bdr'                 => array('default' => '#ac6064'),
@@ -174,8 +174,8 @@ class DefaultConfigsModel
             'task-deep-orange-bg'           => array('default' => '#9b4500'),
             'task-deep-orange-bdr'          => array('default' => '#b5521d'),
             // Yellow
-            'task-yellow-bg'                => array('default' => '#926300'),
-            'task-yellow-bdr'               => array('default' => '#b17a03'),
+            'task-yellow-bg'                => array('default' => '#a46a01'),
+            'task-yellow-bdr'               => array('default' => '#bd7d08'),
             'task-amber-bg'                 => array('default' => '#683800'),
             'task-amber-bdr'                => array('default' => '#7d430c'),
             'task-brown-bg'                 => array('default' => '#513d2d'),
@@ -209,8 +209,8 @@ class DefaultConfigsModel
             'code-f'                        => array('default' => '#7641bb'),
 
             // shadow
-            'shadow-lit'                    => array('default' => 'rgba(0, 0, 0, .15)'),
-            'shadow-hev'                    => array('default' => 'rgba(0, 0, 0, .28)')
+            'shadow-lit'                    => array('default' => 'rgba(0, 0, 0, .25)'),
+            'shadow-hev'                    => array('default' => 'rgba(0, 0, 0, .4)')
         )
     );
 

diff --git a/Plugin.php b/Plugin.php
@@ -109,7 +109,7 @@ public function getPluginAuthor() {
 	}
 
 	public function getPluginVersion() { 	 
-		return '1.1.5'; 
+		return '1.1.6'; 
 	}
 
 	public function getPluginDescription() { 

diff --git a/Template/settings/configs.php b/Template/settings/configs.php
@@ -42,6 +42,12 @@
             ) ?>
         </fieldset>
 
+        <!-- Logo -->
+        <fieldset>
+            <legend><?= t('Header Logo') ?></legend>
+            <p><small><?= t('ThemeRevision utilize the file "favicon.png" in the directory "your_kanboard_root/assets/img" as the header logo, replace it if needed.') ?></small></p>
+        </fieldset>
+
         <!-- Task Color -->
         <fieldset>
             <legend><?= t('Default Task Color') ?></legend>