Skip to content

Libraries #16

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

Merged
merged 5 commits into from
Aug 5, 2015
Merged

Libraries #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7b7fb2
Update login.html
Phrancis Aug 5, 2015
bc82f62
Update login.css
Phrancis Aug 5, 2015
9e17c6b
Update login.css
Phrancis Aug 5, 2015
af981b2
Update login.html
Phrancis Aug 5, 2015
b38c94c
Create login_alt.html
Phrancis Aug 5, 2015
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
231 changes: 231 additions & 0 deletions login/login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,234 @@
body {
font-size: 120%;
font-family: Verdana, Geneva, sans-serif;
}

/* FORMATTING SPECIFIC TO LOGIN FORM */

#server_other {
display: none;
}

.login-form {
font-size: 1.2em;
font-weight: normal;
width: 50%;
}

label {
font-size: 1.0em;
}

button, input, select, textarea {
font-size: 1.0em;
font-family: Verdana, Geneva, sans-serif;
padding-bottom; 0px;
}




/* FORMATTING FOR TOP NAV BAR */

.csh-top-link {
font-family: Georgia, Times, "Times New Roman", serif;
color: #FFFFFF;
font-size: 2em;
}

.csh-twitter-top-bar {
list-style: none;
margin: 0;
}

.csh-twitter-top-bar > li {
display: inline-block !important;
}

.twitter-logo {
height: 25px;
width: 30px;
margin-top: 10px;
-left: 5px;
}


/* FORMATTING FOR LEFT SIDE NAV MENU */

.csh-left-menu-main {
font-size: 1.4em;
font-weight: bold;
padding-top: 3px;
color: #000000;
margin: 0px;
}

.csh-left-menu-sub {
font-size: 1.2em;
font-weight: normal;
padding-left: 15px;
padding-top: 3px;
color: #000000;
margin: 0px;
}


.csh-nav-link {
color: #000000;
}

.csh-nav-link:hover
.csh-nav-link:active {
color: #000000;
text-decoration: underline;
}

.csh-side-nav {
margin-top: 25px;
background-color: #EEEEEE;
padding-bottom: 5px;
}


.csh-margin-top {
margin-top: 50px;
}

/* FORMATTING FOR PAGE BODY */

.csh-body {
padding-left: 15px;
}

/* FORMATTING FOR FOOTER */

html {
position: relative;
min-height: 100%;
}
body {
margin-bottom: 60px;
}

.footer {
position: absolute;
bottom: 0;
margin-top: 15px;
padding: 5px 0 5px 15px;
border-top: 1px solid #eaeaea;
color: #777;
width: 100%;
text-align: center;
/* Set the fixed height of the footer here */
height: 30px;
background-color: #f5f5f5;
position: absolute;
bottom: 0px;
}

/* FORMATTING FOR COMMON PAGE ELEMENTS */

.header-border {
border-bottom: 1px solid #eee;
}

h1, h2, h3, blockquote {
font-family: Georgia, Times, "Times New Roman", serif;
}

p, span, table, ul, ol {
font-size: 1.2em;
font-weight: normal;
}

pre {
font-family: Consolas, Monaco, "Courier New", monospace;
font-size: 1.1em;
font-weight: normal;
}

code {
font-family: Consolas, Monaco, "Courier New", monospace;
font-size: 1.1em;
color: #336699;
background-color: #EEEEEE;
}

blockquote {
font-size: 1.4em;
}

div.contributor {
margin-bottom: 10px;
margin-top: 10px;
width: 350px;
}

/* FORMATTING FOR ARTICLES */

article {}

h2.csh-article {
font-size: 2.4em;
text-decoration: underline;
}

h3.csh-article {
font-size: 2.0em;
}

a.csh-article {
text-decoration: underline;
}

section.csh-article {
padding-left: 5px;
}

p.csh-article-header {
font-size: 1.2em;
font-style: italic;
font-family: Georgia, Times, "Times New Roman", serif;
}

p.csh-article-content {
padding-left: 10px;
font-size: 1.2em;
}

p.csh-article-footer {
font-size: 1.2em;
padding-left: 5px;
font-style: italic;
font-family: Georgia, Times, "Times New Roman", serif;
}

ul.csh-article-list,
ol.csh-article-list {
font-size: 1.2em;
}


/* FORMATTING FOR TABLES */

table, th, td {
border: 1px solid black;
border-collapse: collapse;
}

th, td {
padding: 5px;
}

th {
background-color: #EEEEEE;
color: #000000;
}

/* FORMATTING FOR BUTTONS, ALERTS, ETC. */

.csh-button {
font-size: 1.1em;
font-weight: normal;
}

46 changes: 32 additions & 14 deletions login/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,61 @@
<html>

<head>
<title>Cardshifter -- Login</title>
<title>Cardshifter Login</title>

<!-- Link external libraries for page design via CDN -->
<link href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
<!-- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.0/css/font-awesome.css" rel="stylesheet" /> -->

<link rel="stylesheet" type="text/css" href="login.css">

<!-- load angular and angular route via CDN -->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.25/angular.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.25/angular-route.js"></script>
<script src="script.js"></script>
</head>

<body>
<div class="col-sm-9 col-md-10 main csh-body">
<noscript>To play CardShifter, please either enable JavaScript or use a JavaScript-enabled browser.</noscript>
<h1>Cardshifter login</h1>
<form name="login_information" id="login_information">
<label for="server">Server:</label>
<select name="server" id="server">
<form name="login_information" id="login_information" class="login-form">
<div class="form-group">
<label for="server" aria-label="Server">Server:</label>
<select name="server" id="server" class="form-control">
<option value="ws://127.0.0.1:4243">Local host</option>
<option value="ws://dwarftowers.com:4243">dwarftowers.com</option>
<option value="ws://echo.websocket.org/">WebSocket.org echo test</option>
<option value="other">Other...</option>
</select>
<br/>
</div>
<div class="form-group">
<div id="server_other">
<label for="server_other_input">Other Server:</label>
<input name="server_other_input" id="server_other_input" type="text" />
<input name="server_other_input" id="server_other_input" type="text" class="form-control" />
<br/>
<!-- Could localhost be secure too? (SirPython)-->
<label for="secure">Is secure server:</label>
<input name="secure" id="secure" type="checkbox" value="secure" />
<br/>
</div>
</div>
<div class="form-group">
<label for="username">Username:</label>
<input name="username" id="username" type="text" placeholder="Enter name..." />
<br/>
<input name="username" id="username" type="text" class="form-control" placeholder="Enter name..." />
</div>
<div class="form-group">
<label for="test_message">Test message to server:</label>
<br/>
<input name="test_message" id="test_message" type="text" size="100" placeholder="Optional... Leave blank unless using for testing." />
<br/>
<input name="submit" id="submit" type="button" value="Log in" />
<input name="test_websocket" id="test_websocket" type="button" value="Test WebSocket" />
<input name="test_message" id="test_message" type="text" size="100" class="form-control" placeholder="Optional... Leave blank unless using for testing." />
</div>
<div class="form-group">
<input name="submit" id="submit" type="button" value="Log in" class="btn btn-success" />
<input name="test_websocket" id="test_websocket" type="button" value="Test WebSocket" class="btn btn-primary" />
<input name="disconnect_websocket" id="disconnect_websocket" type="button" value="Disconnect WebSocket" class="btn btn-danger" />
</div>
</form>
<script src="login.js"></script>

</div>
</body>

</html>
Loading