zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-07-01 00:23:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

more work on stats view

Browse source
This commit is contained in:
Kyle Drake 2015-06-04 03:08:39 -07:00
parent 64ebf70b31
commit 453e762f8c
2 changed files with 169 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

180
sass/_project-sass/_project-Main.scss
View file

@ -7,18 +7,18 @@
background:#f6f0e6; background:#f6f0e6;
min-height:500px; min-height:500px;
padding-bottom:50px; padding-bottom:50px;
h1, h2, h3, h4, h5, h6{ h1, h2, h3, h4, h5, h6{
color:#e93250 color:#e93250
} }
} }
.content, .footer-Content { .content, .footer-Content {
padding: 20px 3%; padding: 20px 3%;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
padding: 20px 7%; padding: 20px 7%;
} }
@media screen and (min-width:1300px){ @media screen and (min-width:1300px){
padding: 20px 0; padding: 20px 0;
} }
@ -34,7 +34,7 @@
.interior .header-Outro { .interior .header-Outro {
padding-top: 30px; padding-top: 30px;
overflow: hidden; overflow: hidden;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
padding-top: 15px; padding-top: 15px;
} }
@ -47,13 +47,13 @@
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
float: right; float: right;
width: 35%; width: 35%;
.col-50 { .col-50 {
width:100%; width:100%;
margin-bottom: 1em!important; margin-bottom: 1em!important;
} }
} }
} }
.site-url { .site-url {
font-size:18px; font-size:18px;
@ -78,11 +78,11 @@
-webkit-box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10); -webkit-box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10);
box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10); box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10);
padding: 25px 3% 40px 3%; padding: 25px 3% 40px 3%;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
padding: 22px 7% 40px 7%; padding: 22px 7% 40px 7%;
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
margin-top: 1em; margin-top: 1em;
&:first-child { &:first-child {
@ -122,19 +122,19 @@
} }
.site-url { .site-url {
margin-top: -9px; margin-top: -9px;
} }
.btn-Action { .btn-Action {
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
padding: 7px 15px; padding: 7px 15px;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
margin: 6px 0px 8px; margin: 6px 0px 8px;
} }
} }
.row.content { .row.content {
margin-left: 6%; margin-left: 6%;
margin-right: 6%; margin-right: 6%;
} }
} }
.interior .header-Outro a {color:#E93250} .interior .header-Outro a {color:#E93250}
@ -151,7 +151,7 @@
-webkit-box-shadow: 1px 2px 5px 2px rgba(0,0,0,0.10); -webkit-box-shadow: 1px 2px 5px 2px rgba(0,0,0,0.10);
box-shadow: 1px 2px 5px 2px rgba(0,0,0,0.10); box-shadow: 1px 2px 5px 2px rgba(0,0,0,0.10);
border: 4px solid white; border: 4px solid white;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
margin: 0 auto; margin: 0 auto;
} }
@ -165,7 +165,7 @@
-webkit-background-size:cover; -webkit-background-size:cover;
background-size:cover; background-size:cover;
background-position: center top; background-position: center top;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
width: 100%; width: 100%;
height: 300px; height: 300px;
@ -203,7 +203,7 @@
} }
.interior .header-Outro.dashboard .col-50:nth-of-type(2) { .interior .header-Outro.dashboard .col-50:nth-of-type(2) {
float: left; float: left;
@media (max-device-width: 480px), screen and (max-width: 800px) { @media (max-device-width: 480px), screen and (max-width: 800px) {
margin-left: 22px; margin-left: 22px;
margin-top: 18px; margin-top: 18px;
@ -215,7 +215,7 @@
background-size: 77px 81px; background-size: 77px 81px;
padding: 20px 20px 20px 111px; padding: 20px 20px 20px 111px;
margin-bottom: 13px; margin-bottom: 13px;
@media (max-device-width: 480px), screen and (max-width: 800px) { @media (max-device-width: 480px), screen and (max-width: 800px) {
padding: 111px 20px 20px 20px; padding: 111px 20px 20px 20px;
background-position: center 20px; background-position: center 20px;
@ -262,7 +262,7 @@
} }
.files .btn-Action { .files .btn-Action {
margin-left: 8px; margin-left: 8px;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
margin: 4px 8px 4px 0; margin: 4px 8px 4px 0;
} }
@ -283,7 +283,7 @@
} }
.files .list .upload-Boundary.with-instruction { .files .list .upload-Boundary.with-instruction {
background: url(/img/drag-drop.png) no-repeat center center; background: url(/img/drag-drop.png) no-repeat center center;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
background: 0; background: 0;
} }
@ -312,7 +312,7 @@
margin-bottom: 2px; margin-bottom: 2px;
} }
.files .progress-bar { .files .progress-bar {
background:#CCCCCC; background:#CCCCCC;
-webkit-border-radius: 8px; -webkit-border-radius: 8px;
-moz-border-radius: 8px; -moz-border-radius: 8px;
border-radius: 8px; border-radius: 8px;
@ -472,7 +472,7 @@
position: relative; position: relative;
clear: both; clear: both;
width: 100%; width: 100%;
h2:first-of-type, h3:first-of-type { h2:first-of-type, h3:first-of-type {
margin-top: 0; margin-top: 0;
} }
@ -516,7 +516,7 @@
width: 66.95%; width: 66.95%;
left: 33.05%; left: 33.05%;
background: white; background: white;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
width: 100%; width: 100%;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
@ -526,14 +526,14 @@
.site-profile .content.misc-page.columns .col-66 { .site-profile .content.misc-page.columns .col-66 {
padding: 0; padding: 0;
min-height: 38em; min-height: 38em;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
min-height: 0px; min-height: 0px;
} }
} }
.news-feed .content.misc-page.columns .col-66 { .news-feed .content.misc-page.columns .col-66 {
min-height: 56em; min-height: 56em;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
min-height: 0; min-height: 0;
} }
@ -542,14 +542,14 @@
width: 33%; width: 33%;
left: 33%; left: 33%;
float: right; float: right;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
width: 100%; width: 100%;
} }
} }
.interior .header-Outro.with-columns { .interior .header-Outro.with-columns {
padding-top: 22px; padding-top: 22px;
} }
.interior .header-Outro.with-columns h3 { .interior .header-Outro.with-columns h3 {
float: left; float: left;
margin-bottom: 0; margin-bottom: 0;
@ -560,14 +560,14 @@
} }
.interior .header-Outro.with-columns .col { .interior .header-Outro.with-columns .col {
padding: 25px 0 8px 30px; padding: 25px 0 8px 30px;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
padding: 10px 0 0 27px; padding: 10px 0 0 27px;
} }
} }
.interior .header-Outro.with-columns .col-32 { .interior .header-Outro.with-columns .col-32 {
width: 33%; width: 33%;
h3 { h3 {
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
display: none; display: none;
@ -583,10 +583,10 @@
.interior .header-Outro.with-columns .col-66 { .interior .header-Outro.with-columns .col-66 {
width: 67%; width: 67%;
border-right: 1px solid #0B0F11; border-right: 1px solid #0B0F11;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
border-right: 0; border-right: 0;
padding: 15px 0 27px 30px; padding: 15px 0 27px 30px;
} }
} }
.interior .header-Outro.with-columns .col-32 .edit { .interior .header-Outro.with-columns .col-32 .edit {
@ -600,7 +600,7 @@
margin-top: 1.4em; margin-top: 1.4em;
font-size: 0.8em; font-size: 0.8em;
margin-left: 1.5em; margin-left: 1.5em;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
margin: 0; margin: 0;
clear: left; clear: left;
@ -635,7 +635,7 @@
background-size: cover; background-size: cover;
float: left; float: left;
margin-bottom: 20px; margin-bottom: 20px;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
width: 60%; width: 60%;
} }
@ -661,11 +661,11 @@
clear: both; clear: both;
margin: 20px auto 2em auto; margin: 20px auto 2em auto;
text-align: center; text-align: center;
.btn-Action:last-child { .btn-Action:last-child {
margin-left: 10px; margin-left: 10px;
} }
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
text-align: left; text-align: left;
} }
@ -750,7 +750,7 @@ a.tag:hover {
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.news-item .icon-mini { .news-item .icon-mini {
} }
.news-item.update .icon { .news-item.update .icon {
background: #E93250; background: #E93250;
@ -797,7 +797,7 @@ a.tag:hover {
float: left; float: left;
width: 100%; width: 100%;
} }
.news-item .file a:hover { .news-item .file a:hover {
text-decoration: none; text-decoration: none;
} }
.news-item .html-thumbnail { .news-item .html-thumbnail {
@ -863,7 +863,7 @@ a.tag:hover {
.signup-Area.large { .signup-Area.large {
width: 418px; width: 418px;
height: 236px; height: 236px;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
height: auto; height: auto;
} }
@ -894,14 +894,14 @@ a.tag:hover {
a:first-of-type { a:first-of-type {
margin-left: 0; margin-left: 0;
} }
} }
.interior .header-Outro .stats { .interior .header-Outro .stats {
margin-bottom: 1.3em; margin-bottom: 1.3em;
float: left; float: left;
width: 100%; width: 100%;
margin-top: 1.9em; margin-top: 1.9em;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
float: none; float: none;
width: 270px; width: 270px;
@ -925,7 +925,7 @@ a.tag:hover {
text-align: center; text-align: center;
margin-right: 28px; margin-right: 28px;
color: #84997E; color: #84997E;
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
margin: 0; margin: 0;
width: 90px; width: 90px;
@ -941,21 +941,21 @@ a.tag:hover {
.following { .following {
display: none; display: none;
} }
.unfollow { .unfollow {
display: none; display: none;
} }
} }
#followLink.is-following { #followLink.is-following {
.follow { .follow {
display: none; display: none;
} }
.following { .following {
display: block; display: block;
width: 5.9em; width: 5.9em;
} }
.unfollow { .unfollow {
display: none; display: none;
} }
} }
@ -963,10 +963,10 @@ a.tag:hover {
.follow { .follow {
display: none; display: none;
} }
.following { .following {
display: none; display: none;
} }
.unfollow { .unfollow {
display: block; display: block;
width: 5.9em; width: 5.9em;
} }
@ -997,7 +997,7 @@ a.tag:hover {
border: 3px solid white; border: 3px solid white;
-webkit-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3); -webkit-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3);
-moz-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3); -moz-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3);
box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3); box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3);
width: 72px; width: 72px;
} }
.archives img { .archives img {
@ -1014,11 +1014,11 @@ a.tag:hover {
width: 100%; width: 100%;
padding: 20px 0 15px 30px; padding: 20px 0 15px 30px;
margin: 0 0 3px 0; margin: 0 0 3px 0;
input { input {
width: 86%; width: 86%;
float: left; float: left;
@media (max-width:950px) { @media (max-width:950px) {
width: 82%; width: 82%;
} }
@ -1031,7 +1031,7 @@ a.tag:hover {
.comment-policy { .comment-policy {
font-style: italic; font-style: italic;
font-size: .8em; font-size: .8em;
margin-right: 45px; margin-right: 45px;
clear: both; clear: both;
margin-top: 2em; margin-top: 2em;
} }
@ -1096,11 +1096,11 @@ a.tag:hover {
.row { .row {
margin: 5.5em 10%; margin: 5.5em 10%;
padding: 0; padding: 0;
@media (max-device-width:480px), screen and (max-width:800px){ @media (max-device-width:480px), screen and (max-width:800px){
margin: 4em 5%; margin: 4em 5%;
} }
&:first-of-type { &:first-of-type {
margin-top: 3.5em; margin-top: 3.5em;
} }
@ -1114,7 +1114,7 @@ a.tag:hover {
padding-top: 2em; padding-top: 2em;
float: left; float: left;
} }
@media (max-device-width:480px), screen and (max-width:800px){ @media (max-device-width:480px), screen and (max-width:800px){
width: 100%; width: 100%;
padding-right: 0px; padding-right: 0px;
@ -1129,7 +1129,7 @@ a.tag:hover {
background-repeat: no-repeat; background-repeat: no-repeat;
border: 13px solid #4f7d88; border: 13px solid #4f7d88;
@include box-shadow(1px 1px 2px 0px rgba(0, 0, 0, 0.18)); @include box-shadow(1px 1px 2px 0px rgba(0, 0, 0, 0.18));
} }
&:nth-child(3) .screenshot { &:nth-child(3) .screenshot {
border: 13px solid $c-Brand-1; border: 13px solid $c-Brand-1;
@ -1160,7 +1160,7 @@ a.tag:hover {
border-bottom: 1px solid #801629; border-bottom: 1px solid #801629;
padding: 30px 0; padding: 30px 0;
position: relative; position: relative;
h2.delta { h2.delta {
color: white; color: white;
margin: 0; margin: 0;
@ -1195,7 +1195,7 @@ a.tag:hover {
} }
.section.instructor-quotes { .section.instructor-quotes {
background: #971D31; background: #971D31;
h2, h3, p { h2, h3, p {
color: #fff; color: #fff;
text-align: left; text-align: left;
@ -1218,7 +1218,7 @@ a.tag:hover {
.section.features { .section.features {
background: #4F7E89; background: #4F7E89;
text-align: center; text-align: center;
.row:first-of-type { .row:first-of-type {
margin-bottom: 0; margin-bottom: 0;
} }
@ -1231,7 +1231,7 @@ a.tag:hover {
} }
.section.features .col { .section.features .col {
padding-left: 40px; padding-left: 40px;
@media (max-device-width:480px), screen and (max-width:800px){ @media (max-device-width:480px), screen and (max-width:800px){
padding-left: 20px; padding-left: 20px;
width: 100%; width: 100%;
@ -1265,7 +1265,7 @@ a.tag:hover {
clear: both; clear: both;
margin-top: 30px; margin-top: 30px;
margin-bottom: 0px; margin-bottom: 0px;
@media (max-device-width:480px), screen and (max-width:800px){ @media (max-device-width:480px), screen and (max-width:800px){
margin-top: 0; margin-top: 0;
} }
@ -1275,10 +1275,10 @@ a.tag:hover {
background-repeat: no-repeat; background-repeat: no-repeat;
margin-right: 30px; margin-right: 30px;
background-size: 100%; background-size: 100%;
@media (max-width:1170px) and (min-width:900px){ @media (max-width:1170px) and (min-width:900px){
margin-right: 25px!important; margin-right: 25px!important;
&:last-child { &:last-child {
margin-right: 0!important; margin-right: 0!important;
} }
@ -1292,11 +1292,11 @@ a.tag:hover {
} }
.section .logo.wired { .section .logo.wired {
width: 211px; width: 211px;
height: 44px; height: 44px;
background-image: url(/img/wired-logo.png); background-image: url(/img/wired-logo.png);
margin-top: 6px; margin-top: 6px;
margin-right: 38px; margin-right: 38px;
@media (max-width:1170px) and (min-width:900px){ @media (max-width:1170px) and (min-width:900px){
width: 170px; width: 170px;
} }
@ -1306,7 +1306,7 @@ a.tag:hover {
} }
.section .logo.fastco { .section .logo.fastco {
width: 262px; width: 262px;
height: 39px; height: 39px;
background-image: url(/img/fastcompany-logo.png); background-image: url(/img/fastcompany-logo.png);
margin-top: 7px; margin-top: 7px;
@media (max-width:1170px) and (min-width:900px){ @media (max-width:1170px) and (min-width:900px){
@ -1315,7 +1315,7 @@ a.tag:hover {
} }
.section .logo.vice { .section .logo.vice {
width: 160px; width: 160px;
height: 50px; height: 50px;
background-image: url(/img/vice-logo.png); background-image: url(/img/vice-logo.png);
@media (max-width:1170px) and (min-width:900px){ @media (max-width:1170px) and (min-width:900px){
width: 120px; width: 120px;
@ -1323,7 +1323,7 @@ a.tag:hover {
} }
} }
.section .logo.ars { .section .logo.ars {
width: 187px; width: 187px;
height: 62px; height: 62px;
background-image: url(/img/ars-logo.png); background-image: url(/img/ars-logo.png);
margin-top: -4px; margin-top: -4px;
@ -1341,7 +1341,7 @@ a.tag:hover {
.section .quote { .section .quote {
width: 70%; width: 70%;
margin: 0 auto .5em auto; margin: 0 auto .5em auto;
h3 { h3 {
margin-top: .5em; margin-top: .5em;
text-align: center; text-align: center;
@ -1498,12 +1498,12 @@ a.tag:hover {
border: 0; border: 0;
background: 0; background: 0;
padding-right: 15px; padding-right: 15px;
span { span {
border-bottom: 1px dotted #bbb; border-bottom: 1px dotted #bbb;
cursor: help; cursor: help;
} }
@media(max-device-width:480px), screen and (max-width:800px) { @media(max-device-width:480px), screen and (max-width:800px) {
width: 26%; width: 26%;
} }
@ -1521,7 +1521,7 @@ a.tag:hover {
} }
.section.plans.welcome { .section.plans.welcome {
padding: 63px 3% 0 3%; padding: 63px 3% 0 3%;
h3 { h3 {
color: #5e95a1; color: #5e95a1;
} }
@ -1529,7 +1529,7 @@ a.tag:hover {
width: 68%; width: 68%;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
@media(max-device-width:480px), screen and (max-width:550px) { @media(max-device-width:480px), screen and (max-width:550px) {
width: 100%; width: 100%;
} }
@ -1539,18 +1539,18 @@ a.tag:hover {
margin-right: auto; margin-right: auto;
max-width: 990px; max-width: 990px;
min-width: 900px; min-width: 900px;
@media(max-device-width:480px), screen and (max-width:550px) { @media(max-device-width:480px), screen and (max-width:550px) {
min-width: 0; min-width: 0;
} }
} }
>.row >.col { >.row >.col {
padding-left: 40px; padding-left: 40px;
&:first-child { &:first-child {
padding-left: 0; padding-left: 0;
} }
@media(max-device-width:480px), screen and (max-width:550px) { @media(max-device-width:480px), screen and (max-width:550px) {
padding-left: 0; padding-left: 0;
width: 100%; width: 100%;
@ -1568,10 +1568,10 @@ a.tag:hover {
float: left; float: left;
background: 0; background: 0;
padding-bottom: 0; padding-bottom: 0;
ul { ul {
clear: both; clear: both;
&.main-features { &.main-features {
font-size: 140%; font-size: 140%;
margin-bottom: .7em; margin-bottom: .7em;
@ -1607,7 +1607,7 @@ a.tag:hover {
border-right-width: 0; border-right-width: 0;
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
.main-features { .main-features {
margin-bottom: 76px; margin-bottom: 76px;
} }
@ -1618,7 +1618,7 @@ a.tag:hover {
border: 1px solid #E0E0E0; border: 1px solid #E0E0E0;
@include box-shadow(-1px 1px 5px 0px rgba(0,0,0,0.1)); @include box-shadow(-1px 1px 5px 0px rgba(0,0,0,0.1));
margin-bottom: 1.2em!important; margin-bottom: 1.2em!important;
.col:first-child { .col:first-child {
width: 38%; width: 38%;
} }
@ -1642,7 +1642,7 @@ a.tag:hover {
margin-right: 3px; margin-right: 3px;
} }
} }
@media(max-device-width:480px), screen and (max-width:550px) { @media(max-device-width:480px), screen and (max-width:550px) {
.col.free, .col.supporter, .col.supporter .col { .col.free, .col.supporter, .col.supporter .col {
width: 100%!important; width: 100%!important;
} }
@ -1661,11 +1661,11 @@ a.tag:hover {
.section.bottom-signup { .section.bottom-signup {
// padding-top: 1em; // padding-top: 1em;
// padding-bottom: 6.5em; // padding-bottom: 6.5em;
padding-top: 0; padding-top: 0;
background: #4F7E89; background: #4F7E89;
padding-bottom: 7em; padding-bottom: 7em;
a { a {
color: white; color: white;
text-decoration: underline; text-decoration: underline;
@ -1771,7 +1771,7 @@ a.tag:hover {
width: 100%; width: 100%;
margin-top: 22px; margin-top: 22px;
font-size: 15px; font-size: 15px;
a, a:visited { a, a:visited {
color: white; color: white;
} }
@ -1790,17 +1790,17 @@ a.tag:hover {
.tools { .tools {
color: #8099A7; color: #8099A7;
float: right; float: right;
.theme { .theme {
font-size: .9em; font-size: .9em;
display: inline; display: inline;
select#theme { select#theme {
vertical-align: baseline; vertical-align: baseline;
background: #25333c; background: #25333c;
color: #8099A7; color: #8099A7;
} }
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
display: none; display: none;
} }
@ -1808,7 +1808,7 @@ a.tag:hover {
#saveButton { #saveButton {
margin-top: 0; margin-top: 0;
} }
.tooltip { .tooltip {
&.bottom .tooltip-arrow { &.bottom .tooltip-arrow {
border-bottom-color: #971D31; border-bottom-color: #971D31;
} }
@ -1848,7 +1848,7 @@ a.tag:hover {
background: rgba(228, 228, 228, 0.42); background: rgba(228, 228, 228, 0.42);
width: 100%; width: 100%;
text-align: center; text-align: center;
padding: 26px 0 5px; padding: 26px 0 5px;
p { p {
margin-top: 10px; margin-top: 10px;
} }
@ -1885,7 +1885,7 @@ table#latest-visitors {
width: 100%; width: 100%;
color: #777; color: #777;
font-size: .8em; font-size: .8em;
td { td {
white-space: nowrap; white-space: nowrap;
max-width: 0; max-width: 0;
@ -1908,11 +1908,11 @@ table#latest-visitors {
height: 400px; height: 400px;
} }
.content.misc-page.columns .col.globe { .content.misc-page.columns .col.globe {
padding-right: 0; padding-right: 0;
padding-top: 4px; padding-top: 4px;
} }
.news-feed .content.misc-page .col-50 { .news-feed .content.misc-page .col-50 {
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
width: 100%; width: 100%;
} }
} }

123
views/site/stats.erb
View file

@ -7,7 +7,6 @@
<a href="/" <% if params[:activity].nil? %>class="selected"<% end %>>All</a> <a href="/" <% if params[:activity].nil? %>class="selected"<% end %>>All</a>
<a href="/?activity=mine" <% if params[:activity] == 'mine' %>class="selected"<% end %>>Profile Activity</a> <a href="/?activity=mine" <% if params[:activity] == 'mine' %>class="selected"<% end %>>Profile Activity</a>
<% end %> <% end %>
<a href="/activity">Global Activity</a>
</div> </div>
</div> </div>
<div class="col col-32"> <div class="col col-32">
@ -23,10 +22,11 @@
<div class="col col-66"> <div class="col col-66">
<div class="row"> <div class="row">
<div class="col col-50 globe"> <div class="col col-100 globe">
<h2>Latest Visitors</h2> <h2>Most popular locations (this week)</h2>
<div id="earth_div"></div> <div id="earth_div"></div>
</div> </div>
<!--
<div class="col col-50" style="padding-right: 0;"> <div class="col col-50" style="padding-right: 0;">
<table class="table table-striped" id="latest-visitors"> <table class="table table-striped" id="latest-visitors">
<tbody> <tbody>
@ -133,16 +133,24 @@
</tbody> </tbody>
</table> </table>
</div> </div>
-->
</div> </div>
<h2>Last 7 Days</h2> <h2>Total Visitors (last 7 days)</h2>
<p>(<a href="/plan">Upgrade</a> to see up to see stats for all time)</p>
<ul class="nav h-Nav"> <% if current_site && current_site.id == @site.id %>
<li><a href="">Month</a></li>
<li><a href="">3 months</a></li> <% if current_site.supporter? %>
<li><a href="">1 Year</a></li> <ul class="nav h-Nav">
<li><a href="">All time</a></li> <li><a href="">1 month</a></li>
</ul> <li><a href="">3 months</a></li>
<li><a href="">1 year</a></li>
<li><a href="">All time</a></li>
</ul>
<% else %>
<p>(<a href="/plan">Upgrade</a> to see up to see stats for all time)</p>
<% end %>
<% end %>
<canvas id="myChart" style="width:100%;height:300px;display:block"></canvas> <canvas id="myChart" style="width:100%;height:300px;display:block"></canvas>
@ -165,7 +173,8 @@
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
</div>
<div class="col col-50">
<h2>Top Locations</h2> <h2>Top Locations</h2>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
@ -186,28 +195,33 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="col col-50">
<h2>Top Referrers</h2>
<table class="table table-striped">
<thead>
<tr>
<th>Referrer</th>
<th>Visits</th>
</tr>
</thead>
<tbody>
<% @stats[:referrers].each do |referrer| %>
<tr>
<td><%= referrer.url %></td>
<td><%= referrer.views %></td>
</tr>
<% end %>
</tbody>
</table>
</div>
</div> </div>
<% if current_site && current_site.id == @site.id %>
<div class="row">
<div class="col col-100">
<h2>Top Referrers</h2>
<table class="table table-striped">
<thead>
<tr>
<th>Referrer</th>
<th>Visits</th>
</tr>
</thead>
<tbody>
<% @stats[:referrers].each do |referrer| %>
<tr>
<td><%= referrer.url %></td>
<td><%= referrer.views %></td>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>
<% end %>
</div> </div>
<div class="col col-33"> <div class="col col-33">
@ -244,11 +258,32 @@
<script> <script>
//OpenGL globe //OpenGL globe
$(document).ready(function() { $(document).ready(function() {
var earth = new WE.map('earth_div'); var options = {
earth.setView([20, -100], 2.07); sky: true,
atmosphere: false,
dragging: true,
tilting: true,
center: [46.8011, 8.2266],
zoom: 2
}
var earth = new WE.map('earth_div', options)
earth.setView([20, -100], 2.07)
/*
WE.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',{ WE.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',{
attribution: '© OpenStreetMap' attribution: '© OpenStreetMap'
}).addTo(earth); }).addTo(earth);
*/
WE.tileLayer('http://data.webglearth.com/natural-earth-color/{z}/{x}/{y}.jpg', {
tileSize: 256,
bounds: [[-85, -180], [85, 180]],
minZoom: 0,
maxZoom: 16,
attribution: 'WebGL Earth Tiles',
tms: true
}).addTo(earth)
<% @stats[:locations].each do |location| %> <% @stats[:locations].each do |location| %>
var marker = WE.marker([<%= location[:latitude] %>, <%= location[:longitude] %>]).addTo(earth); var marker = WE.marker([<%= location[:latitude] %>, <%= location[:longitude] %>]).addTo(earth);
@ -258,13 +293,13 @@
// Start a simple rotation animation // Start a simple rotation animation
var before = null; var before = null
requestAnimationFrame(function animate(now) { requestAnimationFrame(function animate(now) {
var c = earth.getPosition(); var c = earth.getPosition()
var elapsed = before? now - before: 0; var elapsed = before? now - before: 0
before = now; before = now
earth.setCenter([c[0], c[1] + 0.1*(elapsed/30)]); earth.setCenter([c[0], c[1] + 0.1*(elapsed/30)])
requestAnimationFrame(animate); requestAnimationFrame(animate)
}); });
//chart.js //chart.js
@ -292,14 +327,14 @@
data: <%== @stats[:stat_days].collect {|s| s.views}.to_json %> data: <%== @stats[:stat_days].collect {|s| s.views}.to_json %>
} }
] ]
}; }
// Get context with jQuery - using jQuery's .get() method. // Get context with jQuery - using jQuery's .get() method.
var ctx = $("#myChart").get(0).getContext("2d"); var ctx = $("#myChart").get(0).getContext("2d")
// This will get the first returned node in the jQuery collection. // This will get the first returned node in the jQuery collection.
//var myNewChart = new Chart(ctx); //var myNewChart = new Chart(ctx);
var myLineChart = new Chart(ctx).Line(data, { var myLineChart = new Chart(ctx).Line(data, {
bezierCurve: false, bezierCurve: false,
multiTooltipTemplate: "<%== @multi_tooltip_template %>" multiTooltipTemplate: "<%== @multi_tooltip_template %>"
}); })
}) })
</script> </script>