Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Re-ordered the patriarchy of Micah's tree: Paul, Colin, Justin.

  • Loading branch information...
commit c83dafdf84c9207d43deaf70614472e89decbf65 1 parent 7a13dc8
@nickmeccia authored
View
BIN  public/images/patriarchy_3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
41 public/stylesheets/apprenticeship_tree.css
@@ -168,7 +168,7 @@ li.slide figcaption {
}
li.slide figcaption a {
position: static !important;
- padding-left: 15px;
+ padding-right: 15px;
}
li.slide figcaption.left {
left: -180px;
@@ -220,41 +220,41 @@ ol li:hover img.hover {
top: 300px;
left: 7px;
}
-#justin_martin {
- top: 350px;
- left: 10px;
-}
-#justin_martin a {
- width: 230px;
- top: 235px;
-}
#paul_pagel {
- top: 420px;
- left: 300px;
+ top: 350px;
+ left: 340px;
}
#eric_meyer {
- top: 740px;
+ top: 680px;
left: 375px;
}
#brian_pratt {
- top: 1050px;
+ top: 990px;
left: 380px;
}
#kevin_liddle {
- top: 1370px;
+ top: 1310px;
left: 380px;
}
#patrick_gombert {
- top: 1680px;
+ top: 1630px;
left: 380px;
}
#colin_jones {
- top: 700px;
- left: 0px;
+ top: 400px;
+ left: 20px;
}
#mark_grant {
- top: 1020px;
- left: 5px;
+ top: 750px;
+ left: 20px;
+}
+#justin_martin {
+ top: 1080px;
+ left: 40px;
+}
+#justin_martin a {
+ width: 230px;
+ top: 235px;
}
#steve_kim {
top: 1360px;
@@ -362,6 +362,7 @@ ol li:hover img.hover {
}
li.slide figcaption h1 {
display: inline;
+ margin-right: 22px;
}
li.slide figcaption p {
display: none;
@@ -398,6 +399,7 @@ ol li:hover img.hover {
}
li.slide figcaption h1 {
display: inline;
+ margin-right: 22px;
}
li.slide figcaption p {
display: none;
@@ -435,6 +437,7 @@ ol li:hover img.hover {
}
li.slide figcaption h1 {
display: inline;
+ margin-right: 22px;
}
li.slide figcaption p {
display: none;
View
20 src/apprenticeship_tree/view/_slide_3.hiccup.clj
@@ -15,16 +15,6 @@
[:a {:href "http://www.8thlight.com/our-team/micah-martin"} "profile"]
[:a {:href "http://blog.8thlight.com/micah-martin/archive.html"} "blog"]]]
[:ol
- [:li#justin_martin
- [:img {:src "./images/justin_martin_photo.png"}]
- [:img.hover {:src "./images/justin_martin_hover.png"}]
- [:img {:src "./images/justin_martin_frame.png"}]
- [:a "justin martin"]
- [:figcaption.left
- [:h1 "justin martin"]
- [:p "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae sem nunc, eget ullamcorper leo. Fusce rhoncus luctus tristique. Vestibulum id turpis est nunc."]
- [:a "profile"]
- [:a {:href "http://blog.8thlight.com/justin-martin/archive.html"} "blog"]]]
[:li#paul_pagel
[:img {:src "./images/paul_pagel_photo.png"}]
[:img.hover {:src "./images/paul_pagel_hover.png"}]
@@ -97,6 +87,16 @@
[:p "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae sem nunc, eget ullamcorper leo. Fusce rhoncus luctus tristique. Vestibulum id turpis est nunc."]
[:a {:href "http://www.8thlight.com/our-team/mark-grant"} "profile"]
[:a {:href "http://blog.8thlight.com/mark-grant/archive.html"} "blog"]]]]
+ [:li#justin_martin
+ [:img {:src "./images/justin_martin_photo.png"}]
+ [:img.hover {:src "./images/justin_martin_hover.png"}]
+ [:img {:src "./images/justin_martin_frame.png"}]
+ [:a "justin martin"]
+ [:figcaption.left
+ [:h1 "justin martin"]
+ [:p "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae sem nunc, eget ullamcorper leo. Fusce rhoncus luctus tristique. Vestibulum id turpis est nunc."]
+ [:a "profile"]
+ [:a {:href "http://blog.8thlight.com/justin-martin/archive.html"} "blog"]]]
[:li#steve_kim
[:img {:src "./images/steve_kim_photo.png"}]
[:img.hover {:src "./images/steve_kim_hover.png"}]
Please sign in to comment.
Something went wrong with that request. Please try again.