Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New UI #137

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

New UI #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12,364 changes: 12,364 additions & 0 deletions WebContent/altstyle/default/cah.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions WebContent/analytics.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-35005079-2', 'auto');
ga('send', 'pageview');

</script>
</script>
69 changes: 39 additions & 30 deletions WebContent/cah.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ body {
margin: 0;
}

.carddisplayer {
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 12px;
line-height: .8;
color: #333;
background-color: #fff;
}

.card, #game_list {
font-family: "helvetica neue", helvetica, Arial, sans-serif;
}
Expand Down Expand Up @@ -71,7 +79,7 @@ h2,h3,h4 {
background:#555;
border-bottom:1px solid #333;
color:#fff;
height: 25px;
height: 42px;
padding:.5em;
}

Expand All @@ -86,7 +94,7 @@ h2,h3,h4 {
#nickbox {
border: 1px solid black;
display: inline;
padding: 5px;
padding: 10px;
}

#canvas {
Expand Down Expand Up @@ -114,16 +122,18 @@ h2,h3,h4 {

.gamelist_lobby {
background: #fff;
border-radius: .25em;
width: 575px;
height: 175px;
border-radius: .1em;
min-width: 575px;
width: 33.333333%;
height: 40%;
float: left;
border: 1px solid #ccc;
border: 2px solid #ccc;
margin: 4px;
}

.gamelist_lobby_left {
width: 77%;
width: 80%;
font-size: 12px;
height: 100%;
padding: .5em 1.5%;
float: left;
Expand All @@ -137,21 +147,18 @@ h2,h3,h4 {

.gamelist_lobby_join {
width: 100%;
height: 75%;
border: 1px solid #aaa;
background: linear-gradient(#fff, #ddd) #ddd;
border-radius: .25em;
text-transform: uppercase;
height: 75.5%;
font-weight: 700;
border: 0px solid #aaa;
/* border-radius: .25em; */
text-transform: camelcase;
}

.gamelist_lobby_spectate {
width: 100%;
height: 25%;
border: 1px solid #aaa;
background: linear-gradient(#fff, #ddd) #ddd;
border-radius: .25em;
text-transform: uppercase;
height: 25.1%;
/* border-radius: .25em;*/
text-transform: camelcase;
font-weight: 700;
}

Expand Down Expand Up @@ -232,8 +239,8 @@ h2,h3,h4 {
right: 0px;
overflow-y: scroll;
min-height: 43px;
font-size: 16px;
font-family: serif;
font-size: 14px;
font-family: sans-serif;
}

#tab-preferences input[type='button'] {
Expand All @@ -244,7 +251,7 @@ h2,h3,h4 {
border: 1px solid black;
left: -1px;
bottom: 0px;
height: 17px;
height: 19px;
position: absolute;
padding: 0px;
width: 90%;
Expand All @@ -263,6 +270,7 @@ h2,h3,h4 {
font-size: 14px;
}


span.error {
color: red;
}
Expand Down Expand Up @@ -322,7 +330,7 @@ span.debug, span.admin {

.your_hand {
position: absolute;
bottom: 10px;
bottom: 20px;
right: 5px;
}

Expand All @@ -335,7 +343,7 @@ span.debug, span.admin {
}

.game_hand_filter {
height: 100%;
height: 90%;
position: relative;
background: rgba(192, 192, 192, .5);
z-index: 100;
Expand All @@ -345,10 +353,10 @@ span.debug, span.admin {
.game_hand_filter_text {
position: absolute;
top: 50%;
font-size: 300%;
font-size: 250%;
margin-top: -30px;
background:#eee;
padding:.25em;
padding:.15em;
}

.game_hand_cards {
Expand Down Expand Up @@ -383,9 +391,9 @@ span.debug, span.admin {
}

.game_black_card {
width: 232px;
height: 232px;
margin-top: 15px;
width: 215px;
height: 215px;
margin-top: 4px;
}

.confirm_card {
Expand All @@ -405,11 +413,11 @@ span.debug, span.admin {
.game_right_side, .game_options {
position: absolute;
left: 246px;
width: 1000px;
width: 80%;
}

.game_options {
background: #eee;
background: #fff;
z-index: 500;
}

Expand Down Expand Up @@ -459,7 +467,7 @@ span.debug, span.admin {

.scorecard {
background:#fff;
height: 36px;
height: 43px;
padding:.25em .5em;
border-bottom: 1px solid #bbb;
font-size: 11pt;
Expand Down Expand Up @@ -634,3 +642,4 @@ span.debug, span.admin {
bottom: 19px;
font-size: 8pt;
}

Loading