Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: kremalicious/kremalicious2
base: 08ee8f5e8d
...
head fork: kremalicious/kremalicious2
compare: 42f8837183
  • 7 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
166 html/wp-content/themes/kremalicious2/assets/css/app.css
@@ -30,7 +30,10 @@ body {
/* DEFAULT FONT SETTINGS */
/* ============================================================== */
-body,input,select,textarea {
+
+body,
+p,
+input,select,textarea {
font: 16px/24px 'rooney-web',Georgia,Palatino,'Palatino Linotype',Times,'Times New Roman',serif;
color: #2e4f5c;
font-style: normal;
@@ -38,6 +41,15 @@ body,input,select,textarea {
text-shadow: 0 1px 0 rgba(255,255,255,.9);
}
+/* typekit loading events */
+.wf-loading body,
+.wf-inactive body,
+.wf-loading p,
+.wf-inactive p {
+ font-family: Georgia,Palatino,'Palatino Linotype',Times,'Times New Roman',serif;
+ word-spacing: .1em;
+}
+
p,blockquote,q,pre,address,hr,code,samp,dl,ol,ul,form,table,fieldset,menu,img {
margin: 0 0 1.5em;
padding: 0;
@@ -114,15 +126,16 @@ em {
/* QUOTES */
/* ============================================================== */
-blockquote {
+blockquote,
+blockquote > p {
font-style: italic;
- padding-left: 1em;
- border-left: 2px solid #a9b8bd;
+ padding: 0;
color: rgba(46, 79, 92, .7);
}
-blockquote > p {
- padding: 0;
+blockquote {
+ padding-left: 1.5em;
+ border-left: 2px solid #a9b8bd;
}
/* LINKS */
@@ -736,6 +749,8 @@ li[class*=" icon-"].icon-large:before {
background: linear-gradient(top, #9da8ac 0%,#b7c1c4 21%,#b7c1c4 72%,#9da8ac 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9da8ac', endColorstr='#9da8ac',GradientType=0 );
border-bottom: 1px solid #9eaab2;
+ -webkit-box-shadow: 0 1px 4px #b7c1c4, inset 0 -1px 0 #c1c8ca;
+ -moz-box-shadow: 0 1px 4px #b7c1c4, inset 0 -1px 0 #c1c8ca;
box-shadow: 0 1px 4px #b7c1c4, inset 0 -1px 0 #c1c8ca;
}
@@ -902,7 +917,91 @@ nav[role="navigation"] li#home {
nav[role="navigation"] li.current_page_item a {
background: -webkit-linear-gradient(top, rgba(145,154,158,1) 0%,rgba(162,173,177,1) 22%,rgba(183,193,196,1) 100%);
+ background: -moz-linear-gradient(top, rgba(145,154,158,1) 0%,rgba(162,173,177,1) 22%,rgba(183,193,196,1) 100%);
+ background: -o-linear-gradient(top, rgba(145,154,158,1) 0%,rgba(162,173,177,1) 22%,rgba(183,193,196,1) 100%);
+ background: -ms-linear-gradient(top, rgba(145,154,158,1) 0%,rgba(162,173,177,1) 22%,rgba(183,193,196,1) 100%);
+ background: linear-gradient(top, rgba(145,154,158,1) 0%,rgba(162,173,177,1) 22%,rgba(183,193,196,1) 100%);
+ -webkit-box-shadow: inset 0 -1px 0 rgba(255,255,255,.5), inset 0 1px 4px rgba(0,0,0,.2), inset 0 1px 10px rgba(0,0,0,.1);
+ -moz-box-shadow: inset 0 -1px 0 rgba(255,255,255,.5), inset 0 1px 4px rgba(0,0,0,.2), inset 0 1px 10px rgba(0,0,0,.1);
box-shadow: inset 0 -1px 0 rgba(255,255,255,.5), inset 0 1px 4px rgba(0,0,0,.2), inset 0 1px 10px rgba(0,0,0,.1);
+
+}
+
+/* Topics Dropdown */
+
+.dropdown {
+ position: relative;
+}
+
+nav[role="navigation"] a.dropdown-toggle {
+ color: #657276;
+}
+
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+ outline: 0;
+}
+
+.caret {
+ display: inline-block;
+ width: 0;
+ height: 0;
+ vertical-align: top;
+ border-top: 4px solid #000000;
+ border-right: 4px solid transparent;
+ border-left: 4px solid transparent;
+ content: "";
+ opacity: 0.3;
+ filter: alpha(opacity=30);
+}
+
+.dropdown .caret {
+ margin-top: 8px;
+ margin-left: 2px;
+}
+
+.dropdown:hover .caret,
+.open .caret {
+ opacity: 1;
+ filter: alpha(opacity=100);
+}
+
+.dropdown-menu {
+ width: 280%;
+ font-size: .9em;
+ z-index: 1000;
+ display: none;
+ float: left;
+ list-style: none;
+}
+
+nav[role="navigation"] .dropdown-menu li {
+ border: none;
+ box-shadow: none;
+ float: none;
+}
+
+nav[role="navigation"] .dropdown-menu li a {
+ float: left;
+ width: 48%;
+ white-space: nowrap;
+ text-align: left;
+ padding: .5em 1em;
+
+}
+
+.dropdown-menu li > a:hover,
+.dropdown-menu .current_page_item > a,
+.dropdown-menu .current_page_item > a:hover {
+ text-decoration: none;
+}
+
+.open {
+ *z-index: 1000;
+}
+
+.open .dropdown-menu {
+ display: block;
}
@@ -916,7 +1015,7 @@ nav[role="navigation"] li.current_page_item a {
#menubar #searchform {
position: absolute;
right: 0;
- bottom: .4em;
+ top: 3.5em;
padding: 0;
}
@@ -1376,14 +1475,18 @@ body.single-format-image .photoPostWrap {
#comments, #respond, #submit { clear: both; display: block; }
-#commentShow {
- display: block;
- margin-bottom: 2em;
+#comments h2,
+#respond h2 {
text-align: left;
font-size: 1.625em;
line-height: 1;
}
+#commentShow {
+ display: block;
+ margin-bottom: 2em;
+}
+
.js #commentShow {
cursor: pointer;
}
@@ -2573,6 +2676,49 @@ pre .regexp {
margin-bottom: 0;
}
+ .dropdown-menu {
+
+ width: 150%;
+ position: absolute;
+ top: 100%;
+ left: 0;
+ padding: 4px 0;
+ margin: 1px 0 0;
+ z-index: 5;
+ background: #b7c1c4;
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b7c1c4), color-stop(72%,#b7c1c4), color-stop(100%,#9da8ac));
+ -webkit-box-shadow: 0 1px 4px #b7c1c4, inset 0 1px 0 #d2dadc;
+ -moz-box-shadow: 0 1px 4px #b7c1c4, inset 0 1px 0 #d2dadc;
+ box-shadow: 0 1px 4px #b7c1c4, inset 0 1px 0 #d2dadc;
+
+ border: 1px solid #9eaab2;
+
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+
+ -webkit-background-clip: padding-box;
+ -moz-background-clip: padding;
+ background-clip: padding-box;
+ }
+
+ nav[role="navigation"] .dropdown-menu li {
+ border: none !important;
+ box-shadow: none !important;
+ }
+
+ nav[role="navigation"] .dropdown-menu li a {
+ float: none;
+ clear: both;
+ display: block;
+ width: 100%;
+ }
+
+ #menubar #searchform {
+ top: auto;
+ bottom: .4em;
+ }
+
#menubar #searchform #s:focus {
width: 280px;
}
View
103 html/wp-content/themes/kremalicious2/assets/js/plugins.js
@@ -646,4 +646,105 @@ pattern:/\.[\w\-_]+/g},{name:"entity.name.id",pattern:/\#[\w\-_]+/g},{name:"enti
* Licensed under the MIT license.
* Copyright 2012 David DeSandro
*/
-(function(a,b,c){"use strict";var d=b.event,e;d.special.smartresize={setup:function(){b(this).bind("resize",d.special.smartresize.handler)},teardown:function(){b(this).unbind("resize",d.special.smartresize.handler)},handler:function(a,c){var d=this,f=arguments;a.type="smartresize",e&&clearTimeout(e),e=setTimeout(function(){b.event.handle.apply(d,f)},c==="execAsap"?0:100)}},b.fn.smartresize=function(a){return a?this.bind("smartresize",a):this.trigger("smartresize",["execAsap"])},b.Mason=function(a,c){this.element=b(c),this._create(a),this._init()},b.Mason.settings={isResizable:!0,isAnimated:!1,animationOptions:{queue:!1,duration:500},gutterWidth:0,isRTL:!1,isFitWidth:!1,containerStyle:{position:"relative"}},b.Mason.prototype={_filterFindBricks:function(a){var b=this.options.itemSelector;return b?a.filter(b).add(a.find(b)):a},_getBricks:function(a){var b=this._filterFindBricks(a).css({position:"absolute"}).addClass("masonry-brick");return b},_create:function(c){this.options=b.extend(!0,{},b.Mason.settings,c),this.styleQueue=[];var d=this.element[0].style;this.originalStyle={height:d.height||""};var e=this.options.containerStyle;for(var f in e)this.originalStyle[f]=d[f]||"";this.element.css(e),this.horizontalDirection=this.options.isRTL?"right":"left",this.offset={x:parseInt(this.element.css("padding-"+this.horizontalDirection),10),y:parseInt(this.element.css("padding-top"),10)},this.isFluid=this.options.columnWidth&&typeof this.options.columnWidth=="function";var g=this;setTimeout(function(){g.element.addClass("masonry")},0),this.options.isResizable&&b(a).bind("smartresize.masonry",function(){g.resize()}),this.reloadItems()},_init:function(a){this._getColumns(),this._reLayout(a)},option:function(a,c){b.isPlainObject(a)&&(this.options=b.extend(!0,this.options,a))},layout:function(a,b){for(var c=0,d=a.length;c<d;c++)this._placeBrick(a[c]);var e={};e.height=Math.max.apply(Math,this.colYs);if(this.options.isFitWidth){var f=0;c=this.cols;while(--c){if(this.colYs[c]!==0)break;f++}e.width=(this.cols-f)*this.columnWidth-this.options.gutterWidth}this.styleQueue.push({$el:this.element,style:e});var g=this.isLaidOut?this.options.isAnimated?"animate":"css":"css",h=this.options.animationOptions,i;for(c=0,d=this.styleQueue.length;c<d;c++)i=this.styleQueue[c],i.$el[g](i.style,h);this.styleQueue=[],b&&b.call(a),this.isLaidOut=!0},_getColumns:function(){var a=this.options.isFitWidth?this.element.parent():this.element,b=a.width();this.columnWidth=this.isFluid?this.options.columnWidth(b):this.options.columnWidth||this.$bricks.outerWidth(!0)||b,this.columnWidth+=this.options.gutterWidth,this.cols=Math.floor((b+this.options.gutterWidth)/this.columnWidth),this.cols=Math.max(this.cols,1)},_placeBrick:function(a){var c=b(a),d,e,f,g,h;d=Math.ceil(c.outerWidth(!0)/(this.columnWidth+this.options.gutterWidth)),d=Math.min(d,this.cols);if(d===1)f=this.colYs;else{e=this.cols+1-d,f=[];for(h=0;h<e;h++)g=this.colYs.slice(h,h+d),f[h]=Math.max.apply(Math,g)}var i=Math.min.apply(Math,f),j=0;for(var k=0,l=f.length;k<l;k++)if(f[k]===i){j=k;break}var m={top:i+this.offset.y};m[this.horizontalDirection]=this.columnWidth*j+this.offset.x,this.styleQueue.push({$el:c,style:m});var n=i+c.outerHeight(!0),o=this.cols+1-l;for(k=0;k<o;k++)this.colYs[j+k]=n},resize:function(){var a=this.cols;this._getColumns(),(this.isFluid||this.cols!==a)&&this._reLayout()},_reLayout:function(a){var b=this.cols;this.colYs=[];while(b--)this.colYs.push(0);this.layout(this.$bricks,a)},reloadItems:function(){this.$bricks=this._getBricks(this.element.children())},reload:function(a){this.reloadItems(),this._init(a)},appended:function(a,b,c){if(b){this._filterFindBricks(a).css({top:this.element.height()});var d=this;setTimeout(function(){d._appended(a,c)},1)}else this._appended(a,c)},_appended:function(a,b){var c=this._getBricks(a);this.$bricks=this.$bricks.add(c),this.layout(c,b)},remove:function(a){this.$bricks=this.$bricks.not(a),a.remove()},destroy:function(){this.$bricks.removeClass("masonry-brick").each(function(){this.style.position="",this.style.top="",this.style.left=""});var c=this.element[0].style;for(var d in this.originalStyle)c[d]=this.originalStyle[d];this.element.unbind(".masonry").removeClass("masonry").removeData("masonry"),b(a).unbind(".masonry")}},b.fn.imagesLoaded=function(a){function h(){a.call(c,d)}function i(a){var c=a.target;c.src!==f&&b.inArray(c,g)===-1&&(g.push(c),--e<=0&&(setTimeout(h),d.unbind(".imagesLoaded",i)))}var c=this,d=c.find("img").add(c.filter("img")),e=d.length,f="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==",g=[];return e||h(),d.bind("load.imagesLoaded error.imagesLoaded",i).each(function(){var a=this.src;this.src=f,this.src=a}),c};var f=function(b){a.console&&a.console.error(b)};b.fn.masonry=function(a){if(typeof a=="string"){var c=Array.prototype.slice.call(arguments,1);this.each(function(){var d=b.data(this,"masonry");if(!d){f("cannot call methods on masonry prior to initialization; attempted to call method '"+a+"'");return}if(!b.isFunction(d[a])||a.charAt(0)==="_"){f("no such method '"+a+"' for masonry instance");return}d[a].apply(d,c)})}else this.each(function(){var c=b.data(this,"masonry");c?(c.option(a||{}),c._init()):b.data(this,"masonry",new b.Mason(a,this))});return this}})(window,jQuery);
+(function(a,b,c){"use strict";var d=b.event,e;d.special.smartresize={setup:function(){b(this).bind("resize",d.special.smartresize.handler)},teardown:function(){b(this).unbind("resize",d.special.smartresize.handler)},handler:function(a,c){var d=this,f=arguments;a.type="smartresize",e&&clearTimeout(e),e=setTimeout(function(){b.event.handle.apply(d,f)},c==="execAsap"?0:100)}},b.fn.smartresize=function(a){return a?this.bind("smartresize",a):this.trigger("smartresize",["execAsap"])},b.Mason=function(a,c){this.element=b(c),this._create(a),this._init()},b.Mason.settings={isResizable:!0,isAnimated:!1,animationOptions:{queue:!1,duration:500},gutterWidth:0,isRTL:!1,isFitWidth:!1,containerStyle:{position:"relative"}},b.Mason.prototype={_filterFindBricks:function(a){var b=this.options.itemSelector;return b?a.filter(b).add(a.find(b)):a},_getBricks:function(a){var b=this._filterFindBricks(a).css({position:"absolute"}).addClass("masonry-brick");return b},_create:function(c){this.options=b.extend(!0,{},b.Mason.settings,c),this.styleQueue=[];var d=this.element[0].style;this.originalStyle={height:d.height||""};var e=this.options.containerStyle;for(var f in e)this.originalStyle[f]=d[f]||"";this.element.css(e),this.horizontalDirection=this.options.isRTL?"right":"left",this.offset={x:parseInt(this.element.css("padding-"+this.horizontalDirection),10),y:parseInt(this.element.css("padding-top"),10)},this.isFluid=this.options.columnWidth&&typeof this.options.columnWidth=="function";var g=this;setTimeout(function(){g.element.addClass("masonry")},0),this.options.isResizable&&b(a).bind("smartresize.masonry",function(){g.resize()}),this.reloadItems()},_init:function(a){this._getColumns(),this._reLayout(a)},option:function(a,c){b.isPlainObject(a)&&(this.options=b.extend(!0,this.options,a))},layout:function(a,b){for(var c=0,d=a.length;c<d;c++)this._placeBrick(a[c]);var e={};e.height=Math.max.apply(Math,this.colYs);if(this.options.isFitWidth){var f=0;c=this.cols;while(--c){if(this.colYs[c]!==0)break;f++}e.width=(this.cols-f)*this.columnWidth-this.options.gutterWidth}this.styleQueue.push({$el:this.element,style:e});var g=this.isLaidOut?this.options.isAnimated?"animate":"css":"css",h=this.options.animationOptions,i;for(c=0,d=this.styleQueue.length;c<d;c++)i=this.styleQueue[c],i.$el[g](i.style,h);this.styleQueue=[],b&&b.call(a),this.isLaidOut=!0},_getColumns:function(){var a=this.options.isFitWidth?this.element.parent():this.element,b=a.width();this.columnWidth=this.isFluid?this.options.columnWidth(b):this.options.columnWidth||this.$bricks.outerWidth(!0)||b,this.columnWidth+=this.options.gutterWidth,this.cols=Math.floor((b+this.options.gutterWidth)/this.columnWidth),this.cols=Math.max(this.cols,1)},_placeBrick:function(a){var c=b(a),d,e,f,g,h;d=Math.ceil(c.outerWidth(!0)/(this.columnWidth+this.options.gutterWidth)),d=Math.min(d,this.cols);if(d===1)f=this.colYs;else{e=this.cols+1-d,f=[];for(h=0;h<e;h++)g=this.colYs.slice(h,h+d),f[h]=Math.max.apply(Math,g)}var i=Math.min.apply(Math,f),j=0;for(var k=0,l=f.length;k<l;k++)if(f[k]===i){j=k;break}var m={top:i+this.offset.y};m[this.horizontalDirection]=this.columnWidth*j+this.offset.x,this.styleQueue.push({$el:c,style:m});var n=i+c.outerHeight(!0),o=this.cols+1-l;for(k=0;k<o;k++)this.colYs[j+k]=n},resize:function(){var a=this.cols;this._getColumns(),(this.isFluid||this.cols!==a)&&this._reLayout()},_reLayout:function(a){var b=this.cols;this.colYs=[];while(b--)this.colYs.push(0);this.layout(this.$bricks,a)},reloadItems:function(){this.$bricks=this._getBricks(this.element.children())},reload:function(a){this.reloadItems(),this._init(a)},appended:function(a,b,c){if(b){this._filterFindBricks(a).css({top:this.element.height()});var d=this;setTimeout(function(){d._appended(a,c)},1)}else this._appended(a,c)},_appended:function(a,b){var c=this._getBricks(a);this.$bricks=this.$bricks.add(c),this.layout(c,b)},remove:function(a){this.$bricks=this.$bricks.not(a),a.remove()},destroy:function(){this.$bricks.removeClass("masonry-brick").each(function(){this.style.position="",this.style.top="",this.style.left=""});var c=this.element[0].style;for(var d in this.originalStyle)c[d]=this.originalStyle[d];this.element.unbind(".masonry").removeClass("masonry").removeData("masonry"),b(a).unbind(".masonry")}},b.fn.imagesLoaded=function(a){function h(){a.call(c,d)}function i(a){var c=a.target;c.src!==f&&b.inArray(c,g)===-1&&(g.push(c),--e<=0&&(setTimeout(h),d.unbind(".imagesLoaded",i)))}var c=this,d=c.find("img").add(c.filter("img")),e=d.length,f="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==",g=[];return e||h(),d.bind("load.imagesLoaded error.imagesLoaded",i).each(function(){var a=this.src;this.src=f,this.src=a}),c};var f=function(b){a.console&&a.console.error(b)};b.fn.masonry=function(a){if(typeof a=="string"){var c=Array.prototype.slice.call(arguments,1);this.each(function(){var d=b.data(this,"masonry");if(!d){f("cannot call methods on masonry prior to initialization; attempted to call method '"+a+"'");return}if(!b.isFunction(d[a])||a.charAt(0)==="_"){f("no such method '"+a+"' for masonry instance");return}d[a].apply(d,c)})}else this.each(function(){var c=b.data(this,"masonry");c?(c.option(a||{}),c._init()):b.data(this,"masonry",new b.Mason(a,this))});return this}})(window,jQuery);
+
+/* ============================================================
+ * bootstrap-dropdown.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+ "use strict"; // jshint ;_;
+
+
+ /* DROPDOWN CLASS DEFINITION
+ * ========================= */
+
+ var toggle = '[data-toggle="dropdown"]'
+ , Dropdown = function (element) {
+ var $el = $(element).on('click.dropdown.data-api', this.toggle)
+ $('html').on('click.dropdown.data-api', function () {
+ $el.parent().removeClass('open')
+ })
+ }
+
+ Dropdown.prototype = {
+
+ constructor: Dropdown
+
+ , toggle: function (e) {
+ var $this = $(this)
+ , $parent
+ , selector
+ , isActive
+
+ if ($this.is('.disabled, :disabled')) return
+
+ selector = $this.attr('data-target')
+
+ if (!selector) {
+ selector = $this.attr('href')
+ selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+ }
+
+ $parent = $(selector)
+ $parent.length || ($parent = $this.parent())
+
+ isActive = $parent.hasClass('open')
+
+ clearMenus()
+
+ if (!isActive) $parent.toggleClass('open')
+
+ return false
+ }
+
+ }
+
+ function clearMenus() {
+ $(toggle).parent().removeClass('open')
+ }
+
+
+ /* DROPDOWN PLUGIN DEFINITION
+ * ========================== */
+
+ $.fn.dropdown = function (option) {
+ return this.each(function () {
+ var $this = $(this)
+ , data = $this.data('dropdown')
+ if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+ if (typeof option == 'string') data[option].call($this)
+ })
+ }
+
+ $.fn.dropdown.Constructor = Dropdown
+
+
+ /* APPLY TO STANDARD DROPDOWN ELEMENTS
+ * =================================== */
+
+ $(function () {
+ $('html').on('click.dropdown.data-api', clearMenus)
+ $('body')
+ .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() })
+ .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+ })
+
+}(window.jQuery);
View
1  html/wp-content/themes/kremalicious2/assets/js/script.js
@@ -20,6 +20,7 @@ $(ASAP = function(){
}
interface.init();
$('#respond label').inFieldLabels();
+ $('#topicmenu .dropdown-toggle').dropdown();
});
View
16 html/wp-content/themes/kremalicious2/comments.php
@@ -121,6 +121,14 @@
<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'roots'), wp_login_url(get_permalink())); ?></p>
<?php } else { ?>
<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+ <p>
+ <small class="dimmed">Be nice, don't spam. You can just use <a href="http://daringfireball.net/projects/markdown/syntax">Markdown</a>. Code snippets should be wrapped in <code>&lt;code&gt;</code> tags. Everything in between gets automatically encoded to HTML entities, wrapped in pre tags and syntax highlighted.</small>
+ </p>
+ <p>
+ <label for="comment"><?php _e('Comment', 'roots'); ?></label>
+ <textarea name="comment" id="comment" rows="4" tabindex="4"></textarea>
+ </p>
+
<?php if (is_user_logged_in()) { ?>
<p><?php printf(__('Logged in as <a href="%s/wp-admin/profile.php">%s</a>.', 'roots'), get_option('siteurl'), $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php __('Log out of this account', 'roots'); ?>"><?php _e('Log out &raquo;', 'roots'); ?></a></p>
<?php } else { ?>
@@ -137,13 +145,7 @@
<input type="url" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3">
</p>
<?php } ?>
- <p>
- <small class="dimmed">Be nice, don't spam. You can just use <a href="http://daringfireball.net/projects/markdown/syntax">Markdown</a>. Code snippets should be wrapped in <code>&lt;code&gt;</code> tags. Everything in between gets automatically encoded to HTML entities, wrapped in pre tags and syntax highlighted.</small>
- </p>
- <p>
- <label for="comment"><?php _e('Comment', 'roots'); ?></label>
- <textarea name="comment" id="comment" tabindex="4"></textarea>
- </p>
+
<p>
<input name="submit" class="btn btn-primary" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'roots'); ?>">
</p>
View
2  html/wp-content/themes/kremalicious2/functions.php
@@ -13,7 +13,7 @@ function kremalicious2_setup() {
// tell the TinyMCE editor to use editor-style.css
// if you have issues with getting the editor to show your changes then
// use this instead: add_editor_style('editor-style.css?' . time());
- add_editor_style('assets/css/editor.css?' . time());
+ add_editor_style('assets/css/editor.css');
// http://codex.wordpress.org/Post_Thumbnails
add_theme_support('post-thumbnails');
View
43 html/wp-content/themes/kremalicious2/header.php
@@ -27,8 +27,32 @@
<meta http-equiv="cleartype" content="on">
- <script type="text/javascript" src="http://use.typekit.com/msu4qap.js"></script>
- <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+ <script>
+ TypekitConfig = {
+ kitId: 'msu4qap',
+ scriptTimeout: 3000
+ };
+ (function() {
+ var h = document.getElementsByTagName('html')[0];
+ h.className += ' wf-loading';
+ var t = setTimeout(function() {
+ h.className = h.className.replace(/(\s|^)wf-loading(\s|$)/g, '');
+ h.className += ' wf-inactive';
+ }, TypekitConfig.scriptTimeout);
+ var tk = document.createElement('script');
+ tk.src = '//use.typekit.com/' + TypekitConfig.kitId + '.js';
+ tk.type = 'text/javascript';
+ tk.async = 'true';
+ tk.onload = tk.onreadystatechange = function() {
+ var rs = this.readyState;
+ if (rs && rs != 'complete' && rs != 'loaded') return;
+ clearTimeout(t);
+ try { Typekit.load(TypekitConfig); } catch (e) {}
+ };
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(tk, s);
+ })();
+ </script>
<script src="<?php echo get_template_directory_uri(); ?>/assets/js/libs/modernizr-2.5.3.min.js"></script>
@@ -63,7 +87,20 @@
<nav role="navigation" class="clearfix alignleft">
<ul>
<li id="home"><a href="/"><i class="icon-home"></i> Home<span></span></a></li>
- <li <?php if ( is_category('goodies') ) echo 'class="current_page_item"'; ?>><a href="/goodies"> <i class="icon-gift"></i> Goodies</a></li>
+ <li class="dropdown" id="topicmenu">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#topicmenu">
+ Topics
+ <b class="caret"></b>
+ </a>
+ <ul class="dropdown-menu">
+ <li <?php if ( is_category('goodies') ) echo 'class="current_page_item"'; ?>><a href="/goodies"> <i class="icon-gift"></i> goodies</a></li>
+ <li <?php if ( is_category('photos') ) echo 'class="current_page_item"'; ?>><a href="/photos"> <i class="icon-picture"></i> photos</a></li>
+ <li <?php if ( is_category('personal') ) echo 'class="current_page_item"'; ?>><a href="/personal"> <i class="icon-user"></i> personal</a></li>
+ <li <?php if ( is_category('design') ) echo 'class="current_page_item"'; ?>><a href="/design"> <i class="icon-leaf"></i> design</a></li>
+ <li <?php if ( is_category('photography') ) echo 'class="current_page_item"'; ?>><a href="/photography"> <i class="icon-camera-retro"></i> photography</a></li>
+ <li <?php if ( is_category('links') ) echo 'class="current_page_item"'; ?>><a href="/links"> <i class="icon-bookmark"></i> links</a></li>
+ </ul>
+ </li>
<!--<li><a href="/about"> <i class="icon-user"></i> About</a></li>-->
</ul>
</nav>

No commit comments for this range

Something went wrong with that request. Please try again.