diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt index c5e035c..dba6080 100644 --- a/Builder/IISMainHandler/build.txt +++ b/Builder/IISMainHandler/build.txt @@ -1 +1 @@ -2021 \ No newline at end of file +2024 \ No newline at end of file diff --git a/Resources/FLocal/static/css/modern/blue.css b/Resources/FLocal/static/css/modern/blue.css index 5d085cc..166196e 100644 --- a/Resources/FLocal/static/css/modern/blue.css +++ b/Resources/FLocal/static/css/modern/blue.css @@ -41,7 +41,7 @@ pre { .pmcontainer.unread { background-color:#bbcddf; } -blockquote { +blockquote .quotecontent { border:solid 1px #9f9f9f; background-color:#cfcfcf; } @@ -100,3 +100,20 @@ blockquote { .UG_Administrators { color:black !important; } + +.metroicon-add { + background-image:url(/static/images/metro.icons/black/add.png); +} +.metroicon-cancel { + background-image:url(/static/images/metro.icons/black/cancel.png); +} +.metroicon-edit { + background-image:url(/static/images/metro.icons/black/edit.png); +} +.metroicon-mail { + background-image:url(/static/images/metro.icons/black/mail.png); +} +.metroicon-settings { + background-image:url(/static/images/metro.icons/black/settings.png); +} + diff --git a/Resources/FLocal/static/css/modern/global.css b/Resources/FLocal/static/css/modern/global.css index 3b2b6fc..8ee7607 100644 --- a/Resources/FLocal/static/css/modern/global.css +++ b/Resources/FLocal/static/css/modern/global.css @@ -128,7 +128,7 @@ input { padding-bottom:5pt; padding-top:5pt; } -blockquote { +blockquote .quotecontent { display:block; border:solid 2px; font-size:0.8em; @@ -255,3 +255,8 @@ a.external { width:15em; z-index:3000; } + +.metroicon-slowpoke { + background-image:url(/static/images/slowpoke-48.png); +} + diff --git a/Resources/FLocal/static/css/modern/high-contrast.css b/Resources/FLocal/static/css/modern/high-contrast.css index beba98d..79e5aa3 100644 --- a/Resources/FLocal/static/css/modern/high-contrast.css +++ b/Resources/FLocal/static/css/modern/high-contrast.css @@ -30,7 +30,7 @@ PRE{background-color:#303030;border-color:#999999;color:white} .pmcontainer.unread { background-color:#200000; } -blockquote { +blockquote .quotecontent { border:solid 1px #606060; background-color:#303030; } @@ -80,3 +80,20 @@ blockquote { color:black !important; background-color:white !important; } + +.metroicon-add { + background-image:url(/static/images/metro.icons/white/add.png); +} +.metroicon-cancel { + background-image:url(/static/images/metro.icons/white/cancel.png); +} +.metroicon-edit { + background-image:url(/static/images/metro.icons/white/edit.png); +} +.metroicon-mail { + background-image:url(/static/images/metro.icons/white/mail.png); +} +.metroicon-settings { + background-image:url(/static/images/metro.icons/white/settings.png); +} + diff --git a/Resources/FLocal/static/images/metro.icons/black/add.png b/Resources/FLocal/static/images/metro.icons/black/add.png new file mode 100644 index 0000000..549b24a Binary files /dev/null and b/Resources/FLocal/static/images/metro.icons/black/add.png differ diff --git a/Resources/FLocal/static/images/metro.icons/black/cancel.png b/Resources/FLocal/static/images/metro.icons/black/cancel.png new file mode 100644 index 0000000..489eb11 Binary files /dev/null and b/Resources/FLocal/static/images/metro.icons/black/cancel.png differ diff --git a/Resources/FLocal/static/images/metro.icons/black/edit.png b/Resources/FLocal/static/images/metro.icons/black/edit.png new file mode 100644 index 0000000..1eab74d Binary files /dev/null and b/Resources/FLocal/static/images/metro.icons/black/edit.png differ diff --git a/Resources/FLocal/static/images/metro.icons/black/i.png b/Resources/FLocal/static/images/metro.icons/black/i.png new file mode 100644 index 0000000..19354c6 Binary files /dev/null and b/Resources/FLocal/static/images/metro.icons/black/i.png differ diff --git a/Resources/FLocal/static/images/metro.icons/black/mail.png b/Resources/FLocal/static/images/metro.icons/black/mail.png new file mode 100644 index 0000000..4b09050 Binary files /dev/null and b/Resources/FLocal/static/images/metro.icons/black/mail.png differ diff --git a/Resources/FLocal/static/images/metro.icons/black/settings.png b/Resources/FLocal/static/images/metro.icons/black/settings.png new file mode 100644 index 0000000..e8cf9d7 Binary files /dev/null and b/Resources/FLocal/static/images/metro.icons/black/settings.png differ diff --git a/Resources/FLocal/static/images/metro.icons/info.txt b/Resources/FLocal/static/images/metro.icons/info.txt new file mode 100644 index 0000000..44308a1 --- /dev/null +++ b/Resources/FLocal/static/images/metro.icons/info.txt @@ -0,0 +1 @@ +http://metro.windowswiki.info/ \ No newline at end of file diff --git a/Resources/FLocal/static/images/metro.icons/placeholder.png b/Resources/FLocal/static/images/metro.icons/placeholder.png new file mode 100644 index 0000000..67270c0 Binary files /dev/null and b/Resources/FLocal/static/images/metro.icons/placeholder.png differ diff --git a/Resources/FLocal/static/images/metro.icons/white/add.png b/Resources/FLocal/static/images/metro.icons/white/add.png new file mode 100644 index 0000000..c27218c Binary files /dev/null and b/Resources/FLocal/static/images/metro.icons/white/add.png differ diff --git a/Resources/FLocal/static/images/metro.icons/white/cancel.png b/Resources/FLocal/static/images/metro.icons/white/cancel.png new file mode 100644 index 0000000..3763e02 Binary files /dev/null and b/Resources/FLocal/static/images/metro.icons/white/cancel.png differ diff --git a/Resources/FLocal/static/images/metro.icons/white/edit.png b/Resources/FLocal/static/images/metro.icons/white/edit.png new file mode 100644 index 0000000..a92db3e Binary files /dev/null and b/Resources/FLocal/static/images/metro.icons/white/edit.png differ diff --git a/Resources/FLocal/static/images/metro.icons/white/i.png b/Resources/FLocal/static/images/metro.icons/white/i.png new file mode 100644 index 0000000..9f3bf28 Binary files /dev/null and b/Resources/FLocal/static/images/metro.icons/white/i.png differ diff --git a/Resources/FLocal/static/images/metro.icons/white/mail.png b/Resources/FLocal/static/images/metro.icons/white/mail.png new file mode 100644 index 0000000..c8f9e45 Binary files /dev/null and b/Resources/FLocal/static/images/metro.icons/white/mail.png differ diff --git a/Resources/FLocal/static/images/metro.icons/white/settings.png b/Resources/FLocal/static/images/metro.icons/white/settings.png new file mode 100644 index 0000000..61f2ec3 Binary files /dev/null and b/Resources/FLocal/static/images/metro.icons/white/settings.png differ diff --git a/Resources/FLocal/static/images/slowpoke-48.png b/Resources/FLocal/static/images/slowpoke-48.png new file mode 100644 index 0000000..8775db8 Binary files /dev/null and b/Resources/FLocal/static/images/slowpoke-48.png differ diff --git a/Resources/FLocal/templates/Modern/elems/Main.xslt b/Resources/FLocal/templates/Modern/elems/Main.xslt index 1ad58d6..1374c40 100644 --- a/Resources/FLocal/templates/Modern/elems/Main.xslt +++ b/Resources/FLocal/templates/Modern/elems/Main.xslt @@ -13,7 +13,7 @@ ]]><![endif] - /static/css/modern/.css?v6.3 + /static/css/modern/.css?v6.4 @@ -132,17 +132,20 @@ - - /static/images/ + + metroicon- - slowpoke-32.png + slowpoke + + /static/images/metro.icons/placeholder.png + diff --git a/Resources/FLocal/templates/Modern/elems/PMInfo.xslt b/Resources/FLocal/templates/Modern/elems/PMInfo.xslt index dd8cb54..38a98f4 100644 --- a/Resources/FLocal/templates/Modern/elems/PMInfo.xslt +++ b/Resources/FLocal/templates/Modern/elems/PMInfo.xslt @@ -20,7 +20,7 @@ submitSelText(this.href);return false; submitSelText(this.href);return false; - woocons/MailReply.png + mail Ответ diff --git a/Resources/FLocal/templates/Modern/elems/PostInfo.xslt b/Resources/FLocal/templates/Modern/elems/PostInfo.xslt index 94fe44f..59ee41a 100644 --- a/Resources/FLocal/templates/Modern/elems/PostInfo.xslt +++ b/Resources/FLocal/templates/Modern/elems/PostInfo.xslt @@ -36,7 +36,7 @@ - woocons/Comment.png + add Ответ @@ -48,7 +48,7 @@ submitSelText(this.href);return false; - woocons/Mail.png + mail Ответить в ПМ @@ -58,7 +58,7 @@ /Post//Punish/ - woocons/Stop2.png + settings Модерировать @@ -66,7 +66,7 @@ - woocons/SignWarning.png + cancel Известить модератора @@ -77,7 +77,7 @@ /Post//Edit/ - woocons/CommentEdit.png + edit Правка diff --git a/Resources/FLocal/templates/Modern/elems/ThreadInfo.xslt b/Resources/FLocal/templates/Modern/elems/ThreadInfo.xslt index f123a12..cb6aa13 100644 --- a/Resources/FLocal/templates/Modern/elems/ThreadInfo.xslt +++ b/Resources/FLocal/templates/Modern/elems/ThreadInfo.xslt @@ -84,7 +84,7 @@ showChildren(this); hideChildren(this);