Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 3 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
Showing with 71 additions and 8 deletions.
  1. +49 −2 dayze/assets/css/style.css
  2. +8 −2 dayze/assets/js/tickytacky.js
  3. +7 −1 dayze/map.php
  4. +4 −0 dayze/today.php
  5. +3 −3 dayze/view.php
View
51 dayze/assets/css/style.css
@@ -127,15 +127,16 @@ border: none;
overflow: hidden;
- color: #333;
+ color: white;
font-weight: normal;
border-radius: .4em;
text-shadow: 1px 1px 1px rgba(0,0,0,.2);
min-height: 128;
background: rgba(125,96,103, .4);
background: -moz-linear-gradient(100% 100% 90deg, rgba(125,96,103, .8), rgba(184,163,168, .8));
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(125,96,103, .8)), to(rgba(184,163,168, .8)));
-}
+
+ }
.Twitter {
@@ -172,6 +173,52 @@ border: none;
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(200,50,50, .8)), to(rgba(200,128,128, .8)));
}
+li.Photo {
+ border-width: 20px 20px 20px 20px;
+ -moz-border-image: url(http://liveart.istic.net/images/gold-frame.png) 20 20 20 20 stretch;
+ -webkit-border-image: url(http://liveart.istic.net/images/gold-frame.png) 20 20 20 20 stretch;
+ -o-border-image: url(http://liveart.istic.net/images/gold-frame.png) 20 20 20 20 stretch;
+ border-image: url(http://liveart.istic.net/images/gold-frame.png) 20 20 20 20 stretch;
+ background: rgba(0,0,0,.6);
+ margin: 0;
+ position: relative;
+ width: 500px;
+ height: 300px;
+}
+
+li.Photo a.iconlink {
+ position: absolute;
+ top: 0;
+ left: 0;
+ display: block;
+ text-align: center;
+ width: 100%;
+}
+
+li.Photo img.icon {
+ max-width: 105%;
+ max-height: 100%;
+ float: none ;
+}
+
+li.Photo .description, li.Photo .cite {
+ display: block;
+ position: absolute;
+ background: rgba(0,0,0,.6);
+ color: white;
+ text-align: right;
+ bottom: 1.2em;
+ left: 0;
+ width: 100%;
+ overflow: none;
+ height: 1.2em;
+ font-size: smaller;
+}
+
+li.Photo .cite {
+ bottom: 0;
+}
+
.Location {
background: rgba(78,179,75, .8);
background: -moz-linear-gradient(100% 100% 90deg, rgba(78,179,75, .8), rgba(207,227,207, .8));
View
10 dayze/assets/js/tickytacky.js
@@ -165,15 +165,21 @@ TickyTacky = {
// ... And they all look just the same.
// Normalise the heights and widths of the boxes to a muliplyer of box_height/box_width
- if (box.height() % TickyTacky.box_height && !box.hasClass("boxresized")){
+ if (!box.hasClass("boxresized")){
+ border = parseInt(box.css("border-left-width"));
+
h = box.innerHeight();
+ if(border){
+ h += (border *2);
+ }
w = box.outerWidth();
height_in_boxes = (Math.round(h/TickyTacky.box_height) );
if(height_in_boxes == 0){
height_in_boxes = 1;
}
+
outer_height_in_px = TickyTacky.box_height * height_in_boxes;
inner_height_to_get_that = outer_height_in_px - (h - box.height());
box.height(inner_height_to_get_that - TickyTacky.padding);
@@ -186,7 +192,7 @@ TickyTacky = {
inner_width_to_get_that = outer_width_in_px - (w - box.width());
box.width(inner_width_to_get_that - TickyTacky.padding);
- box.addClass("boxresized"); // We do this, only once.
+ //box.addClass("boxresized"); // We do this, only once.
}
boxes.push(box); // Add the box to the set of boxes to be positioned.
View
8 dayze/map.php
@@ -52,16 +52,22 @@
var markers = []
initialize_google_map = function() {
+
+ if (locations.length == 0){
+ return;
+ }
var bounds = new google.maps.LatLngBounds();
+
+
for(i=0;i < locations.length; i++){
markerpos = new google.maps.LatLng(locations[i]['lat'], locations[i]['long']);
bounds.extend(markerpos)
}
var myOptions = {
- center: new google.maps.LatLng(locations[0]['lat'], locations[0]['long']),
+ center: new google.maps.LatLng(0, 0),
zoom: 1,
disableDefaultUI: true,
scrollwheel: false,
View
4 dayze/today.php
@@ -191,6 +191,10 @@
continue 2;
}
break;
+
+ case "flickr":
+ $class = "Photo";
+ break;
case "tumblr":
$class = "Tumblr";
View
6 dayze/view.php
@@ -177,15 +177,15 @@
usort($items, "epochsort");
foreach($items as $row){
- echo "<li class=\"contentbox ".$row['class']."\" >";
+ echo "<li class=\"contentbox ".$row['class']." source".$row['type']."\" >";
if ($row['icon']){
- echo "<a href=\"".$row['url']."\" >";
+ echo "<a href=\"".$row['url']."\" class=\"iconlink\"/>";
echo "<img src='".$row['icon']."' class=\"icon\"/>";
echo "</a>";
}
- $content = $row['content'];
+ $content = '<span class="description">'.$row['content'].'</span>';
if (isset($row['subitems'])){
$content .= " (+ ".count($row['subitems'])." more)";

No commit comments for this range

Something went wrong with that request. Please try again.