From d2e43cb52b5a5d27ac2d9c15e2cf46188109a131 Mon Sep 17 00:00:00 2001 From: Hailun Tian Date: Tue, 11 Jul 2017 09:46:11 +1000 Subject: [PATCH] First commit by Helen --- WorkshopASPNet/About.aspx | 4 ++-- WorkshopASPNet/Contact.aspx | 8 ++++---- WorkshopASPNet/Site.Master | 2 +- WorkshopASPNet/Site.Master.designer.cs | 21 +++++---------------- 4 files changed, 12 insertions(+), 23 deletions(-) diff --git a/WorkshopASPNet/About.aspx b/WorkshopASPNet/About.aspx index ca7a369..d193fd5 100644 --- a/WorkshopASPNet/About.aspx +++ b/WorkshopASPNet/About.aspx @@ -2,6 +2,6 @@

<%: Title %>.

-

Your application description page.

-

Use this area to provide additional information.

+

First task...

+

About page has been changed :)

diff --git a/WorkshopASPNet/Contact.aspx b/WorkshopASPNet/Contact.aspx index abd4b47..24b6c05 100644 --- a/WorkshopASPNet/Contact.aspx +++ b/WorkshopASPNet/Contact.aspx @@ -2,16 +2,16 @@

<%: Title %>.

-

Your contact page.

+

Helen's contact page.

One Microsoft Way
Redmond, WA 98052-6399
P: - 425.555.0100 + 413895323
- Support: Support@example.com
- Marketing: Marketing@example.com + Support: Support@readify.net
+ Marketing: Support@readify.net
diff --git a/WorkshopASPNet/Site.Master b/WorkshopASPNet/Site.Master index fe83e36..7eb0aa8 100644 --- a/WorkshopASPNet/Site.Master +++ b/WorkshopASPNet/Site.Master @@ -63,7 +63,7 @@
diff --git a/WorkshopASPNet/Site.Master.designer.cs b/WorkshopASPNet/Site.Master.designer.cs index d0e7c7c..aea8c9e 100644 --- a/WorkshopASPNet/Site.Master.designer.cs +++ b/WorkshopASPNet/Site.Master.designer.cs @@ -7,22 +7,11 @@ // //------------------------------------------------------------------------------ -namespace WorkshopASPNet -{ - - - public partial class SiteMaster - { - - /// - /// HeadContent control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent; - +namespace WorkshopASPNet { + + + public partial class SiteMaster { + /// /// MainContent control. ///