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.

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

Mobile friendly layout #68

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "1.0.0",
"author": "",
"dependencies": {
"express": ">=3.0",
"express": "=3.0",
"underscore": "",
"uglify-js": "=2.2.5",
"ws": ">=0.4",
Expand Down
106 changes: 72 additions & 34 deletions sharefest/public/css/main_new.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
html {
height: 100%;
}
body {
background-color: rgba(20, 20, 20, 1);
color: #f5f5f5;
height: 100%;
}
h3 {
font-size: 20px;
Expand All @@ -15,16 +19,8 @@ ul {
}

.bg {
/*background: url('http://subtlepatterns.com/patterns/random_grey_variations.png');*/
/*background: url('/img/grey.png');*/
/*background: url('http://farm9.staticflickr.com/8514/8478065248_d23f9241ee_h.jpg');*/
/*background: url('http://farm3.staticflickr.com/2607/4016909843_185db132df_b.jpg');*/
/*background: url('http://farm9.staticflickr.com/8358/8394528614_413e2c5636_o.jpg');*/
background: url('/img/back-dark.jpg') fixed;
background-size: cover;

/*background: url('http://farm5.staticflickr.com/4135/4755887601_5a0b7d00b3_b.jpg');*/
/*background: url('http://farm5.staticflickr.com/4061/4270706290_8e2c0017bc_o.jpg');*/
}

.bgTerms {
Expand All @@ -38,12 +34,15 @@ ul {
height: auto;
}

/* positioned below navbar with some margin */
.container {
position: absolute;
position: relative;
display: block;
margin: auto;
width: 800px;
height: 97%;
padding-top: calc(40px + 5%);
padding-left: 5em;
box-sizing: border-box;
width: 100%;
height: 100%;
}

.static-container {
Expand Down Expand Up @@ -129,23 +128,23 @@ ul {
-o-transition: width 1s, height 1s, background-color 1s, -o-transform 1s;
transition: width 1s, height 1s, background-color 1s, transform 1s;

width: 81%;
box-sizing: border-box;
margin: 1em 5% 1em 0;
width: calc(100% - 350px - 5%);
max-width: 750px;
height: 70%;
min-height: 330px;
border: 2px solid #DDD;
line-height: 30px;
text-align: center;
font-weight: bold;
/*background-color: #FFFFFF;*/
background-color: rgba(255, 255, 255, 0.65);
/*opacity: 0.75;*/
position: absolute;
display: block;
top: 4%;
left: 0;
bottom: 0;
right: 0;
margin: auto;
cursor: cell;
position: relative;
float: left;
}

.termsHref {
Expand Down Expand Up @@ -184,14 +183,11 @@ ul {
}

.right_floater {
position: absolute;
float: left;
line-height: 30px;
top: 20%;
left: 839px;
margin: auto;
width: 350px;
color: whitesmoke;
vertical-align: bottom;
margin-top: 3em;
}

.beta_floater {
Expand All @@ -212,18 +208,8 @@ ul {
}

.footer {
position: absolute;
bottom: 7%;
left: 10%;
clear: both;
color: #DDDDDD;
/*font-family: cursive;*/
/**/
/*position: absolute;*/
/*bottom: 1%;*/
/*right:1%;*/
/*clear:both;*/
/*color: #DDDDDD;*/
}

.textDrag {
Expand All @@ -244,3 +230,55 @@ ul {
margin-top: 8px;
}

/* hide #files input */
#files {
position: absolute;
top: -10em;
}

/* --------------------------------
narrow (probably phone)
*/
@media screen and (max-width: 480px)
{
.bg {
background: black;
}
.dragdrop {
padding: 1em .5em;
height: auto;
}
.textDrag {
position: static;
height: auto;
}
}

/* --------------------------------
half-screen or tablet
*/
@media screen and (max-width: 980px)
{
.container {
position: relative;
display: block;
padding: 80px 2em 2em;
box-sizing: border-box;
width: 100%;
height: 100%;
}
.dragdrop {
margin: 0;
max-width: none;
width: 100%;
height: auto;
position: relative;
float: none;
}

.right_floater {
float: none;
max-width: 350px;
width: auto;
}
}
Binary file modified sharefest/public/img/back-dark.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions sharefest/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<title>Sharefest</title>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta property="og:description" content="Sharefest is a free service to send files directly">
<meta name="description" content="Sharefest is a free service to send files directly">
<!-- Bootstrap -->
Expand Down