Compare commits

...

3 Commits

Author SHA1 Message Date
sj84 b8709e5f2e no message 2023-09-08 11:25:34 +09:00
sj84 9954d8f14a Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DB_2A
# Conflicts:
#	INT69DB_2A/Forms/FormUserEditor.Designer.cs
#	INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/Refactor/INT69DB_2A_ImageDll.dll
2023-09-08 11:23:27 +09:00
sj84 0601b152c3 no message 2023-09-08 11:22:53 +09:00
2 changed files with 2 additions and 2 deletions

View File

@ -110,7 +110,7 @@
this.labelTitle.BackPictureBox2 = null; this.labelTitle.BackPictureBox2 = null;
this.labelTitle.BorderColor = System.Drawing.Color.Black; this.labelTitle.BorderColor = System.Drawing.Color.Black;
this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitle.Font = new System.Drawing.Font("새굴림", 23F, System.Drawing.FontStyle.Bold); this.labelTitle.Font = new System.Drawing.Font("New Gulim", 23F, System.Drawing.FontStyle.Bold);
this.labelTitle.ForeColor = System.Drawing.Color.White; this.labelTitle.ForeColor = System.Drawing.Color.White;
this.labelTitle.InitVisible = true; this.labelTitle.InitVisible = true;
this.labelTitle.LineSpacing = 0F; this.labelTitle.LineSpacing = 0F;
@ -223,7 +223,7 @@
// //
// comboBoxAccessRight // comboBoxAccessRight
// //
this.comboBoxAccessRight.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Regular); this.comboBoxAccessRight.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Regular);
this.comboBoxAccessRight.Location = new System.Drawing.Point(209, 67); this.comboBoxAccessRight.Location = new System.Drawing.Point(209, 67);
this.comboBoxAccessRight.Name = "comboBoxAccessRight"; this.comboBoxAccessRight.Name = "comboBoxAccessRight";
this.comboBoxAccessRight.Size = new System.Drawing.Size(270, 26); this.comboBoxAccessRight.Size = new System.Drawing.Size(270, 26);