diff --git a/gts/BattleVideo.aspx b/gts/BattleVideo.aspx index a11838a5..32ca41a0 100644 --- a/gts/BattleVideo.aspx +++ b/gts/BattleVideo.aspx @@ -1,6 +1,8 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeBehind="BattleVideo.aspx.cs" Inherits="PkmnFoundations.GTS.BattleVideo" %> +<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %> + diff --git a/gts/MasterPage.master b/gts/MasterPage.master index f384449d..54303ffb 100644 --- a/gts/MasterPage.master +++ b/gts/MasterPage.master @@ -1,15 +1,18 @@ <%@ Master Language="C#" AutoEventWireup="true" CodeBehind="MasterPage.master.cs" Inherits="PkmnFoundations.GTS.MasterPage" %> +<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.GTS" Assembly="PkmnFoundations.GTS" %> - + + - +
+

Foundations GTS @@ -30,7 +33,17 @@
Fork me on GitHub!
+

+
diff --git a/gts/MasterPage.master.cs b/gts/MasterPage.master.cs index f84ce276..1f75658c 100644 --- a/gts/MasterPage.master.cs +++ b/gts/MasterPage.master.cs @@ -15,5 +15,19 @@ namespace PkmnFoundations.GTS int availTotal = manager.AvailablePokemon4 + manager.AvailablePokemon5; litPokemon.Text = availTotal.ToString(); } + + public String HeaderCssClass + { + get + { + return litHeaderCssClassKeep.Text; + } + set + { + litHeaderCssClassKeep.Text = value; + } + } + + } } \ No newline at end of file diff --git a/gts/MasterPage.master.designer.cs b/gts/MasterPage.master.designer.cs index 6d7caaaa..a5377af2 100644 --- a/gts/MasterPage.master.designer.cs +++ b/gts/MasterPage.master.designer.cs @@ -12,6 +12,15 @@ namespace PkmnFoundations.GTS { public partial class MasterPage { + /// + /// HeaderColour1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::PkmnFoundations.GTS.HeaderColour HeaderColour1; + /// /// cpHead control. /// @@ -21,6 +30,15 @@ namespace PkmnFoundations.GTS { /// protected global::System.Web.UI.WebControls.ContentPlaceHolder cpHead; + /// + /// litHeaderCssClassKeep control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal litHeaderCssClassKeep; + /// /// hlHome control. /// @@ -48,6 +66,24 @@ namespace PkmnFoundations.GTS { /// protected global::System.Web.UI.WebControls.HyperLink hlAllPokemon; + /// + /// hlGts control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlGts; + + /// + /// hlBattleVideos control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlBattleVideos; + /// /// cpMain control. /// diff --git a/gts/css/main.css b/gts/css/main.css index 021e39e4..9baddfcd 100644 --- a/gts/css/main.css +++ b/gts/css/main.css @@ -7,13 +7,22 @@ #gtsHeader { - background-color: #ff8063; color: white; font-family: Arial,sans-serif; padding: 20px 0 4px; height: 108px; + border-bottom: 2px solid; + box-shadow: 0 1px 3px 0 rgba(0,0,0,0.3); + z-index: 1; + position: relative; } +.gts #gtsHeader { background-color: #ff8063; border-color: #9b4b39; } +.bv #gtsHeader { background-color: #64ceff; border-color: #3a7d9b; } + +.gts #gtsHeader .hideShadow { background-color: #ff8063; } +.bv #gtsHeader .hideShadow { background-color: #64ceff; } + #gtsHeader h1 { margin: 0; @@ -50,18 +59,62 @@ #gtsHeader .stats { - background-color: #ffac9f; border-radius: 9px; padding: 4px; width: 200px; font-size: 12px; } +.gts #gtsHeader .stats { background-color: #ffac9f; } +.bv #gtsHeader .stats { background-color: #9fdcff; } + #gtsHeader a { color: white; } +#gtsTabsBar +{ + font-size: 18px; +} + +#gtsTabsBar ul +{ + position: relative; + margin: 0 auto; + padding: 0; +} + +#gtsTabsBar li +{ + display: block; + margin: 0; padding: 0; + padding-right: 3px; + float: left; +} + +#gtsTabsBar li a +{ + display: block; + height: 24px; + min-width: 72px; + text-align: center; + margin: 0; padding: 5px 5px; + border: 2px solid; + border-top: none; + color: #ffffff; + text-decoration: none; + border-radius: 0 0 12px 12px; + position: relative; + box-shadow: 0 2px 2px 0 rgba(0,0,0,0.3); +} + +#gtsTabsBar li a.gts { background-color: #ff8063; border-color: #9b4b39; } +#gtsTabsBar li a.bv { background-color: #64ceff; border-color: #3a7d9b; } + +.gts #gtsTabsBar li a.gts { z-index: 2; padding-top: 7px; top: -2px; } +.bv #gtsTabsBar li a.bv { z-index: 2; padding-top: 7px; top: -2px; } + #gtsMain { padding: 4px 0; @@ -74,6 +127,13 @@ position: relative; } +.clear +{ + clear: both; + height: 0; + overflow: hidden; +} + .github-contain { position: absolute; diff --git a/gts/gts.csproj b/gts/gts.csproj index 0b0cf257..62794d71 100644 --- a/gts/gts.csproj +++ b/gts/gts.csproj @@ -89,6 +89,7 @@ BattleVideo.aspx + BoxUp.aspx ASPXCodeBehind diff --git a/gts/src/HeaderColour.cs b/gts/src/HeaderColour.cs new file mode 100644 index 00000000..75999612 --- /dev/null +++ b/gts/src/HeaderColour.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace PkmnFoundations.GTS +{ + public class HeaderColour : System.Web.UI.Control + { + public HeaderColour() + { + CssClass = null; + this.PreRender += HeaderColour_PreRender; + } + + private void HeaderColour_PreRender(object sender, EventArgs e) + { + PkmnFoundations.GTS.MasterPage master = Page.Master as PkmnFoundations.GTS.MasterPage; + if (master == null) return; + + master.HeaderCssClass = CssClass; + } + + protected override void LoadViewState(object savedState) + { + HeaderColourViewState state = (HeaderColourViewState)savedState; + + this.CssClass = state.CssClass; + + base.LoadViewState(state.ControlViewState); + } + + protected override object SaveViewState() + { + HeaderColourViewState state = new HeaderColourViewState(); + + state.CssClass = this.CssClass; + state.ControlViewState = base.SaveViewState(); + + return state; + } + + public String CssClass { get; set; } + + [Serializable()] + private struct HeaderColourViewState + { + public object ControlViewState; + public String CssClass; + } + } +} \ No newline at end of file