Skip to content

Commit

Permalink
Added main codebase for version 2.
Browse files Browse the repository at this point in the history
  • Loading branch information
@EdDuarte
EdDuarte committed Nov 10, 2015
1 parent 96d172f commit adf6ac1
Show file tree
Hide file tree
Showing 43 changed files with 9,428 additions and 3,188 deletions.
196 changes: 141 additions & 55 deletions css/base.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,63 +14,135 @@
* limitations under the License.
*
* Living Globe v2.0.0
* Authors: Ed Duarte (edmiguelduarte@gmail.com) and Pedro Bordonhos (bordonhos@ua.pt)
* Authors: Ed Duarte (ed@edduarte.com) and Pedro Bordonhos (bordonhos@ua.pt)
*/

body {
background-color: #000000;
margin: 0px;
overflow: hidden;
margin: 0;
overflow: hidden;
}

h1, h2, h3, h4, h5, h6 {
font-family: 'Raleway', sans-serif;
font-family: 'Source Sans Pro', sans-serif;
}

div, p, button {
font-family: 'Raleway', sans-serif;
font-family: 'Source Sans Pro', sans-serif;
}

.label {
display: inline-block;
}

table.right {
width: auto;
margin-left: auto;
margin-right: 0px;
margin-right: 0;
}

.dropdown > .btn-default {
background:transparent;
width: 100%;
}

#timelineContainer {
/*font-size: 12px;*/
color: white;
position: fixed;
background: #242424;
left: 0;
right: 0;
bottom: 0;
width: 560px;
height: 80px;
padding-left: 30px;
padding-right: 30px;
padding-top: 30px;
margin-left: auto;
margin-right: auto;
margin-bottom: 0;
z-index: 2;
/*text-align: right;*/
/*line-height: 1.7em*/
}

#detailsContainer {
/*font-size: 12px;*/
color: white;
position: fixed;
/*bottom: 0;*/
margin-top: 30px;
left: 0;
font-size: 14px;
font-weight: bold;
/*margin-bottom: 290px;*/
margin-left: 30px;
margin-right: 30px;
padding: 10px;
width: 400px;
z-index: 2;
pointer-events: all;
/*text-align: right;*/
/*line-height: 1.7em*/
}

#parameters {
position: fixed;
left: 0;
bottom: 0;
margin: 6px;
width: 400px;
height: 415px;
font-size: 12px;
background-color: rgba(0, 0, 0, 0.5);
border-radius: 25px;
padding: 20px;
position: fixed;
left: 0;
top: 0;
margin-top: 50px;
margin-right: 20px;
width: 400px;
z-index: 2;
}

#credits {
width: 420px;
height: 120px;
bottom: 0;
right: 0;
margin: 20px;
position: fixed;
color: red;
font-size: 12px;
width: 420px;
height: 120px;
bottom: 0;
right: 0;
margin: 20px;
position: fixed;
color: red;
font-size: 12px;
}

#search {
width: 240px;
position: fixed;
top: 0;
left: 0;
margin: 6px;
width: 240px;
position: fixed;
top: 0;
left: 0;
margin: 6px;
}

#searchField {
width: 240px;
color: white;
background: transparent;
}

::-webkit-input-placeholder {
color: white;
}

:-moz-placeholder { /* Firefox 18- */
color: white;
}

::-moz-placeholder { /* Firefox 19+ */
color: white;
}

#searchfield {
width: 240px;
:-ms-input-placeholder {
color: white;
}

#grad1 {
width: 90px;
width: 90px;
height: 20px;
background: -webkit-linear-gradient(left, #FF2A2A, #23D723); /* For Safari 5.1 to 6.0 */
background: -o-linear-gradient(right, #FF2A2A, #23D723); /* For Opera 11.1 to 12.0 */
Expand All @@ -79,65 +151,79 @@ table.right {
}

#grad2 {
width: 90px;
width: 90px;
height: 20px;
background: -webkit-linear-gradient(left, #007aff , #ffd500); /* For Safari 5.1 to 6.0 */
background: -o-linear-gradient(right, #007aff, #ffd500); /* For Opera 11.1 to 12.0 */
background: -moz-linear-gradient(right, #007aff, #ffd500); /* For Firefox 3.6 to 15 */
background: linear-gradient(to right, #007aff , #ffd500); /* Standard syntax (must be last) */
}

#sliderPopulation .noUi-connect {
background: #007aff;
#sliderIndicator1 .noUi-connect {
background: rgba(0, 0, 0, 0.5);
}

#sliderDensity .noUi-connect {
background: #ffd500;
/*#sliderIndicator1 .noUi-handle {*/
/*border: 1px solid #D9D9D9;*/
/*border-radius: 3px;*/
/*width: 30px;*/
/*background: #bbb;*/
/*cursor: default;*/
/*box-shadow: inset 0 0 0 #FFF;*/
/*}*/

#sliderIndicator2 .noUi-connect {
background: -webkit-linear-gradient(left, #007aff , #ffd500); /* For Safari 5.1 to 6.0 */
background: -o-linear-gradient(right, #007aff, #ffd500); /* For Opera 11.1 to 12.0 */
background: -moz-linear-gradient(right, #007aff, #ffd500); /* For Firefox 3.6 to 15 */
background: linear-gradient(to right, #007aff , #ffd500); /* Standard syntax (must be last) */
}

#sliderBirth .noUi-connect {
background: #23D723;
#sliderIndicator3 .noUi-connect {
background: -webkit-linear-gradient(left, #FF2A2A, #23D723); /* For Safari 5.1 to 6.0 */
background: -o-linear-gradient(right, #FF2A2A, #23D723); /* For Opera 11.1 to 12.0 */
background: -moz-linear-gradient(right, #FF2A2A, #23D723); /* For Firefox 3.6 to 15 */
background: linear-gradient(to right, #FF2A2A , #23D723); /* Standard syntax (must be last) */
}

#sliderDeath .noUi-connect {
background: #FF2A2A;
background: #FF2A2A;
}

.autocomplete-suggestions {
font-weight: normal;
font-size: 18px;
background: #34495E;
overflow: auto;
font-weight: normal;
font-size: 18px;
background: #34495E;
overflow: auto;
}

.autocomplete-suggestion {
color: #ddd;
padding: 2px 5px;
white-space: nowrap;
overflow: hidden;
padding: 10px;
color: #ddd;
white-space: nowrap;
overflow: hidden;
padding: 10px;
}

.autocomplete-selected {
color: #ddd;
background: #20374D;
color: #ddd;
background: #20374D;
}

.autocomplete-suggestions strong {
font-weight: 900;
color: #ddd;
font-weight: 900;
color: #ddd;
}

.autocomplete-selected strong {
font-weight: 900;
color: #ddd;
font-weight: 900;
color: #ddd;
}

.autocomplete-group {
padding: 2px 5px;
padding: 2px 5px;
}

.autocomplete-group strong {
display: block;
border-bottom: 1px solid #000;
display: block;
border-bottom: 1px solid #000;
}
9 changes: 0 additions & 9 deletions css/lib/bootstrap.min.css
View file

This file was deleted.

4 changes: 0 additions & 4 deletions css/lib/jquery.nouislider.min.css
View file

This file was deleted.

Loading

0 comments on commit adf6ac1

Please sign in to comment.