Created
February 11, 2014 20:07
-
-
Save whyisjake/8943059 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Working copy: /Users/jspurlock/Sites/vip/www/wp-content/themes/makeblog | |
| Command: svn diff . | |
| ================================================================================ | |
| Index: css/style.css | |
| =================================================================== | |
| --- css/style.css (revision 136469) | |
| +++ css/style.css (working copy) | |
| @@ -4924,6 +4924,7 @@ | |
| } | |
| .media > .pull-left { | |
| margin-right: 10px; | |
| + margin-bottom: 20px; | |
| } | |
| .media > .pull-right { | |
| margin-left: 10px; | |
| @@ -7715,26 +7716,33 @@ | |
| .sprite-images { | |
| background-image: url('../images/sprite_images.jpg'); | |
| } | |
| -.sprite-mag { | |
| +.sprite-forum { | |
| background-position: 0 0; | |
| - width: 130px; | |
| - height: 170px; | |
| - float: right; | |
| - border: 1px solid #ccc; | |
| - margin-top: -20px; | |
| + width: 620px; | |
| + height: 174px; | |
| } | |
| +.sprite-page2 { | |
| + background-position: 0 -176px; | |
| + width: 620px; | |
| + height: 174px; | |
| +} | |
| +.sprite-sip { | |
| + background-position: 0 -352px; | |
| + width: 620px; | |
| + height: 174px; | |
| +} | |
| .sprite-forum { | |
| - background-position: -132px 0; | |
| + background-position: 0 0; | |
| width: 620px; | |
| height: 174px; | |
| } | |
| .sprite-page2 { | |
| - background-position: -754px 0; | |
| + background-position: 0 -176px; | |
| width: 620px; | |
| height: 174px; | |
| } | |
| .sprite-sip { | |
| - background-position: -1376px 0; | |
| + background-position: 0 -352px; | |
| width: 620px; | |
| height: 174px; | |
| } | |
| @@ -7786,6 +7794,10 @@ | |
| .show-print { | |
| display: none; | |
| } | |
| +p:empty { | |
| + height: 0px; | |
| + margin: 0px; | |
| +} | |
| .category-top { | |
| font-family: "proxima-nova", sans-serif; | |
| border-bottom: 3px solid #DBDBDB; | |
| @@ -8535,6 +8547,9 @@ | |
| margin: 0px; | |
| font-size: 18px; | |
| } | |
| +.Thumbnail { | |
| + display: block; | |
| +} | |
| .avatar-298 { | |
| margin-bottom: 20px; | |
| border: 1px solid #cecece; | |
| Index: includes/shortcodes.php | |
| =================================================================== | |
| --- includes/shortcodes.php (revision 136469) | |
| +++ includes/shortcodes.php (working copy) | |
| @@ -100,7 +100,7 @@ | |
| <button type="submit" class="btn btn-large btn-primary">Subscribe</button> | |
| </div> | |
| <p></p> | |
| - <legend></legend> | |
| + <legend></legend> | |
| </form>'; | |
| } | |
| add_shortcode( 'makerpro', 'make_marketron_newsletter' ); | |
| @@ -168,9 +168,9 @@ | |
| <label for="juiuilk-juiuilk">Role:</label> | |
| <div class="input"> | |
| <select id="fieldjtvkhh" name="cm-fo-jtvkhh"> | |
| - <option value="4420691">Student</option> | |
| - <option value="4420692">Professor</option> | |
| - </select> | |
| + <option value="4420691">Student</option> | |
| + <option value="4420692">Professor</option> | |
| + </select> | |
| </div> | |
| </fieldset> | |
| <div class="actions"> | |
| @@ -190,23 +190,23 @@ | |
| function printrbot_sweepstakes_newsletter( $atts, $content = null ) { | |
| return ' | |
| <form action="http://newsletter.makezine.com/t/r/s/tyilklk/" method="post"> | |
| - <p> | |
| - <label for="fieldName">Name</label> | |
| - <input id="fieldName" class="input-large" name="cm-name" type="text" /> | |
| - </p> | |
| - <p> | |
| - <label for="fieldEmail">Email</label> | |
| - <input id="fieldEmail" class="input-large" name="cm-tyilklk-tyilklk" type="email" required /> | |
| - </p> | |
| - <p> | |
| - <label>Opt into another list</label> | |
| - <input id="listjjuylk" name="cm-ol-jjuylk" type="checkbox" /> <label style="display:inline;" for="listjjuylk">MAKE Newsletter</label><br> | |
| - <input id="listjrsydu" name="cm-ol-jrsydu" type="checkbox" /> <label style="display:inline;" for="listjrsydu">Maker Pro Newsletter</label><br> | |
| - <input id="listttihir" name="cm-ol-ttihir" type="checkbox" /> <label style="display:inline;" for="listttihir">Maker Shed Newsletter</label><br> | |
| - </p> | |
| - <p> | |
| - <button class="btn blue btn-large" type="submit">Submit</button> | |
| - </p> | |
| + <p> | |
| + <label for="fieldName">Name</label> | |
| + <input id="fieldName" class="input-large" name="cm-name" type="text" /> | |
| + </p> | |
| + <p> | |
| + <label for="fieldEmail">Email</label> | |
| + <input id="fieldEmail" class="input-large" name="cm-tyilklk-tyilklk" type="email" required /> | |
| + </p> | |
| + <p> | |
| + <label>Opt into another list</label> | |
| + <input id="listjjuylk" name="cm-ol-jjuylk" type="checkbox" /> <label style="display:inline;" for="listjjuylk">MAKE Newsletter</label><br> | |
| + <input id="listjrsydu" name="cm-ol-jrsydu" type="checkbox" /> <label style="display:inline;" for="listjrsydu">Maker Pro Newsletter</label><br> | |
| + <input id="listttihir" name="cm-ol-ttihir" type="checkbox" /> <label style="display:inline;" for="listttihir">Maker Shed Newsletter</label><br> | |
| + </p> | |
| + <p> | |
| + <button class="btn blue btn-large" type="submit">Submit</button> | |
| + </p> | |
| </form>'; | |
| } | |
| add_shortcode( 'printrbot', 'printrbot_sweepstakes_newsletter' ); | |
| @@ -556,119 +556,119 @@ | |
| $output = '<script type="text/javascript">var submitted=false;</script>'; | |
| $output = '<iframe name="hidden_iframe" id="hidden_iframe" style="display:none;" onload="if(submitted){window.location="' . home_url() . '/maker-camp/thank-you/";}"></iframe> | |
| <form action="https://docs.google.com/spreadsheet/formResponse?formkey=dGJINmxpaVdpWEk2c0pBY1JuNTY5RlE6MQ" method="post" target="_blank" onsubmit="submitted=true;"> | |
| - <br> | |
| - <div class="errorbox-good"> | |
| - <div class="ss-item ss-item-required ss-text"> | |
| - <div class="ss-form-entry"> | |
| - <label class="ss-q-title" for="entry_0">Program Name</label> <input type="text" name="entry.0.single" value="" class="ss-q-short" id="entry_0"> | |
| - </div> | |
| - </div> | |
| - </div> | |
| - <br> | |
| - <div class="errorbox-good"> | |
| - <div class="ss-item ss-item-required ss-text"> | |
| - <div class="ss-form-entry"> | |
| - <label class="ss-q-title" for="entry_10">Organization Name</label> <input type="text" name="entry.10.single" value="" class="ss-q-short" id="entry_10"> | |
| - </div> | |
| - </div> | |
| - </div> | |
| - <br> | |
| - <div class="errorbox-good"> | |
| - <div class="ss-item ss-item-required ss-text"> | |
| - <div class="ss-form-entry"> | |
| - <label class="ss-q-title" for="entry_11">Program Description (25 words or less)</label> | |
| - <textarea type="text" name="entry.11.single" value="" class="ss-q-short" id="entry_11" rows="4"></textarea> | |
| - <div style="clear:both;"></div> | |
| - </div> | |
| - </div> | |
| - </div> | |
| - <br> | |
| - <div class="errorbox-good"> | |
| - <div class="ss-item ss-item-required ss-text"> | |
| - <div class="ss-form-entry"> | |
| - <label class="ss-q-title" for="entry_1">Program Google+ Link<span class="ss-required-asterisk"> (optional)</span></label> <input type="text" name="entry.1.single" value="" class="ss-q-short" id="entry_1"> | |
| - </div> | |
| - </div> | |
| - </div> | |
| - <br> | |
| - <div class="errorbox-good"> | |
| - <div class="ss-item ss-item-required ss-text"> | |
| - <div class="ss-form-entry"> | |
| - <label class="ss-q-title" for="entry_5">Contact Name</label> <input type="text" name="entry.5.single" value="" class="ss-q-short" id="entry_5"> | |
| - </div> | |
| - </div> | |
| - </div> | |
| - <br> | |
| - <div class="errorbox-good"> | |
| - <div class="ss-item ss-item-required ss-text"> | |
| - <div class="ss-form-entry"> | |
| - <label class="ss-q-title" for="entry_7">Email Address</label> <input type="text" name="entry.7.single" value="" class="ss-q-short" id="entry_7"> | |
| - </div> | |
| - </div> | |
| - </div> | |
| - <br> | |
| - <div class="errorbox-good"> | |
| - <div class="ss-item ss-item-required ss-text"> | |
| - <div class="ss-form-entry"> | |
| - <label class="ss-q-title" for="entry_2">City <span class="ss-required-asterisk"></span></label><input type="text" name="entry.2.single" value="" class="ss-q-short" id="entry_2"> | |
| - </div> | |
| - </div> | |
| - </div> | |
| - <br> | |
| - <div class="errorbox-good"> | |
| - <div class="ss-item ss-item-required ss-text"> | |
| - <div class="ss-form-entry"> | |
| - <label class="ss-q-title" for="entry_3">State <span class="ss-required-asterisk"></span></label> <input type="text" name="entry.3.single" value="" class="ss-q-short" id="entry_3"> | |
| - </div> | |
| - </div> | |
| - </div> | |
| - <br> | |
| - <div class="errorbox-good"> | |
| - <div class="ss-item ss-item-required ss-text"> | |
| - <div class="ss-form-entry"> | |
| - <label class="ss-q-title" for="entry_4">Zipcode <span class="ss-required-asterisk"></span></label> <input type="text" name="entry.4.single" value="" class="ss-q-short" id="entry_4"> | |
| - </div> | |
| - </div> | |
| - </div> | |
| - <br> | |
| - <div class="errorbox-good"> | |
| - <div class="ss-item ss-text"> | |
| - <div class="ss-form-entry"> | |
| - <label class="ss-q-title" for="entry_6">Phone <span class="ss-required-asterisk">(optional)</span></label> <input type="text" name="entry.6.single" value="" class="ss-q-short" id="entry_6"> | |
| - </div> | |
| - </div> | |
| - </div> | |
| - <br> | |
| - <input type="hidden" name="pageNumber" value="0"> <input type="hidden" name="backupCache" value=""> | |
| - <div class="ss-item ss-navigate"> | |
| - <div class="ss-form-entry"> | |
| - <input class="button" type="submit" name="Submit" value="Register Your Program"> | |
| - </div> | |
| - </div> | |
| + <br> | |
| + <div class="errorbox-good"> | |
| + <div class="ss-item ss-item-required ss-text"> | |
| + <div class="ss-form-entry"> | |
| + <label class="ss-q-title" for="entry_0">Program Name</label> <input type="text" name="entry.0.single" value="" class="ss-q-short" id="entry_0"> | |
| + </div> | |
| + </div> | |
| + </div> | |
| + <br> | |
| + <div class="errorbox-good"> | |
| + <div class="ss-item ss-item-required ss-text"> | |
| + <div class="ss-form-entry"> | |
| + <label class="ss-q-title" for="entry_10">Organization Name</label> <input type="text" name="entry.10.single" value="" class="ss-q-short" id="entry_10"> | |
| + </div> | |
| + </div> | |
| + </div> | |
| + <br> | |
| + <div class="errorbox-good"> | |
| + <div class="ss-item ss-item-required ss-text"> | |
| + <div class="ss-form-entry"> | |
| + <label class="ss-q-title" for="entry_11">Program Description (25 words or less)</label> | |
| + <textarea type="text" name="entry.11.single" value="" class="ss-q-short" id="entry_11" rows="4"></textarea> | |
| + <div style="clear:both;"></div> | |
| + </div> | |
| + </div> | |
| + </div> | |
| + <br> | |
| + <div class="errorbox-good"> | |
| + <div class="ss-item ss-item-required ss-text"> | |
| + <div class="ss-form-entry"> | |
| + <label class="ss-q-title" for="entry_1">Program Google+ Link<span class="ss-required-asterisk"> (optional)</span></label> <input type="text" name="entry.1.single" value="" class="ss-q-short" id="entry_1"> | |
| + </div> | |
| + </div> | |
| + </div> | |
| + <br> | |
| + <div class="errorbox-good"> | |
| + <div class="ss-item ss-item-required ss-text"> | |
| + <div class="ss-form-entry"> | |
| + <label class="ss-q-title" for="entry_5">Contact Name</label> <input type="text" name="entry.5.single" value="" class="ss-q-short" id="entry_5"> | |
| + </div> | |
| + </div> | |
| + </div> | |
| + <br> | |
| + <div class="errorbox-good"> | |
| + <div class="ss-item ss-item-required ss-text"> | |
| + <div class="ss-form-entry"> | |
| + <label class="ss-q-title" for="entry_7">Email Address</label> <input type="text" name="entry.7.single" value="" class="ss-q-short" id="entry_7"> | |
| + </div> | |
| + </div> | |
| + </div> | |
| + <br> | |
| + <div class="errorbox-good"> | |
| + <div class="ss-item ss-item-required ss-text"> | |
| + <div class="ss-form-entry"> | |
| + <label class="ss-q-title" for="entry_2">City <span class="ss-required-asterisk"></span></label><input type="text" name="entry.2.single" value="" class="ss-q-short" id="entry_2"> | |
| + </div> | |
| + </div> | |
| + </div> | |
| + <br> | |
| + <div class="errorbox-good"> | |
| + <div class="ss-item ss-item-required ss-text"> | |
| + <div class="ss-form-entry"> | |
| + <label class="ss-q-title" for="entry_3">State <span class="ss-required-asterisk"></span></label> <input type="text" name="entry.3.single" value="" class="ss-q-short" id="entry_3"> | |
| + </div> | |
| + </div> | |
| + </div> | |
| + <br> | |
| + <div class="errorbox-good"> | |
| + <div class="ss-item ss-item-required ss-text"> | |
| + <div class="ss-form-entry"> | |
| + <label class="ss-q-title" for="entry_4">Zipcode <span class="ss-required-asterisk"></span></label> <input type="text" name="entry.4.single" value="" class="ss-q-short" id="entry_4"> | |
| + </div> | |
| + </div> | |
| + </div> | |
| + <br> | |
| + <div class="errorbox-good"> | |
| + <div class="ss-item ss-text"> | |
| + <div class="ss-form-entry"> | |
| + <label class="ss-q-title" for="entry_6">Phone <span class="ss-required-asterisk">(optional)</span></label> <input type="text" name="entry.6.single" value="" class="ss-q-short" id="entry_6"> | |
| + </div> | |
| + </div> | |
| + </div> | |
| + <br> | |
| + <input type="hidden" name="pageNumber" value="0"> <input type="hidden" name="backupCache" value=""> | |
| + <div class="ss-item ss-navigate"> | |
| + <div class="ss-form-entry"> | |
| + <input class="button" type="submit" name="Submit" value="Register Your Program"> | |
| + </div> | |
| + </div> | |
| </form> | |
| - <script type="text/javascript"> | |
| - (function() { | |
| - var divs = document.getElementById(\'ss-form\').getElementsByTagName(\'div\'); | |
| - var numDivs = divs.length; | |
| - for (var j = 0; j < numDivs; j++) { | |
| - if (divs[j].className == \'errorbox-bad\') { | |
| - divs[j].lastChild.firstChild.lastChild.focus(); | |
| - return; | |
| - } | |
| - } | |
| - for (var i = 0; i < numDivs; i++) { | |
| - var div = divs[i]; | |
| - if (div.className == \'ss-form-entry\' && | |
| - div.firstChild && | |
| - div.firstChild.className == \'ss-q-title\') { | |
| - div.lastChild.focus(); | |
| - return; | |
| - } | |
| - } | |
| - })(); | |
| - </script>'; | |
| + <script type="text/javascript"> | |
| + (function() { | |
| + var divs = document.getElementById(\'ss-form\').getElementsByTagName(\'div\'); | |
| + var numDivs = divs.length; | |
| + for (var j = 0; j < numDivs; j++) { | |
| + if (divs[j].className == \'errorbox-bad\') { | |
| + divs[j].lastChild.firstChild.lastChild.focus(); | |
| + return; | |
| + } | |
| + } | |
| + for (var i = 0; i < numDivs; i++) { | |
| + var div = divs[i]; | |
| + if (div.className == \'ss-form-entry\' && | |
| + div.firstChild && | |
| + div.firstChild.className == \'ss-q-title\') { | |
| + div.lastChild.focus(); | |
| + return; | |
| + } | |
| + } | |
| + })(); | |
| + </script>'; | |
| - return $output; | |
| + return $output; | |
| } | |
| add_shortcode('makercamp_register_summer_program_form', 'make_makercamp_register_summer_program_gf' ); | |
| @@ -1065,4 +1065,45 @@ | |
| return $output; | |
| } | |
| -add_shortcode( 'mf_video_highlights', 'make_mf_video_highlights' ); | |
| \ No newline at end of file | |
| +add_shortcode( 'mf_video_highlights', 'make_mf_video_highlights' ); | |
| + | |
| +function make_printrbot_newsletter() { | |
| + $output = '<form class="form-horizontal" action="http://newsletter.makezine.com/t/r/s/tillyud/" method="post"> | |
| + <div class="control-group"> | |
| + <label class="control-label" for="fieldName">Full Name</label> | |
| + <div class="controls"> | |
| + <input type="text" name="cm-name" class="input-xlarge" id="fieldName"> | |
| + </div> | |
| + </div> | |
| + | |
| + <div class="control-group"> | |
| + <label class="control-label" for="cm-tillyud-tillyud">Email</label> | |
| + <div class="controls"> | |
| + <input type="text" name="cm-tillyud-tillyud" class="input-xlarge" id="fieldName"> | |
| + </div> | |
| + </div> | |
| + | |
| + <div class="control-group"> | |
| + <label class="control-label" for="optionsCheckbox">Want more maker news?</label> | |
| + <div class="controls"> | |
| + <label for="listjjuylk" class="checkbox"> | |
| + <input id="listjjuylk" name="cm-ol-jjuylk" type="checkbox" />MAKE Newsletter | |
| + </label> | |
| + <label for="listttihir" class="checkbox"> | |
| + <input id="listttihir" name="cm-ol-ttihir" type="checkbox" />Maker Shed Newsletter | |
| + </label> | |
| + <label for="listjrsydu" class="checkbox"> | |
| + <input id="listjrsydu" name="cm-ol-jrsydu" type="checkbox" />Maker Pro Newsletter | |
| + </label> | |
| + <label for="listttlusi" class="checkbox"> | |
| + <input id="listttlusi" name="cm-ol-ttlusi" type="checkbox" />MakerCon 2014 | |
| + </label> | |
| + </div> | |
| + </div> | |
| + <div class="form-actions"> | |
| + <button type="submit" class="btn btn-primary">Submit</button> | |
| + </div> | |
| + </form>'; | |
| + return $output; | |
| +} | |
| +add_shortcode( 'make_printrbot_newsletter', 'make_printrbot_newsletter' ); | |
| \ No newline at end of file | |
| Index: less/bootstrap/media.less | |
| =================================================================== | |
| --- less/bootstrap/media.less (revision 136469) | |
| +++ less/bootstrap/media.less (working copy) | |
| @@ -39,6 +39,7 @@ | |
| .media > .pull-left { | |
| margin-right: 10px; | |
| + margin-bottom: 20px; | |
| } | |
| .media > .pull-right { | |
| margin-left: 10px; | |
| Index: less/make/common.less | |
| =================================================================== | |
| --- less/make/common.less (revision 136469) | |
| +++ less/make/common.less (working copy) | |
| @@ -38,4 +38,10 @@ | |
| } | |
| .show-print { | |
| display:none; | |
| +} | |
| + | |
| + | |
| +p:empty { | |
| + height: 0px; | |
| + margin: 0px; | |
| } | |
| \ No newline at end of file | |
| Index: less/make/home.less | |
| =================================================================== | |
| --- less/make/home.less (revision 136469) | |
| +++ less/make/home.less (working copy) | |
| @@ -191,4 +191,8 @@ | |
| } | |
| } | |
| } | |
| +} | |
| + | |
| +.Thumbnail { | |
| + display:block; | |
| } | |
| \ No newline at end of file | |
| Index: less/make/style.less | |
| =================================================================== | |
| --- less/make/style.less (revision 136469) | |
| +++ less/make/style.less (working copy) | |
| @@ -2678,26 +2678,21 @@ | |
| .sprite-images { | |
| background-image:url('../images/sprite_images.jpg'); | |
| } | |
| -.sprite-mag { | |
| +.sprite-forum { | |
| background-position: 0 0; | |
| - width: 130px; | |
| - height: 170px; | |
| - float: right; | |
| - border: 1px solid #ccc; | |
| - margin-top: -20px; | |
| -} | |
| -.sprite-forum { | |
| - background-position: -132px 0; | |
| width: 620px; | |
| height: 174px; | |
| } | |
| .sprite-page2 { | |
| - background-position: -754px 0; | |
| + background-position: 0 -176px; | |
| width: 620px; | |
| height: 174px; | |
| } | |
| .sprite-sip { | |
| - background-position: -1376px 0; | |
| + background-position: 0 -352px; | |
| width: 620px; | |
| height: 174px; | |
| -} | |
| \ No newline at end of file | |
| +} | |
| +.sprite-forum{ background-position: 0 0; width: 620px; height: 174px; } | |
| +.sprite-page2{ background-position: 0 -176px; width: 620px; height: 174px; } | |
| +.sprite-sip{ background-position: 0 -352px; width: 620px; height: 174px; } | |
| \ No newline at end of file |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment