Skip to content

Commit

Permalink
Separate css and html
Browse files Browse the repository at this point in the history
resolve #6
  • Loading branch information
josselinchevalay committed Nov 1, 2018
1 parent 8c2b61f commit 069b1be
Show file tree
Hide file tree
Showing 9 changed files with 201 additions and 426 deletions.
55 changes: 5 additions & 50 deletions devices.html
Expand Up @@ -25,52 +25,7 @@
<link rel="stylesheet" href="styles/extras.1.1.0.min.css">
<link rel="stylesheet" href="styles/example.css">
<link rel="stylesheet" href="styles/shards.min.css">
<style type="text/css">
#customBtn {
display: inline-block;
background: white;
color: #444;
width: 190px;
border-radius: 5px;
border: thin solid #888;
box-shadow: 1px 1px 1px grey;
white-space: nowrap;
}
#customBtn:hover {
cursor: pointer;
}
span.label {
font-family: serif;
font-weight: normal;
}

span.buttonText {
display: inline-block;
vertical-align: middle;
padding-left: 42px;
padding-right: 42px;
font-size: 14px;
font-weight: bold;
/* Use the Roboto font that is loaded in the <head> */
font-family: 'Roboto', sans-serif;
}


.share {
text-align: right;
}

#dropdownMenuLink:hover {
background: #dfebf6;
}
#clipboard{
position:absolute;
left:-9999px;
}
#documents{
background-color: #f5f6f8;
}
</style>
<link rel="stylesheet" href="styles/style.css">

<!--FIREBASE-->
<script src="https://www.gstatic.com/firebasejs/5.4.2/firebase.js"></script>
Expand Down Expand Up @@ -108,7 +63,7 @@ <h5 class="my-2">Help us Grow</h5>
<div class="spinner"></div>
</div>
</div>

</div>
<div class="color-switcher-toggle animated pulse infinite">
<i class="material-icons">share</i>
Expand Down Expand Up @@ -296,7 +251,7 @@ <h3 id="folderHolderTitle" class="page-title">Devices Used</h3>


<div id="folderHolder">

</div>
</div>

Expand Down Expand Up @@ -347,7 +302,7 @@ <h6 id="upload_status_text"><font color="white">&nbsp;&nbsp;Link copied to clipb
</center>
</div>
</div>

<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
<script src="scripts/shards.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
Expand All @@ -361,4 +316,4 @@ <h6 id="upload_status_text"><font color="white">&nbsp;&nbsp;Link copied to clipb
<script src="scripts/devices.js"></script>

</body>
</html>
</html>
112 changes: 10 additions & 102 deletions index.html
Expand Up @@ -26,99 +26,7 @@
<link rel="stylesheet" href="styles/example.css">
<link rel="stylesheet" href="styles/shards.min.css">
<link rel="stylesheet" href="styles/glightbox.min.css">
<style type="text/css">
#customBtn {
display: inline-block;
background: white;
color: #444;
width: 190px;
border-radius: 5px;
border: thin solid #888;
box-shadow: 1px 1px 1px grey;
white-space: nowrap;
}
#customBtn:hover {
cursor: pointer;
}
span.label {
font-family: serif;
font-weight: normal;
}

span.buttonText {
display: inline-block;
vertical-align: middle;
padding-left: 42px;
padding-right: 42px;
font-size: 14px;
font-weight: bold;
/* Use the Roboto font that is loaded in the <head> */
font-family: 'Roboto', sans-serif;
}


.share {
text-align: right;
}

#dropdownMenuLink:hover {
background: #dfebf6;
}
#clipboard{
position:absolute;
left:-9999px;
}
.custom-menu {
display: none;
z-index: 1000;
position: absolute;
overflow: hidden;
border: 1px solid #CCC;
white-space: nowrap;
font-family: sans-serif;
background: #FFF;
color: #333;
border-radius: 5px;
padding: 0;
}

/* Each of the items in the list */
.custom-menu li {
padding: 8px 12px;
cursor: pointer;
list-style-type: none;
transition: all .3s ease;
user-select: none;
}

.custom-menu li:hover {
background-color: #DEF;
}
.directoryTitle {
cursor: pointer;
}
.card{
cursor: pointer;
}
#documents{
background-color: #f5f6f8;
}
.dot {
height: 10px;
width: 10px;
background-color: #f2f2f2;
border-radius: 50%;
display: inline-block;
}
.dot_active {
height: 10px;
width: 10px;
background-color: #bbb;
border-radius: 50%;
display: inline-block;
}
</style>

<link rel="stylesheet" href="styles/style.css">
<!--FIREBASE-->
<script src="https://www.gstatic.com/firebasejs/5.4.2/firebase.js"></script>

Expand Down Expand Up @@ -155,7 +63,7 @@ <h5 class="my-2">Help us Grow</h5>
<div class="spinner"></div>
</div>
</div>

</div>

<div class="color-switcher-toggle animated pulse infinite">
Expand Down Expand Up @@ -252,7 +160,7 @@ <h5 class="my-2">Help us Grow</h5>
</div>
</a>
<div class="dropdown-menu dropdown-menu-small">

<a class="dropdown-item" href="#" data-toggle="modal" data-target="#emailModal" onclick="restoreEmailModal()">
<i class="material-icons">email</i>Share via email</a>
</label>
Expand All @@ -272,7 +180,7 @@ <h5 class="my-2">Help us Grow</h5>
</div>
</a>
<div class="dropdown-menu dropdown-menu-small">

<a class="dropdown-item" href="#">
<form onSubmit={this.onSubmit} id="uploadForm" action="" method="post" enctype="multipart/form-data"><label for="addFolderCard">
<i class="material-icons">create_new_folder</i>New Folder</a>
Expand Down Expand Up @@ -468,10 +376,10 @@ <h5><b>Security</b></h5>
</div>
</div>
<span id="startIntro" data-toggle="modal" data-target="#introModal"></span>


<div id="folderHolder">

</div>
</div>

Expand All @@ -485,13 +393,13 @@ <h5>Files</h5>

<!-- End Small Stats Blocks -->
<div id="fileHolder">

</div>
</div>
</div>
</div>
</div>

<footer class="main-footer d-flex p-2 px-3 bg-white border-top">
<ul class="nav">
<li class="nav-item">
Expand Down Expand Up @@ -540,7 +448,7 @@ <h6 id="upload_status_text"><font color="white">&nbsp;&nbsp;Link copied to clipb
</div>
</div>
<iframe id="my_iframe" style="display:none;"></iframe>


<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
<script src="scripts/shards.min.js"></script>
Expand Down Expand Up @@ -572,4 +480,4 @@ <h6 id="upload_status_text"><font color="white">&nbsp;&nbsp;Link copied to clipb
});
</script>
</body>
</html>
</html>
57 changes: 11 additions & 46 deletions login.html
Expand Up @@ -17,54 +17,19 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link rel="stylesheet" href="styles/shards.min.css">
<link rel="stylesheet" type="text/css" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<style type="text/css">
#customBtn {
display: inline-block;
background: white;
color: #444;
width: 190px;
border-radius: 5px;
border: thin solid #888;
box-shadow: 1px 1px 1px grey;
white-space: nowrap;
}
#customBtn:hover {
cursor: pointer;
}
span.label {
font-family: serif;
font-weight: normal;
}

span.buttonText {
display: inline-block;
vertical-align: middle;
padding-left: 42px;
padding-right: 42px;
font-size: 14px;
font-weight: bold;
/* Use the Roboto font that is loaded in the <head> */
font-family: 'Roboto', sans-serif;
}
#forgot_password{
cursor: pointer;
}
#password_view{
cursor: pointer;
}
</style>
<link rel="stylesheet" href="styles/app-loading.min.css?v=0.0.5">
<script src="https://www.gstatic.com/firebasejs/5.4.2/firebase.js"></script>
<link rel="stylesheet" href="style.css">
<link rel="stylesheet" href="styles/app-loading.min.css?v=0.0.5">
<script src="https://www.gstatic.com/firebasejs/5.4.2/firebase.js"></script>
</head>
<body>
<center>
<div class="col-12 col-sm-4 text-center mb-0">


<div class="card" style="margin-top : 40px">
<div class="card-body">
<h4><font color="#0071f7"> ClusterLabs </font></h4>

<h5><b>Sign In</b></h5>
<h6>to continue to IpfsCloud</h6>
<br>
Expand All @@ -85,7 +50,7 @@ <h6>or continue using</h6>
<span class="buttonText">Google</span>
</div>
</div>

<!-- <div id="gSignInWrapper" style="padding-top: 10px">
<div id="customBtn" class="customGPlusSignIn" onclick="signInViaGoogle()">
&nbsp;&nbsp;<span class="icon"><img src="./images/facebook.png" width="42px" height="38px"></span>
Expand All @@ -94,9 +59,9 @@ <h6>or continue using</h6>
</div> -->

<div style="margin-top: 16px">
<font size="2">Not your computer? Use Guest mode to sign in privately.</font>
<font size="2">Not your computer? Use Guest mode to sign in privately.</font>
</div>

<div id="anonymousSignInWrapper" style="padding-top: 16px">
<div id="customBtn" class="customGPlusSignIn" onclick="signInViaGoogle()">
&nbsp;&nbsp;<span class="icon"><img src="./images/anonymous.png" width="42px" height="38px"></span>
Expand All @@ -119,7 +84,7 @@ <h6>or continue using</h6>
</table>
</div>
</div>

</div>
</center>
<!-- Optional JavaScript -->
Expand All @@ -131,4 +96,4 @@ <h6>or continue using</h6>
<script src="scripts/app-loading.min.js?v=0.0.5"></script>
<script src="scripts/login.js"></script>
</body>
</html>
</html>

0 comments on commit 069b1be

Please sign in to comment.