From 66c4f1fb53cd588c0377d2a4d73b1e83e2bab106 Mon Sep 17 00:00:00 2001 From: Francis Veilleux-Gaboury Date: Fri, 7 Aug 2015 10:48:33 -0400 Subject: [PATCH 01/11] Update login.html Clean-up old/unused form elements, added zomis.net server address --- login/login.html | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/login/login.html b/login/login.html index 11fd9d3..71b6dd2 100644 --- a/login/login.html +++ b/login/login.html @@ -1,12 +1,15 @@
-

Cardshifter login

+

Welcome to Cardshifter Web Client

+ +

Please log in to continue

+
-
- - -
- -
From b24fa937d21f7c717cecd9682b012f2189c94c86 Mon Sep 17 00:00:00 2001 From: Francis Veilleux-Gaboury Date: Fri, 7 Aug 2015 12:05:32 -0400 Subject: [PATCH 02/11] Update login.html Add welcome content and links to external resources --- login/login.html | 47 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/login/login.html b/login/login.html index 71b6dd2..7de6043 100644 --- a/login/login.html +++ b/login/login.html @@ -1,7 +1,9 @@
-

Welcome to Cardshifter Web Client

+ -

Please log in to continue

+ + +

Please log in to continue, or see below for instructions and assistance.

+ + + +

Getting started

+ +

To begin playing, first select the server you would like to connect to:

+
    +
  • Local Host: Select this if you are hosting a local game server on your own machine.
    • +
  • dwarftowers.com: dwarftowers.com server hosted by our development team.
    • +
  • zomis.net: Zomis Productions server hosted by our development team.
    • +
  • Other: Enter a server address manually.
    • +
+

Then enter a user name and click Log in.

+

Note: You can expand the Server Console below if you would like to see server messages.

+ +

Cyborg Chronicles

+

A dystopian, cyberpunk themed game featuring human factions, war machines and interplanetary conflict.

+ + +

Mythos

+

Mythical creatures and magic clash while Gods, Goddesses and Heroes of legend fight for human worship.

+ +

About Cardshifter

+ +
From 3d801e3696f8c10352c5de30f436ae4a9402e281 Mon Sep 17 00:00:00 2001 From: Francis Veilleux-Gaboury Date: Fri, 7 Aug 2015 12:07:01 -0400 Subject: [PATCH 03/11] Update cardshifter.css Add header IDs for Cyborg Chronicles and Mythos headers allowing different font styles using HTML ID tags --- cardshifter.css | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/cardshifter.css b/cardshifter.css index ae1e07c..50b2e2b 100644 --- a/cardshifter.css +++ b/cardshifter.css @@ -5,10 +5,6 @@ body { /* FORMATTING SPECIFIC TO LOGIN FORM */ -#server_other { - display: none; -} - .login-form { font-size: 1.2em; font-weight: normal; @@ -25,9 +21,6 @@ button, input, select, textarea { padding-bottom; 0px; } - - - /* FORMATTING FOR TOP NAV BAR */ .csh-top-link { @@ -132,7 +125,7 @@ body { border-bottom: 1px solid #eee; } -h1, h2, h3, blockquote { +h1, h2, h3, h4, blockquote { font-family: Georgia, Times, "Times New Roman", serif; } @@ -164,6 +157,16 @@ div.contributor { width: 350px; } +/* MOD-SPECIFIC FORMATTING */ + +h1#cyborg-chronicles, h2#cyborg-chronicles, h3#cyborg-chronicles, h4#cyborg-chronicles { + font-family: Consolas, Monaco, "Courier New", monospace; +} + +h1#mythos, h2#mythos, h3#mythos, h4#mythos, blockquote { + font-family: Copperplate,Copperplate Gothic Light,fantasy; +} + /* FORMATTING FOR ARTICLES */ article {} From 98c864ca7e853537b6a67f8792e81b09034de0ed Mon Sep 17 00:00:00 2001 From: Francis Veilleux-Gaboury Date: Fri, 7 Aug 2015 12:29:07 -0400 Subject: [PATCH 04/11] Create top_navbar.html --- top_navbar/top_navbar.html | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 top_navbar/top_navbar.html diff --git a/top_navbar/top_navbar.html b/top_navbar/top_navbar.html new file mode 100644 index 0000000..1939faf --- /dev/null +++ b/top_navbar/top_navbar.html @@ -0,0 +1,18 @@ + From 3943e9b985cab33e7650156c4653e1b3d22cfd62 Mon Sep 17 00:00:00 2001 From: Francis Veilleux-Gaboury Date: Fri, 7 Aug 2015 12:46:33 -0400 Subject: [PATCH 05/11] Update cardshifter.css Add btn-navbar class for black buttons --- cardshifter.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cardshifter.css b/cardshifter.css index 50b2e2b..22bc15f 100644 --- a/cardshifter.css +++ b/cardshifter.css @@ -29,6 +29,19 @@ button, input, select, textarea { font-size: 2em; } +.btn.btn-navbar { + color: #DDDDDD; + background-color: #000000; + /* background-image: linear-gradient(to bottom, #8f8f8f, #4a4a49); */ + border-color: #DDDDDD #DDDDDD #DDDDDD; +} +.btn.btn-navbar:hover { + color: #FFFFFF; + background-color: #DDDDDD; + background-image: linear-gradient(to bottom, #4a4a49, #4a4a49); + border-color: #FFFFFF #FFFFFF #FFFFFF; +} + .csh-twitter-top-bar { list-style: none; margin: 0; From d39704b2be0d91f5e6ecae792688cddeff6d65d6 Mon Sep 17 00:00:00 2001 From: Francis Veilleux-Gaboury Date: Fri, 7 Aug 2015 15:25:17 -0400 Subject: [PATCH 06/11] Update login.html Small improvements --- login/login.html | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/login/login.html b/login/login.html index 7de6043..00457f0 100644 --- a/login/login.html +++ b/login/login.html @@ -1,3 +1,5 @@ + +
@@ -46,18 +48,18 @@

Getting started

Then enter a user name and click Log in.

Note: You can expand the Server Console below if you would like to see server messages.

-

Cyborg Chronicles

-

A dystopian, cyberpunk themed game featuring human factions, war machines and interplanetary conflict.

+

Cyborg Chronicles

+

A dystopian, cyberpunk themed game featuring human factions, war machines and interplanetary conflict.

-

Mythos

-

Mythical creatures and magic clash while Gods, Goddesses and Heroes of legend fight for human worship.

+

Mythos

+

Magical and Mythical Creatures clash while Gods, Goddesses and Heroes of Legend fight for human worship.

About Cardshifter

From 2e28a4cb39a7bc0eb7229f7deb42e76dbeaf673a Mon Sep 17 00:00:00 2001 From: Francis Veilleux-Gaboury Date: Fri, 7 Aug 2015 15:42:34 -0400 Subject: [PATCH 07/11] Delete login_alt.html --- login/login_alt.html | 108 ------------------------------------------- 1 file changed, 108 deletions(-) delete mode 100644 login/login_alt.html diff --git a/login/login_alt.html b/login/login_alt.html deleted file mode 100644 index b3f94ea..0000000 --- a/login/login_alt.html +++ /dev/null @@ -1,108 +0,0 @@ -Enter file contents here - - - - Cardshifter Login - - - - - - - - - - - - - - - - - -
- - - - - -
- - - From 19dd9cc272559d33f76ff6444bb259961394caea Mon Sep 17 00:00:00 2001 From: Francis Veilleux-Gaboury Date: Fri, 7 Aug 2015 15:46:30 -0400 Subject: [PATCH 08/11] Update cardshifter.css Small changes for login and top_navbar classes --- cardshifter.css | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/cardshifter.css b/cardshifter.css index 22bc15f..014b6e6 100644 --- a/cardshifter.css +++ b/cardshifter.css @@ -29,6 +29,20 @@ button, input, select, textarea { font-size: 2em; } +a.csh-dropdown-link, +a.csh-dropdown-link:visited { + color: #DDDDDD; + font-size: 1.4em; + font-family: Georgia, Times, "Times New Roman", serif; +} + +a.csh-dropdown-link:hover, +a.csh-dropdown-link:active { + color: #DDDDDD; + text-decoration: underline; + font-family: Georgia, Times, "Times New Roman", serif; +} + .btn.btn-navbar { color: #DDDDDD; background-color: #000000; @@ -172,12 +186,12 @@ div.contributor { /* MOD-SPECIFIC FORMATTING */ -h1#cyborg-chronicles, h2#cyborg-chronicles, h3#cyborg-chronicles, h4#cyborg-chronicles { +.cyborg-font { font-family: Consolas, Monaco, "Courier New", monospace; } -h1#mythos, h2#mythos, h3#mythos, h4#mythos, blockquote { - font-family: Copperplate,Copperplate Gothic Light,fantasy; +.mythos-font { + font-family: Copperplate, Copperplate Gothic Light, fantasy; } /* FORMATTING FOR ARTICLES */ From 1f35b906febe11ff5127785a9ca5a522a5f80670 Mon Sep 17 00:00:00 2001 From: Francis Veilleux-Gaboury Date: Fri, 7 Aug 2015 15:50:02 -0400 Subject: [PATCH 09/11] Update login.html --- login/login.html | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/login/login.html b/login/login.html index 00457f0..a87303c 100644 --- a/login/login.html +++ b/login/login.html @@ -1,7 +1,6 @@
- @@ -48,18 +47,18 @@

Getting started

Then enter a user name and click Log in.

Note: You can expand the Server Console below if you would like to see server messages.

-

Cyborg Chronicles

-

A dystopian, cyberpunk themed game featuring human factions, war machines and interplanetary conflict.

+

Cyborg Chronicles

+

A dystopian, cyberpunk themed game featuring human factions, war machines and interplanetary conflict.

-

Mythos

-

Magical and Mythical Creatures clash while Gods, Goddesses and Heroes of Legend fight for human worship.

+

Mythos

+

Magical and Mythical Creatures clash while Gods, Goddesses and Heroes of Legend fight for human worship.

About Cardshifter

From da9be9608ed2c26514ac6a36d96106e93fe264ba Mon Sep 17 00:00:00 2001 From: Francis Veilleux-Gaboury Date: Fri, 7 Aug 2015 15:57:37 -0400 Subject: [PATCH 10/11] Update top_navbar.html Dropdown menus are not completely functional, but will fix later. This is ready to add to controllers for injection, will update this file later after I figure out why the dropdown menus are not being displayed as intended. --- top_navbar/top_navbar.html | 59 ++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/top_navbar/top_navbar.html b/top_navbar/top_navbar.html index 1939faf..b45070b 100644 --- a/top_navbar/top_navbar.html +++ b/top_navbar/top_navbar.html @@ -1,18 +1,59 @@ + + + + + + + + + +
+ +
+ + + +
+ From 422538e1c068af130ce2779a9d1f4c5e0a2b28e3 Mon Sep 17 00:00:00 2001 From: Francis Veilleux-Gaboury Date: Fri, 7 Aug 2015 15:59:27 -0400 Subject: [PATCH 11/11] Update cardshifter.html Added HTML code from top_navbar/top_navbar.html temporarily for @SirPython to add to controllers to be injected via Angular. After that is done, this section of HTML code can be removed. --- cardshifter.html | 75 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/cardshifter.html b/cardshifter.html index d9461f3..f3bd026 100644 --- a/cardshifter.html +++ b/cardshifter.html @@ -22,7 +22,80 @@ + + + + + + + + + + + +
+ + + - \ No newline at end of file +