Skip to content

File changed #22

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

Open
harshkraj wants to merge 3 commits into
base: master
Choose a base branch
from
Open

File changed #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2bc5f2
File changed
harshkraj Oct 31, 2016
1f05d0c
errors resolved
harshkraj Oct 31, 2016
7e27c6e
Modified style.css with better UI and fixed positions
harshkraj Oct 31, 2016
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
People
======
A simple minimal web-based client for finding people at Jacobs University Bremen.
This is an open source project.
4 changes: 2 additions & 2 deletions js/stalk.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ var descriptions = {
"major" : "studies ",
"phone" : "phone: ",
"room" : function(rm) {
return (rm.match("^[N|C|M|K|A|B|C|D]{2}-[0-9]{3}$") ? "lives in " : "room: ") + rm
return (rm.match("^[N|C|M|K|A|B|C|D]{2}-[0-9]{3}$") ? "lives in " : "room: ") + rm;
},
"country" : "from "
"country" : "from ";
}

function loggedIn() {
Expand Down
25 changes: 3 additions & 22 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
body {
margin: 0;
padding: 0;

font-family: sans-serif;
}

#overlay {
position: fixed;
padding-top: 10%;

left: 0;
top: 0;
width: 100%;
height: 100%;

z-index: 2000;

background: white;
display: none;

text-align: center;
}

Expand All @@ -34,9 +29,8 @@ body {
}

#frame img {
width: 96px;
width: 98px;
height: 128px;

margin: 0;
padding: 0;
}
Expand All @@ -51,19 +45,15 @@ body {

#spinner {
margin: auto;
display: none;
position: fixed;

top: 50%;
left: 50%;
}

#frame {
display: flex;
/* align-items: center; */
justify-content: center;
flex-wrap: wrap;

padding-top: 128px;
padding-left: 5%;
padding-right: 5%;
Expand All @@ -78,11 +68,9 @@ div.highlight a {
color: inherit;
}

/*
#frame img {
display: none;
}
*/

#privacy-text {
margin-top: 1em;
Expand Down Expand Up @@ -112,11 +100,8 @@ div.highlight a {

#search {
position: fixed;

width: 75%;

opacity: 0.85;

font-size: 24pt;
border-style: none;
outline: none;
Expand Down Expand Up @@ -152,7 +137,6 @@ div.highlight a {

#credits {
position: fixed;

right: 0.5em;
bottom: 0.5em;
color: lightgray;
Expand All @@ -166,26 +150,23 @@ div.highlight a {
div.highlight {
position: absolute;
padding: 8px 8px 8px 8px;

margin-top: -8px;
margin-left: -8px;

max-width: 192px;

-webkit-box-shadow: 0 0 20px 1px rgba(0,0,0,1);
-moz-box-shadow: 0 0 20px 1px rgba(0,0,0,1);
box-shadow: 0 0 20px 1px rgba(0,0,0,1);
}

div.highlight ul {
list-style: none;
padding: 0;
padding: 0em;
}

div.highlight ul li {
padding-bottom: 0.5em;
}

div.highlight ul li:last-child {
padding-bottom: 0;
padding-bottom: 0em;
}