From d079feb2e9b5539bfdd6d023c4abc41307ad16cc Mon Sep 17 00:00:00 2001
From: irigm <irigm@mail.ru>
Date: Mon, 3 Aug 2020 16:51:18 +0600
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BE=D1=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 metadata/dbms/dbms.css                  |  17 ++++-------------
 metadata/dbms/form/g.gif                | Bin 295 -> 0 bytes
 metadata/dbms/form/{b_g.png => g_b.png} | Bin
 metadata/dbms/form/g_w.png              | Bin 0 -> 803 bytes
 metadata/dbms/form/x_b.png              | Bin 0 -> 1393 bytes
 metadata/dbms/form/{b_x.png => x_w.png} | Bin
 metadata/dbms/tools.js                  |  15 +++++++++++----
 7 files changed, 15 insertions(+), 17 deletions(-)
 delete mode 100644 metadata/dbms/form/g.gif
 rename metadata/dbms/form/{b_g.png => g_b.png} (100%)
 create mode 100644 metadata/dbms/form/g_w.png
 create mode 100644 metadata/dbms/form/x_b.png
 rename metadata/dbms/form/{b_x.png => x_w.png} (100%)

diff --git a/metadata/dbms/dbms.css b/metadata/dbms/dbms.css
index cd6cab9..28ab9c7 100644
--- a/metadata/dbms/dbms.css
+++ b/metadata/dbms/dbms.css
@@ -1,11 +1,3 @@
-/*Переменные для настройки цветов*/
-:root{
-	--header-color: #505050;
-	/*--header-color: #fdfdfd;*/
-	--back-color: #3a3a3a;
-	/*--back-color: #ffffff;*/
-}
-
 
 *{
 	box-sizing:			border-box;
@@ -21,7 +13,7 @@ html,body
 	padding: 0px;
 	font-size: 14px;
 	font-family: Arial;
-	background-color: #3a3a3a;
+	background-color: var(--back-color);
 }
 
 input,textarea
@@ -68,14 +60,13 @@ select
   text-align: center;
 }
 
-/*Табличка исполняющая роль окна*/
+/*Стили для таблицы которая исполняет роль окна*/
 .shadow {
     box-shadow: 0 0 10px rgba(255,255,255,0.7);
-    background-color: #3a3a3a;
-    color: #ffffff;
+	background-color: var(--back-color);
+	color: var(--main-font-color);
 }
 
-
 /* Для полей состояжих из нескольких элементов (поле с кнопочкой допустим) */
 table.DBMSSimple {
     width: 100%;
diff --git a/metadata/dbms/form/g.gif b/metadata/dbms/form/g.gif
deleted file mode 100644
index 2cf8de9a6af3f9190f457403fcf830503ee9a6ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 295
zcmZ?wbhEHbWM+_MSZc?xZr!@|>o;rw;`JLgZrr$e)27XvH*MLnWh)46-MV$#HXz=*
zZ953;*uDb@b^^h!UAuOJz#b6Xvu7^|?Ay0@-~N63_V3?+00<5qICSXH;UkBS965aS
z=+WcHjvYUK>;wp$1c6g0Pn|k-8U)UqJ#+Rf7@s?L?)>?4=P!W3rHep#>C$BoxO(O4
z)vH&o0m1caH?Cj5as9@P8`p2%y!jstbQpjD<QE1up9Av>mOp-4uw(Yyu*Fx?j3RZ|
zig(7X71dtqwa{m|P^XDhr_+n`>`yX_t>*NmHJ^;pn0CrVsnbP)kDr%|n}?l)lZ}m)
OrI(SJiD8l>gEav20keGo

diff --git a/metadata/dbms/form/b_g.png b/metadata/dbms/form/g_b.png
similarity index 100%
rename from metadata/dbms/form/b_g.png
rename to metadata/dbms/form/g_b.png
diff --git a/metadata/dbms/form/g_w.png b/metadata/dbms/form/g_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..f87b9f94ce1fccafb7b309bebdc65d511d34bcd1
GIT binary patch
literal 803
zcmeAS@N?(olHy`uVBq!ia0vp^%s?#50U{%`)Y2Fj7+W%(odZ0bofQg-^3yVNQW+RD
zCe}{0^*HPxb2L8qsFtW8cb7%V3O_LySDB?<t{VbwajmtQ5%Y`HS89@oxckAa4;~y(
zx_a<vWH@`cqre}A!lII(l8Hk9r;9`#sVKP9U;bUL{5`|MxU^L_4H;L=N>xb?G@KkO
zx;sv=LH_QG;|q@X*v^acIb2+G_we!SyE)E(vitu0MQD*4bB)qRnajN070nfCmoHhq
z7jBOT4C*-Fd7O8b!bj!nsnhRUh|7poq@D0kf8ObQBxzyqQ?oQzXVrOXeA=tremWgX
zZT&2kzBMNGZ1pE`w&Gh}U9U~t1r7^6@^EPB(elzb?9>w0D<bT9tH0_;yKH?^jL}Z7
zgeMUWtXe9^`Tw!+-);IicyeBl0awYs8{dv=T-eHOlC|w`ZO-jp;RFA9Vls8>m-3yd
zn-rIw`A~U5zVwbAd6}Q&3U)H{*uI>kXgO*AvI*yz-=}}^jZAnT_9C*lI{V$@FN_|+
z;it_H98@$2Tkxi|znuM6_3!UKoA=8rh!nMLTrT+y7%jU3d_r8;ty{N#{e}%dyne&R
zjT<*_+O&D|rY&2xYz3jMTeoi82E<#pZ3lrJ+jjuLP9WH|Yu9cN*aL!l_Ur|Lef#$A
z+rMw${{8z80KvfnhYlS&eB|(vBZrS3J$n4uvE#>&odAK8AaLsBsZ*y;gTR@yXU?7l
z<8$ZEoj-r>`~?uWbP)(IUAhbcSFc>XdiBaRAh>?*#`WtruHU$E<ND2;H)HeVvVgwe
zEbxddW?<kJ24O~qS#u<Sg6t)pzOL*~IG8#0P2%@H@Bs?tc)B=-a9rm-*vZuBz~FGO
zJ@g&l_DwgtP6@i6+W7x}^qB=)pMC!KDNE{Ay6@K&JEp6;7Al`#ALEz4DcP;c<Hm8r
zK#@gLlsL*fG(T>)yLT*kYn)N^nVGxv`jU+|9^+|KJ`*Q@_=Qr-f~%RIzcU-&;_CQh
Sb?ZFPUItHBKbLh*2~7Yf{E~G5

literal 0
HcmV?d00001

diff --git a/metadata/dbms/form/x_b.png b/metadata/dbms/form/x_b.png
new file mode 100644
index 0000000000000000000000000000000000000000..991be72e2afda421120930d524a276d58a750903
GIT binary patch
literal 1393
zcmV-%1&;cOP)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@0009NdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KZa@-&chW~Sl9sx-R!ErDjGrd8N-xtifyPGsk
zCciqfW(-(hN$8QhiR-_94)+5Wd+{!)rI=&%xIzw@3ns~*S6Myzu=;!1e14F-Yk?sW
zjB-AvxaA#k#(v)Ny7d&u^-fXld*OIoC|ePyZQ$n7HY9W!@NFw9Taoa#9M0!sTaG!|
z{So$i^Z2yKb-URGF^(F^0{Xz-EN09T`(TJ$n~sVt`<J2TXLs9*$TN2#@v9G~mvY_(
zcUnCh$EsqkSecSDzTN>DT!7}hW83`|&4<|B#=l(dGsoKL@R$a-*-iuZX5lFfV&8Ik
zq8G1m$=&k;>HD}B(>sqWT!#6<Ba_R9zsEZ7F<Kg<pQkG!;>d9y>UI)xbB2w_OoH`V
zL^IrqxviGb5-Okqb@SC9Xq7TC5DyB}sL*iK*Q8Q~kAXWIM&`=0WC<)XSDDbmY&6&;
zOG7%aRHTYP%44|g3oW~O*{hUbxe>N9K^ftde>V4-O&_%}W-Sr9T{Cn7=9%_zW0IRa
zwt)zZ9aLQbzO~1M++YO=b%i<MfW;rDibLs7Zpi{I*ryoJ8Y64x`%_VXZG|%=K;R=v
zi6VJpHX;Nv0Z<{ISOOm)K&sr}BnOcQHYfs^c6i5V?PcXtj;|z0s6;Wa$x;9-1V#Q>
zNXVh0qCr)onkLO!qQu}(VKG{qpW9+$!PKIeCCgTlq>wblWGSVbO6Dy18f!*5=9F_T
z1vU#bm*@)i7f231<Oqiz@vtKu`6w0XQ$y7ntJPF<EsdKr)NzZ=T57qKP93S#Ls!>h
zx1M_LWgypvj4*V>VIz$^%0+Ecebc@`jW#u2q~<=ms6lFWj&9`(luTwI#(_ZGCIKWg
zPi8(*2t3J6W<E2jLK#l#WYfqOiX5DTPOO72c7MoyiJObzLvH+8a&DsgCb`AUb-m;E
z4z)IaiR&VER^g1P7gQhCdn%mD{1q+kHu>)OQuI>vQuI>vQuI>vQuH4y8u;S@|53W%
zAJn?WcR<be0004mX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$iQ^hJ35eteqWT;LS
zL`58>ibb$c+6t{Ym|Xe=O&XFE7e~Rh;NZt%)xpJCR|i)?5c~jfa&%I3krMxx6k5c1
zaNLh~_a1le0HI!Hs@X9CsG4OYV^J}aT@|}t5r7}v=*OVMOg)}jOv7`0-NVP%y9m$n
zKKJM7RdOZ+d?N82(+!JwgLr1s(mC%FhgeZkh|h_~4Z0xlBiCh@-#8Z>7I<dJNGIos
zL&RdCjpa6GMMEW?CJrmAM)^X<Wrgz=XSG~q&3p0}26Ng<it98-5W^DUNI-;)DoQBB
zLWEY06cb6>k9zor9e;vcGPz1%<XAujDkR4b{s+IiHS<%GZc;D`biUa3$0*RX3p8rB
z{e5iPjT6BC3|wg~f29u0ev)2mY2hQFZyUI{ZfWu!aJd5vJ?WAmIg+2Ikk13}XY@^3
zVBi+$S#x`9?&I_UNK;qKH^9LmFjk=Kb&q!k+I#!=OtZfqAQW<j4^Z>F00009a7bBm
z000XU000XU0RWnu7ytkO2XskIMF->v0|_($*FWE50000PbVXQnLvL+uWo~o;Lvm$d
zbY)~9cWHEJAV*0}P*;Ht7XSbNJ4r-AR2b7^V1R)C47kC61_lNOMl?l?*c2g4U{j1D
z#)wTf8eqh06}nTH7>EQUTTPT_hzcGCVgnoiKkg3%Qr+XB00000NkvXXu0mjfqU>$0

literal 0
HcmV?d00001

diff --git a/metadata/dbms/form/b_x.png b/metadata/dbms/form/x_w.png
similarity index 100%
rename from metadata/dbms/form/b_x.png
rename to metadata/dbms/form/x_w.png
diff --git a/metadata/dbms/tools.js b/metadata/dbms/tools.js
index 96bfcab..0ca53a0 100644
--- a/metadata/dbms/tools.js
+++ b/metadata/dbms/tools.js
@@ -1195,10 +1195,17 @@ class TWin
 		str+='	</tr>';
 		str+='</table>';
 */
-		
-		var str='';
-		str+='<table id="TWin_TBL_'+this.tWinId+'" class="shadow" bgcolor="#f1f1f1" border="0px" cellspacing="0" cellpadding="0" style="width: 100%; height: 100%; border: 1px solid #000000;">';
-		str+='	<tr id="TWin_H0_'+this.tWinId+'" style="background: url(../resources/metadata/dbms/form/b_g.png) repeat-x;"><td></td><td><table cellspacing="0" cellpadding="0" style="width: 100%; height: 29px;"><tr><td id="TWin_Ca_'+this.tWinId+'" style="vertical-align: middle; cursor: move; font-weight: bold; white-space: nowrap;"></td><td style="width: 10px; vertical-align: middle;"><img src="../resources/metadata/dbms/form/b_x.png" id="TWin_CL_'+this.tWinId+'" style="cursor:pointer;padding-right: 5px;"></td></tr></table></td><td></td></tr>';
+
+		let imgB='g_b.gif';
+		let imgX='x_w.png';
+		if(g_textColor1=='#000000') { //Если тёмный стиль
+			imgB = 'g_w.png';
+			imgX = 'x_b.png';
+		}
+
+		let str='';
+		str+='<table id="TWin_TBL_'+this.tWinId+'" class="shadow" border="0px" cellspacing="0" cellpadding="0" style="width: 100%; height: 100%; border: 1px solid #000000;">';
+		str+='	<tr id="TWin_H0_'+this.tWinId+'" style="background: url(../resources/metadata/dbms/form/'+imgB+') repeat-x;"><td></td><td><table cellspacing="0" cellpadding="0" style="width: 100%; height: 29px;"><tr><td id="TWin_Ca_'+this.tWinId+'" style="vertical-align: middle; cursor: move; font-weight: bold; white-space: nowrap;"></td><td style="width: 10px; vertical-align: middle;"><img src="../resources/metadata/dbms/form/'+imgX+'" id="TWin_CL_'+this.tWinId+'" style="cursor:pointer;padding-right: 5px;"></td></tr></table></td><td></td></tr>';
 		str+='	<tr>';
 		str+='		<td style="width: 5px; height: 5px;'+(!this.dialog ? ' cursor:nw-resize;' : '')+'" id="TWin_TL_'+this.tWinId+'"><img src="../resources/metadata/dbms/form/5.gif" alt="" style="display: block;" border="0px" draggable="false"></td>';
 		str+='		<td style="vertical-align:top;height: 5px;'+(!this.dialog ? ' cursor:n-resize;' : '')+'" id="TWin_T_'+this.tWinId+'"></td>';