Skip to content

Commit

Permalink
add arkitech font, hide empty top-level events
Browse files Browse the repository at this point in the history
  • Loading branch information
codez266 committed Dec 13, 2015
1 parent 43d7d4f commit 90d8fed
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 30 deletions.
5 changes: 4 additions & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,11 @@
//cat['curr'] = -1;
}
});
//console.log(self.events);
}else{
console.log(cat);
if ( Object.keys( cat['sub'] ).length == 0 ) {
delete self.events['sub'][cat['eveName']];
}
globalErr = response.data[0];
}
//console.log(response.data);
Expand Down
22 changes: 8 additions & 14 deletions assets/css/all.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
@font-face{
font-family: modeka;
src:url('../fonts/Modeka.otf');
font-family: arki;
src:url('../fonts/Arkitech Light.ttf');
}
@font-face{
font-family: antipas;
src:url('../fonts/Antipasto_regular.otf');
}
@font-face{
font-family: lato;
src:url('../fonts/Lato-Regular.ttf');
font-family: modeka;
src:url('../fonts/Modeka.otf');
}
@font-face {
font-family:agency;
Expand All @@ -16,16 +20,6 @@ font-family:bebas;
src:url(../fonts/BebasNeue.ttf) format("truetype");
}

@font-face {
font-family:"new";
src:url(../fonts/new.ttf) format("truetype");
}

@font-face {
font-family:"droidsans";
src:url(../fonts/DroidSans.ttf) format("truetype");
}

html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
Expand Down
21 changes: 17 additions & 4 deletions assets/css/eventsmain.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ height:1em;
}

.sidebar{
position:fixed;
position: absolute;
left:0;
top:3em;
top:4em;
height:100%;
text-align:center;
z-index: 7;
Expand All @@ -76,6 +76,7 @@ transform: translateX( -90% );
-webkit-transform: translateX( -90% );
-moz-transform: translateX( -90% );
-o-transform: translateX( -90% );
border-right: 12px solid #1780CC;
}
.sidebar .base_event:hover{
background:rgba(0,180,255,0.6);
Expand Down Expand Up @@ -106,7 +107,7 @@ margin:0;
padding:5em;
font-size:1.2em;
line-height:1.4em;
font-family: lato;
font-family: antipas;
display: none;
}
.base-event-details .details{
Expand All @@ -120,7 +121,7 @@ margin-bottom:4em;
font-size: 0.9em;
}
.base-event-details h2{
font-family: lato;
font-family: arki;
font-weight:400;
text-align:center;
font-size:1.8em;
Expand All @@ -133,6 +134,13 @@ text-align:center;
font-size:1.4em;
line-height:1.5em;
}
.base-event-details .size, .base-event-details .day{
font-family: lato;
font-weight:bold;
font-size:0.9em;
line-height:1.5em;
padding-left: 2em;
}

.base-event-details ul {
list-style-type: disc;
Expand Down Expand Up @@ -178,4 +186,9 @@ cursor:pointer;
}
.close {
z-index: 8;
position: fixed;
font-size: 3em;
font-weight: bold;
left: 0.5em;
top: -0.1em;
}
7 changes: 0 additions & 7 deletions assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -988,13 +988,6 @@ display: block;
-ms-animation: fadeInScale 1.2s ease-in-out;
animation: fadeInScale 1.2s ease-in-out;
}
.close{
position:fixed;
float:left;
font-weight:bold;
font-size:3em;
padding:1em;
}
.logreg{
background: rgba(0,108,154,0.8);
position:absolute;
Expand Down
Binary file added assets/fonts/Antipasto_regular.otf
Binary file not shown.
Binary file added assets/fonts/Arkitech Light.ttf
Binary file not shown.
9 changes: 6 additions & 3 deletions view/event.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@
</div>
<div class="base">
<div class="base-event-details" ng-repeat="(ename,obj) in ectrl.sub_events.sub" ng-show="ectrl.sub_events.hasSub == 0">
<div ng-bind-html="obj.details" class="details"></div>
<div class="size" >Team size:<span ng-bind-html="obj.size"></span></div>
<div class="day" >Day:<span ng-bind-html="obj.day"></span></div>
<div class="details">
<div ng-bind-html="obj.details"></div>
<div class="size" >Team size:<span ng-bind-html="obj.size"></span></div>
<div class="day" >Day:<span ng-bind-html="obj.day"></span></div>
</div>

</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion view/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ <h2>Coming Soon...</h2>
$('#logo').animate({},0).delay(100).animate({'opacity':0.9},2500,function(){
$('.cover').fadeOut(1000);
});
$( '.ini-hide' ).removeClass( 'ini-hide' );
});
$( '.ini-hide' ).removeClass( 'ini-hide' );
function isScrolledPast(elem)
{
var $elem = $(elem);
Expand Down

0 comments on commit 90d8fed

Please sign in to comment.