diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..adfb478 Binary files /dev/null and b/.DS_Store differ diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 07d961b..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ - -*.xml - -*.xml diff --git a/_notes/dwsync.xml b/_notes/dwsync.xml deleted file mode 100644 index cbf2ed8..0000000 --- a/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/css/.DS_Store b/css/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/css/.DS_Store differ diff --git a/css/_notes/dwsync.xml b/css/_notes/dwsync.xml deleted file mode 100644 index 82078bd..0000000 --- a/css/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/css/uup.css b/css/uup.css index c831f50..171b191 100644 --- a/css/uup.css +++ b/css/uup.css @@ -10,29 +10,18 @@ display: block; position: relative; padding-left: 170px; + min-height: 150px; } .uup-list .has-image .uup-thumbnail { display: block; width: 150px; height: 150px; - float: left; - position: relative; - left: -170px; - margin-right: -150px; -} -.uup-list a.uup-user { - float: left; + position: absolute; + left: 0; + top: 0; } .uup-list .uup-item { margin-bottom: 1em; - *zoom: 1; -} -.uup-list .uup-item:after, .uup-list .uup-item:before { - content: ''; - display: table; -} -.uup-list .uup-item:after { - clear: both; } .uup-list .uup-item .uup-text { display: block; @@ -43,18 +32,23 @@ .uup-list .uup-item .uup-text .uup-name { font-weight: bold; } -.uup-list .uup-item .uup-text .uup-name .uup-last:before { +.uup-list .uup-item .uup-text .uup-name .uup-first:after { content: ' '; } +.uup-index-table .uup-table-name.table-has-image { + position: relative; + padding-left: 60px; +} .uup-index-table .uup-table-name.table-has-image .uup-table-thumbnail { display: block; - width: 75px; - float: left; - margin: 0 1em 1em 0 !important; + width: 50px; + height: 50px; + position: absolute; + left: 0; + top: 5px; } .uup-index-table .uup-table-name.table-has-image .uup-name { - float: left; display: block; } .uup-index-table .uup-table-name .uup-last:before { diff --git a/img/.DS_Store b/img/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/img/.DS_Store differ diff --git a/img/_notes/dwsync.xml b/img/_notes/dwsync.xml deleted file mode 100644 index 1c14e3a..0000000 --- a/img/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/inc/.DS_Store b/inc/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/inc/.DS_Store differ diff --git a/inc/_notes/dwsync.xml b/inc/_notes/dwsync.xml deleted file mode 100644 index 8a7c7cc..0000000 --- a/inc/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/js/.DS_Store b/js/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/js/.DS_Store differ diff --git a/js/_notes/dwsync.xml b/js/_notes/dwsync.xml deleted file mode 100644 index 28a7fcb..0000000 --- a/js/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/js/cs.js b/js/cs.js index 3363479..e510ebd 100644 --- a/js/cs.js +++ b/js/cs.js @@ -80,22 +80,37 @@ jQuery(document).ready(function($) { ----- */ $('.uup-list .has-image').each(function(){ - //console.log('has image...'); - var text = $(this).find('.uup-text'); - var img = $(this).find('img:first'); - //console.log(text); - //console.log(img); - var textHeight = text.height(); - var imgHeight = img.outerHeight(); - //console.log(textHeight); - //console.log(imgHeight); - - if (imgHeight > textHeight){ - var diff = imgHeight - textHeight; - text.css('padding-top', diff/2); - } - }); - + //console.log('has image...'); + var text = $(this).find('.uup-text'); + var img = $(this).find('img:first'); + //console.log(text); + //console.log(img); + var textHeight = text.height(); + var imgHeight = img.outerHeight(); + //console.log(textHeight); + //console.log(imgHeight); + + if (imgHeight > textHeight){ + var diff = imgHeight - textHeight; + text.css('padding-top', diff/2); + } + }); + $('.uup-index-table .table-has-image').each(function(){ + //console.log('has image...'); + var text = $(this).find('.uup-name'); + var img = $(this).find('.uup-table-thumbnail'); + //console.log(text); + //console.log(img); + var textHeight = text.height(); + var imgHeight = img.outerHeight(); + //console.log(textHeight); + //console.log(imgHeight); + if (imgHeight > textHeight){ + //console.log('img bigger...'); + var diff = imgHeight - textHeight; + text.css('cssText', 'padding-bottom:'+ diff + 'px!important' ); + } + }); diff --git a/js/html5shiv/_notes/dwsync.xml b/js/html5shiv/_notes/dwsync.xml deleted file mode 100644 index b73375e..0000000 --- a/js/html5shiv/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/js/min/_notes/dwsync.xml b/js/min/_notes/dwsync.xml deleted file mode 100644 index 516a1c7..0000000 --- a/js/min/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/js/min/cs.min.js b/js/min/cs.min.js index a7da973..518f4b1 100644 --- a/js/min/cs.min.js +++ b/js/min/cs.min.js @@ -1 +1 @@ -jQuery(document).ready(function(a){function i(){var i=a(this).attr("href").toLowerCase(),t=a(this).children("img").length,e=null,n=null,l=null,p=null;if("#"!=i.charAt(0)&&0==t&&"/"!=i.charAt(0)){var o=i.split("/");e=o[2],n=o[o.length-1]||"";var c=n.split(".");if(c[1]&&a.each(d,function(i,t){t==c[1]&&(p=a(''),l=c[1],p.append("."+l))}),null!=p&&a(this).append(p),e!=s&&null!=e){var r='';a(this).addClass("external").append(r)}}}function t(i){var t=a("
");t.addClass("alert alert-danger accessibility-fail-msg"),t.width(i.width+"px");var e=a("");e.addClass("glyphicon glyphicon-ban-circle");var n=a("");n.append(' This image needs a valid Alt tag. '),t.append(e).append(n),a(i).after(t)}function e(){var i=document.getElementById("page").clientHeight,t=document.getElementById("footers").clientHeight,e=i+t,n=window.innerHeight;n>=e?a("body").addClass("sticky"):a("body").removeClass("sticky")}var n=location.href,l=n.split("/"),s=l[2],d=["3g2","3gp","avi","doc","docx","dotx","gif","jpg","jpeg","m4a","mid","midi","mov","mp3","mp4","mpg","odt","ogg","ogv","pdf","png","ppt","pptx","xls","xlsx","wav","wmv","zip","vsd"],p=["#comments","#site-navigation","article.page"];a.each(p,function(t,e){a(e+" a").each(i)}),a(".uup-list .has-image").each(function(){var i=a(this).find(".uup-text"),t=a(this).find("img:first"),e=i.height(),n=t.outerHeight();if(n>e){var l=n-e;i.css("padding-top",l/2)}}),a("#page img").each(function(){alt=a(this).attr("alt"),alt?(alt=alt.toLowerCase(),(alt.indexOf(".jpg")>=0||alt.indexOf(".png")>=0||alt.indexOf(".gif")>=0)&&(a(this).addClass("accessibility-fail"),t(this))):(a(this).addClass("accessibility-fail"),t(this))}),a("#page table").each(function(){a(this).addClass("table")}),window.onload=function(){if(placeholderSupport="placeholder"in document.createElement("input"),0!=placeholderSupport){var i=a("main");i.addClass("supports-placeholder")}e()},window.onresize=function(){e()}}); \ No newline at end of file +jQuery(document).ready(function(a){function t(){var t=a(this).attr("href").toLowerCase(),i=a(this).children("img").length,e=null,n=null,l=null,p=null;if("#"!=t.charAt(0)&&0==i&&"/"!=t.charAt(0)){var o=t.split("/");e=o[2],n=o[o.length-1]||"";var c=n.split(".");if(c[1]&&a.each(d,function(t,i){i==c[1]&&(p=a(''),l=c[1],p.append("."+l))}),null!=p&&a(this).append(p),e!=s&&null!=e){var h='';a(this).addClass("external").append(h)}}}function i(t){var i=a("
");i.addClass("alert alert-danger accessibility-fail-msg"),i.width(t.width+"px");var e=a("");e.addClass("glyphicon glyphicon-ban-circle");var n=a("");n.append(' This image needs a valid Alt tag. '),i.append(e).append(n),a(t).after(i)}function e(){var t=document.getElementById("page").clientHeight,i=document.getElementById("footers").clientHeight,e=t+i,n=window.innerHeight;n>=e?a("body").addClass("sticky"):a("body").removeClass("sticky")}var n=location.href,l=n.split("/"),s=l[2],d=["3g2","3gp","avi","doc","docx","dotx","gif","jpg","jpeg","m4a","mid","midi","mov","mp3","mp4","mpg","odt","ogg","ogv","pdf","png","ppt","pptx","xls","xlsx","wav","wmv","zip","vsd"],p=["#comments","#site-navigation","article.page"];a.each(p,function(i,e){a(e+" a").each(t)}),a(".uup-list .has-image").each(function(){var t=a(this).find(".uup-text"),i=a(this).find("img:first"),e=t.height(),n=i.outerHeight();if(n>e){var l=n-e;t.css("padding-top",l/2)}}),a(".uup-index-table .table-has-image").each(function(){var t=a(this).find(".uup-name"),i=a(this).find(".uup-table-thumbnail"),e=t.height(),n=i.outerHeight();if(n>e){var l=n-e;t.css("cssText","padding-bottom:"+l+"px!important")}}),a("#page img").each(function(){alt=a(this).attr("alt"),alt?(alt=alt.toLowerCase(),(alt.indexOf(".jpg")>=0||alt.indexOf(".png")>=0||alt.indexOf(".gif")>=0)&&(a(this).addClass("accessibility-fail"),i(this))):(a(this).addClass("accessibility-fail"),i(this))}),a("#page table").each(function(){a(this).addClass("table")}),window.onload=function(){if(placeholderSupport="placeholder"in document.createElement("input"),0!=placeholderSupport){var t=a("main");t.addClass("supports-placeholder")}e()},window.onresize=function(){e()}}); \ No newline at end of file diff --git a/min/.DS_Store b/min/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/min/.DS_Store differ diff --git a/min/_notes/dwsync.xml b/min/_notes/dwsync.xml deleted file mode 100644 index a778175..0000000 --- a/min/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/sass/.DS_Store b/sass/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/sass/.DS_Store differ diff --git a/sass/_notes/dwsync.xml b/sass/_notes/dwsync.xml deleted file mode 100644 index df2101e..0000000 --- a/sass/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/sass/uup.scss b/sass/uup.scss index 56d7f16..5a14745 100644 --- a/sass/uup.scss +++ b/sass/uup.scss @@ -10,33 +10,20 @@ display:block; position:relative; padding-left:170px; - + min-height:150px; .uup-thumbnail { display:block; width:150px; height:150px; - float:left; - position:relative; - left:-170px; - margin-right:-150px; + position:absolute; + left:0; + top:0; } } - a.uup-user { - float:left; - } + .uup-item { margin-bottom:1em; - *zoom: 1; - - &:after, - &:before { - content:''; - display:table; - } - &:after { - clear:both; - } .uup-text { display:block; @@ -48,13 +35,12 @@ .uup-name { font-weight:bold; - .uup-first {} - .uup-last { - - &:before { + .uup-first { + &:after { content:' '; } } + .uup-last {} } .uup-title { } @@ -82,19 +68,21 @@ .uup-table-name { &.table-has-image { + position:relative; + padding-left:60px; .uup-table-thumbnail { display:block; - width:75px; - float:left; - margin:0 1em 1em 0!important; + width:50px; + height:50px; + position:absolute; + left:0; + top:5px; } .uup-name { - float:left; display:block; - - + //min-height:60px; } } .uup-first {} diff --git a/style.css b/style.css index d534ba1..3c588ef 100644 --- a/style.css +++ b/style.css @@ -7641,29 +7641,18 @@ q:before, table q:after { display: block; position: relative; padding-left: 170px; + min-height: 150px; } .uup-list .has-image .uup-thumbnail { display: block; width: 150px; height: 150px; - float: left; - position: relative; - left: -170px; - margin-right: -150px; -} -.uup-list a.uup-user { - float: left; + position: absolute; + left: 0; + top: 0; } .uup-list .uup-item { margin-bottom: 1em; - *zoom: 1; -} -.uup-list .uup-item:after, .uup-list .uup-item:before { - content: ''; - display: table; -} -.uup-list .uup-item:after { - clear: both; } .uup-list .uup-item .uup-text { display: block; @@ -7674,18 +7663,23 @@ q:before, table q:after { .uup-list .uup-item .uup-text .uup-name { font-weight: bold; } -.uup-list .uup-item .uup-text .uup-name .uup-last:before { +.uup-list .uup-item .uup-text .uup-name .uup-first:after { content: ' '; } +.uup-index-table .uup-table-name.table-has-image { + position: relative; + padding-left: 60px; +} .uup-index-table .uup-table-name.table-has-image .uup-table-thumbnail { display: block; - width: 75px; - float: left; - margin: 0 1em 1em 0 !important; + width: 50px; + height: 50px; + position: absolute; + left: 0; + top: 5px; } .uup-index-table .uup-table-name.table-has-image .uup-name { - float: left; display: block; } .uup-index-table .uup-table-name .uup-last:before {