Skip to content

Commit

Permalink
upcoming events: date and link float with same size
Browse files Browse the repository at this point in the history
  • Loading branch information
betz committed Oct 3, 2013
1 parent cd97748 commit 3de5565
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 14 deletions.
Binary file not shown.
45 changes: 35 additions & 10 deletions www/css/screen.css
Expand Up @@ -132,8 +132,33 @@ h1 {
position: static;
}

/* line 123, ../sass/screen.scss */
.frontevents ul {
margin: 0;
}
/* line 125, ../sass/screen.scss */
.frontevents ul .event {
list-style-type: none;
overflow: hidden;
}
/* line 128, ../sass/screen.scss */
.frontevents ul .event .eventDate {
width: 55px;
height: 20px;
float: left;
padding-bottom: 500em;
margin-bottom: -500em;
}
/* line 135, ../sass/screen.scss */
.frontevents ul .event .value {
width: 70%;
float: left;
padding-bottom: 500em;
margin-bottom: -500em;
}

@media (min-width: 585px) and (max-width: 767px) {
/* line 123, ../sass/screen.scss */
/* line 146, ../sass/screen.scss */
.frontevents ul {
-moz-column-count: 2;
/* Firefox */
Expand All @@ -144,26 +169,26 @@ h1 {
}
}
@media (max-width: 979px) {
/* line 133, ../sass/screen.scss */
/* line 156, ../sass/screen.scss */
body {
padding-top: 0;
padding-bottom: 20px;
}

/* line 137, ../sass/screen.scss */
/* line 160, ../sass/screen.scss */
#myCarousel {
display: none;
}
}
/**
* Always show submenu on hover, instead of click.
*/
/* line 146, ../sass/screen.scss */
/* line 169, ../sass/screen.scss */
.sidebar-nav {
padding: 9px 0;
}

/* line 150, ../sass/screen.scss */
/* line 173, ../sass/screen.scss */
.dropdown-menu .sub-menu {
left: 100%;
position: absolute;
Expand All @@ -172,22 +197,22 @@ h1 {
margin-top: -1px;
}

/* line 158, ../sass/screen.scss */
/* line 181, ../sass/screen.scss */
.dropdown-menu li:hover .sub-menu {
visibility: visible;
}

/* line 162, ../sass/screen.scss */
/* line 185, ../sass/screen.scss */
.dropdown:hover .dropdown-menu {
display: block;
}

/* line 166, ../sass/screen.scss */
/* line 189, ../sass/screen.scss */
.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu, .navbar .dropdown-menu {
margin-top: 0;
}

/* line 170, ../sass/screen.scss */
/* line 193, ../sass/screen.scss */
.navbar .sub-menu:before {
border-bottom: 7px solid transparent;
border-left: none;
Expand All @@ -197,7 +222,7 @@ h1 {
top: 10px;
}

/* line 178, ../sass/screen.scss */
/* line 201, ../sass/screen.scss */
.navbar .sub-menu:after {
border-top: 6px solid transparent;
border-left: none;
Expand Down
11 changes: 8 additions & 3 deletions www/index.html
Expand Up @@ -116,6 +116,11 @@ <h1>Learn. Do. Share.</h1>
<p>Hackerspace Brussels (HSBXL) is a space, dedicated to various aspects of constructive & creative hacking. The space is about 300 square meters, there is a little electronics lab with over 9000 components, a library, and lots of tools. You're always welcome to follow one of the workshops or come to the weekly Tuesday meetings, hack nights or other get-together events.</p>
<p><a href="what-is-hackerspace.html" class="btn btn-primary btn-large">What is a hackerspace? &raquo;</a></p>
</div>
<!-- <div class="item">
<h1>Hackerspaces in Belgium</h1>
<p>Sometimes we forget that we are not alone. Have a look at other hackerspaces in Belgium.</p>
<p><a href="what-is-hackerspace.html" class="btn btn-primary btn-large">What is a hackerspace? &raquo;</a></p>
</div>-->
</div>
</div>
<!-- Carousel nav -->
Expand All @@ -128,9 +133,9 @@ <h1>Learn. Do. Share.</h1>
<div class="span4 frontevents" ng-controller="EventsCtrl">
<h2>Upcoming Events</h2>
<ul>
<li class="jsonly" ng-repeat="event in events | orderObjectBy:'start' ">
<strong>{{event.printouts['Start date'][0]}}: </strong>
<a href="{{event.fullurl}}">{{event.fulltext}}</a>
<li class="jsonly event" ng-repeat="event in events | orderObjectBy:'start' ">
<span class="eventDate"><strong>{{event.printouts['Start date'][0]}}: </strong></span>
<a class="value" href="{{event.fullurl}}">{{event.fulltext}}</a>
</li>
</ul>
<p class="nojs">You don't have javascript enabled.</p>
Expand Down
2 changes: 1 addition & 1 deletion www/js/hsbxl-ck.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions www/js/hsbxl.js
Expand Up @@ -15,4 +15,12 @@ angular.module('hsbxl', ['ngGrid']).
});
return array;
}
});

$(document).ready(function () {
$('.carousel').carousel({
interval: 4000
});

$('.carousel').carousel('cycle');
});
23 changes: 23 additions & 0 deletions www/sass/screen.scss
Expand Up @@ -119,6 +119,29 @@ h1 {
position: static;
}

.frontevents {
ul {
margin: 0;
.event {
list-style-type: none;
overflow: hidden;
.eventDate {
width: 55px;
height: 20px;
float: left;
padding-bottom: 500em;
margin-bottom: -500em;
}
.value {
width: 70%;
float: left;
padding-bottom: 500em;
margin-bottom: -500em;
}
}
}
}

@media (min-width: 585px) and (max-width: 767px) {
.frontevents ul{
-moz-column-count:2; /* Firefox */
Expand Down

0 comments on commit 3de5565

Please sign in to comment.