Skip to content

Commit

Permalink
1.1 -- Fixed Broken Collaborativness among other small changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Mulletfingers999 committed May 3, 2015
1 parent 9c9cd3d commit 5b1f363
Show file tree
Hide file tree
Showing 16 changed files with 3,702 additions and 189 deletions.
Binary file added cdn/1.1.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
115 changes: 115 additions & 0 deletions cdn/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
@font-face {
font-family: 'Montserrat';
font-style: normal;
font-weight: 400;
src: local('Montserrat-Regular'), url(http://fonts.gstatic.com/s/montserrat/v5/a86E68pmIj0EJimMSgdgN_esZW2xOQ-xsNqO47m55DA.woff2) format('woff2');
}

#main {
margin: 5em;
}

a {
color: white;
}

div.section {
background: transparent;
font-family: 'Montserrat', Arial;
color: white;
text-align: center;
font-weight: bold;
font-size: 20px;
border: 5px solid white;
border-radius: 15px;
}

h1 {
font-size: 40px;
}

hr {
border-style: solid;
color: white;
}

html {
background: url(../cdn/bg.png) no-repeat center center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
}

sup {
color: blue;
}

select {
background-color: transparent;
border: 4px solid white;
color: white;
-webkit-appearance: button;
-moz-appearance: none;
appearance: button;
display: inline-block;
padding: 6px 30px 6px 15px;
font-family: 'Montserrat', Arial;
font-size: 15px;
cursor: pointer;
}

option {
background-color: rgb(80, 23, 140);
}

button, input[type=submit] {
display: inline-block;
padding: 6px 30px 6px;
font-family: 'Montserrat', Arial;
font-size: 15px;
cursor: pointer;
background-color: transparent;
border: 4px solid white;
color: white;
font-weight: 900;
}

.select-arrow {
display: inline-block;
position: absolute;
margin: .9em 0 0 -1.55em;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
border-top: 8px solid white;
}

#toggle {
background-color: aquamarine;
padding: 2px 5px;
cursor: pointer;
position: fixed;
top : 40%;
left: 0px;
color: white;
border-radius: 0px 10px 10px 0px;
}

#sidebar {
position: fixed;
left: -16.5em;
top: 0px;
width: 25%;
height: 99%;
border-radius: 0px;
background-color: rgb(80, 23, 140);
}

footer {
text-align: center;
font-size: 10px;
color: white;
position: relative;
top: -50px;
line-height: 200%;
}
1 change: 1 addition & 0 deletions cdn/toggle.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#toggle{background-color: aquamarine;padding: 2px 5px;cursor: pointer;position: fixed;top : 40%;left: 0px;color: white;border-radius: 0px 10px 10px 0px;}
14 changes: 14 additions & 0 deletions cdn/toggle.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
$("#toggle").html('&#9679;<br>&#9679;<br>&#9679;<br>');
//Child iFrame Function
function changeUrl(url) {
$('iframe').attr('src', url);
}
$("#toggle").toggle(
function () {
$("#sidebar").animate({left: 0});
$("#toggle").animate({left: '25.8%'});
}, function () {
$("#sidebar").animate({left: '-16.5em'});
$("#toggle").animate({left: 0});
}
);
10 changes: 9 additions & 1 deletion contact/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,12 @@
body {
font-family: Arial;
}
</style>

.contact-list {
display: none;
}

a {
display: none;
}
</style>
10 changes: 6 additions & 4 deletions docs/document/hash/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<script src="https://cdn.firebase.com/js/client/2.2.3/firebase.js"></script>

<!-- CODEMIRROR -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.1.0/codemirror.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.1.0/codemirror.css" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.css" />
<link rel="stylesheet" href="../../tools/CodeMirror/theme/mdn-like.css" />

<!-- Firepad -->
Expand Down Expand Up @@ -1034,8 +1034,10 @@ function video() {
}

firebaseUserName.child('name').once('value', function (snapshot) {
$('#uname').text(snapshot.val());
$('.firepad-userlist-name-input').val(snapshot.val());
if (snapshot.val() != null) {
$('#uname').text(snapshot.val());
$('.firepad-userlist-name-input').val(snapshot.val());
}
});

});
Expand Down
Loading

0 comments on commit 5b1f363

Please sign in to comment.