From 7e779a16ac1987aa219343534fc07d91977f3dd8 Mon Sep 17 00:00:00 2001 From: andrewmbacon Date: Fri, 8 Aug 2014 12:17:07 -0400 Subject: [PATCH] UUP & DW UUP Style fixes Also (hopefully) will be ignoring DW sync files from now on. --- .DS_Store | Bin 0 -> 15364 bytes .gitignore | 4 --- _notes/dwsync.xml | 1 - css/.DS_Store | Bin 0 -> 6148 bytes css/_notes/dwsync.xml | 1 - css/uup.css | 34 ++++++++++-------------- img/.DS_Store | Bin 0 -> 6148 bytes img/_notes/dwsync.xml | 1 - inc/.DS_Store | Bin 0 -> 6148 bytes inc/_notes/dwsync.xml | 1 - js/.DS_Store | Bin 0 -> 6148 bytes js/_notes/dwsync.xml | 1 - js/cs.js | 47 ++++++++++++++++++++++----------- js/html5shiv/_notes/dwsync.xml | 1 - js/min/_notes/dwsync.xml | 1 - js/min/cs.min.js | 2 +- min/.DS_Store | Bin 0 -> 6148 bytes min/_notes/dwsync.xml | 1 - sass/.DS_Store | Bin 0 -> 6148 bytes sass/_notes/dwsync.xml | 1 - sass/uup.scss | 44 +++++++++++------------------- style.css | 34 ++++++++++-------------- 22 files changed, 76 insertions(+), 98 deletions(-) create mode 100644 .DS_Store delete mode 100644 .gitignore delete mode 100644 _notes/dwsync.xml create mode 100644 css/.DS_Store delete mode 100644 css/_notes/dwsync.xml create mode 100644 img/.DS_Store delete mode 100644 img/_notes/dwsync.xml create mode 100644 inc/.DS_Store delete mode 100644 inc/_notes/dwsync.xml create mode 100644 js/.DS_Store delete mode 100644 js/_notes/dwsync.xml delete mode 100644 js/html5shiv/_notes/dwsync.xml delete mode 100644 js/min/_notes/dwsync.xml create mode 100644 min/.DS_Store delete mode 100644 min/_notes/dwsync.xml create mode 100644 sass/.DS_Store delete mode 100644 sass/_notes/dwsync.xml diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..adfb4785a9ca1e3714caccd4103df024608bd82e GIT binary patch literal 15364 zcmeHNdu$xV8UMbslkCorWSlr5CQUeOg57YAec17XKyq=M5Soy<*v5GnoV(j4S#r1Q z-k$B0;L5zDg!i*A)FJ`mk)ZMiifC1}2>1ge-Vlk0s#bkLRsN#tA5|YxznR&)^8+J@ z09(nfG&4Kj%(plD-S_&QHJEYyd}HJL7%3~CGk2b0 zGJaO)BDQ5fEE;y~k)4Bi$8-Iw?3_>SfLQ1s@J23Adu~_Gmg57WBAv{nhcd~$y)l#N zcCNSmzO_LVlxcZTgw;_`Pn^f)<9plKYNzjXPz z=YM-mQ`@B{7c3MNi&!Pw<5;$vcdm8p-0q~Gwq46{_xFxCR{lWWu;V+ajNRiVv$k1* zJ50rOHm_p+7Crn5&yswWAx`L#Z}BR=SB`AT*;HGGp%|jPn)Ud!216wE#8s@8^&E6u z%M`w*tY$IZn@OhZj43S5*1+PtZ&=I56x%ehnYHj;X)l|lMfbeT1YMtw(Ky9(Ao0(zhy zY#4-_;SRV9?uL8dA$Sa)fnUM%@G`sxuftpLHhc&l!{6ZV@Cp1A0TCm}QD6lw#!6g) z)mVe8@B(bWwb+7f*p40e9o&Xj;12A=eV9ZGZFF%Ie}H3nBi@Gh;g9hVd=wwUU*L22 zOTDIuR5*EErkg^IFPvF#OYdCkO>T1~yX>nsIa)yQR~VDxec>+& z+fV|b1kPXyNdFL}BHKjJj_Fpp4yt4dA;)D3p)R^79H3~?piKnrm~Is-@hDbmH7f=X z12sF*qjEa6iJ%?Rt!4+*?0~^9V}MXl{W|eQ)pWpwZo@j1Kq!H!5|~eaPs*Ifr|>Fo*NM4G*b51{!UPjgz{#_hRh_e(t>C?s*V~6m zIrc;_A?E3Kmw*5htH|6z=a{6U> z4lc))crMoAYP=BZaSgUoMt?D0f|ueJ+=`b|X1^VKDYM^&dvGu1_SfQmbnrU#aR`U; z5PlzT!dviGJc36l)4v}dz@OpIwSE9}@I zF%xQ}DgAx)Uwb1R-jHkg{oR__C$Xb?Xh1Lw(=Z3bvcrd)TiasMwQcRAvFPFUwZZ+U zc-1tjYMVA}OL;dOIeOdecij2pG5y{c#44!J{bGH*^v0zPv*`f$61JrXgTEG#{h8RJ z2qLHAZpJE?6cFiTI~j+^P14_k%Fq;yW}NhxtYf0pNvr0(YNcU}H`{=rx`r5%%7!(C z)z+D0Gs=_|g|k?_K}MxbJRrp{BGR^ksRzWCRzq5D(P?NhUw4T#;7J}tBGHO3kGqA; zVXB}Snqez+!EUf%gaG%0@I&|!JOanzS@;dS1aH8b1h?OX_u-H5C-^h`75)MLf&aq) z(8NUwY%e9_JYRwBIx@``GR-zJ%>)^x2Hd@P4Gs|GPGd$H;|Lk!5xf_Ff)C?Ucnpu@ z3H&WSuhp$+j8g#j1SR}@&%dRTZJt>r{AL0GXDe1tr`kF&C@m86l#A!Qx<;yx&>o-j z+B)i<5D_)Xc&uLPuPD=#nbJ#3%+aH)rB&*(C=W(S6G>~u++Z}ZQQ40G-RHHN=~-9` z0iUC4$4Jp$BsF^%K7ilDN3@^wFWSv9NwuoT<45s4QZBiV(};0wqTQVJxPg?b13T4T z&QAO;c4I$YO-i;8Q+SY+EQ=m~53k3=c!S#AIZC@bx8q%S52@Tw@geg3k55vz={!IA z_`!T?`;ec{5y!>QOFJMocOcDZwkqN)P$fQ(llE*KnSdpaSTYfr| zB1}<8=5?eyUFtb1azHZn(^V(W|2I$n{hyi?R-pt!37no1!1B)S&JKFF=^&0gYmZXd zM@3$8-k5F`3su2!yc$zS@kA?ph9>7HXu532bW3-1ed8Yie8FS4F#eDK>T|}A-NN|K lzWV)tWq@H7N+6U#D1lG{p#(w+gc1lP5K17Fz!@Qd{{xWcp^N|k literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 \ 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 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 \ No newline at end of file diff --git a/inc/.DS_Store b/inc/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 \ No newline at end of file diff --git a/js/.DS_Store b/js/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 \ 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 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 \ No newline at end of file diff --git a/sass/.DS_Store b/sass/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 \ 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 {