Permalink
Browse files

Merge branch 'internal-hotfix-5.13'

Conflicts:
	README.mkd
  • Loading branch information...
2 parents bfdf732 + 737601f commit 68ab63be8c9c7cd61372488a92f2df7a6bd34957 @yuji yuji committed Feb 22, 2012
Showing with 381 additions and 235 deletions.
  1. +1 −1 README.mkd
  2. BIN themes/smart_blog/static/jquerymobile/images/ajax-loader.png
  3. BIN themes/smart_blog/static/jquerymobile/images/icons-18-black.png
  4. BIN themes/smart_blog/static/jquerymobile/images/icons-18-white.png
  5. BIN themes/smart_blog/static/jquerymobile/images/icons-36-black.png
  6. BIN themes/smart_blog/static/jquerymobile/images/icons-36-white.png
  7. +2 −12 themes/smart_blog/static/jquerymobile/jquery.mobile.min.css
  8. +170 −168 themes/smart_blog/static/jquerymobile/jquery.mobile.min.js
  9. +2 −0 themes/smart_blog/static/jquerymobile/jquery.mobile.structure.min.css
  10. +22 −0 themes/smart_blog/static/style_library/base.css
  11. +24 −8 themes/smart_blog/static/style_library/equivalent/screen.css
  12. +8 −1 themes/smart_blog/static/style_library/smartphone.css
  13. +5 −0 themes/smart_blog/templates/category_entry_listing.mtml
  14. +2 −2 themes/smart_blog/templates/comment_form.mtml
  15. +5 −0 themes/smart_blog/templates/comment_preview.mtml
  16. +5 −0 themes/smart_blog/templates/comment_response.mtml
  17. +5 −0 themes/smart_blog/templates/dynamic_error.mtml
  18. +5 −0 themes/smart_blog/templates/entry.mtml
  19. +1 −1 themes/smart_blog/templates/entry_summary.mtml
  20. +3 −3 themes/smart_blog/templates/html_head.mtml
  21. +5 −5 themes/smart_blog/templates/html_head_mobile.mtml
  22. +97 −30 themes/smart_blog/templates/javascript.mtml
  23. +6 −1 themes/smart_blog/templates/main_index.mtml
  24. +5 −0 themes/smart_blog/templates/page.mtml
  25. +5 −0 themes/smart_blog/templates/search_results.mtml
  26. +2 −2 themes/smart_blog/templates/styles.mtml
  27. +1 −1 themes/smart_blog/theme.yaml
View
@@ -171,4 +171,4 @@ This library is free software; you can redistribute it and/or modify it under th
The following copyright notice applies to all the files provided in this distribution, including binary files, unless explicitly noted otherwise.
-Copyright 2011 Six Apart, Ltd.
+Copyright 2011-2012 Six Apart, Ltd.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -595,10 +595,32 @@ header a {
box-sizing: border-box;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
+ -webkit-appearance: none;
}
#commenter-info li input[required] {
padding-right: 2em;
}
+#comments-open-captcha {
+ margin: 1.62em 0;
+}
+#comments-open-captcha .label {
+ display: none;
+}
+#comments-open-captcha #captcha_code {
+ width: 150px;
+ margin: 0.62em 0;
+ padding: 0.62em;
+ border: 1px solid black;
+ font-size: 100%;
+ box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-appearance: none;
+}
+#comments-open-captcha p {
+ margin: 0;
+ font-size: 90%;
+}
/* - Content Navigation */
.content-nav {
@@ -154,7 +154,8 @@ button:active,
#comment-greeting,
#comment-form-reply,
.comments fieldset,
-#commenter-info li {
+#commenter-info li,
+#comments-open-captcha #captcha_code {
border-color: #bfc5c8;
}
@@ -189,18 +190,26 @@ button,
.button,
#comment-greeting,
.comments fieldset,
+#comments-open-captcha #captcha_code,
.comments .comment-preview {
border-radius: 0.62em;
-webkit-border-radius: 0.62em;
-moz-border-radius: 0.62em;
}
+#comments-open-captcha img {
+ background-color: #bfc5c8;
+}
a,
-.ui-body-a .ui-link {
+.ui-body-a .ui-link,
+.ui-body-a .ui-link:link,
+.ui-body-a .ui-link:visited,
+.ui-body-a .ui-link:hover,
+.ui-body-a .ui-link:active {
color: #274a78;
}
-a:hover {
+.ui-body-a .ui-link:hover {
text-decoration: none;
}
@@ -223,7 +232,14 @@ a:hover {
}
.page-header a,
.page-footer a,
-.ui-bar-a .ui-link {
+.ui-bar-a a.ui-link {
+ color: #fff;
+}
+.ui-bar-a a.ui-link,
+.ui-bar-a a.ui-link:link,
+.ui-bar-a a.ui-link:visited,
+.ui-bar-a a.ui-link:hover,
+.ui-bar-a a.ui-link:active {
color: #fff;
}
.ui-header {
@@ -232,7 +248,7 @@ a:hover {
}
.ui-body-a {
- color: #2F3E46;
+ color: #2f3e46;
background: #fff;
text-shadow: none;
}
@@ -244,7 +260,7 @@ a:hover {
font-family: Helvetica, Arial, sans-serif;
}
.ui-body-a .ui-link-inherit {
- color: #2F3E46;
+ color: #2f3e46;
}
.ui-content {
@@ -265,7 +281,7 @@ a:hover {
background-image: linear-gradient(top, #fdfdfd, #eee);
}
.ui-btn-up-a a.ui-link-inherit {
- color: #2F3E46;
+ color: #2f3e46;
}
.ui-btn-hover-a {
@@ -278,7 +294,7 @@ a:hover {
background-image: linear-gradient(top, #ededed, #dadada);
}
.ui-btn-hover-a a.ui-link-inherit {
- color: #2F3E46;
+ color: #2f3e46;
}
.ui-btn-down-a {
border: 1px solid #808080;
@@ -232,6 +232,13 @@ textarea {
}
/* - Comments */
+#comments-open-captcha {
+ text-align: center;
+}
+#comments-open-captcha #captcha_code {
+ display: inline;
+}
+
#comments-open-footer .ui-btn {
width: 100%;
margin: 0.62em 0 0;
@@ -240,7 +247,7 @@ textarea {
/* - Content Navigation */
.content-nav .ui-btn {
box-sizing: border-box;
- -webkit-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
}
/* - Footer */
@@ -108,6 +108,11 @@
<mt:Ignore><!-- for Smart Phone --></mt:Ignore>
<$mt:Include module="<__trans phrase="JavaScript Footer - Mobile">"$>
+ <mtml tag="mt:else">
+
+ <mt:Ignore><!-- for Other --></mt:Ignore>
+ <$mt:Include module="<__trans phrase="JavaScript Footer">"$>
+
<mtml tag="/mt:IfUserAgent">
</mt:BuildRecurs>
@@ -25,12 +25,12 @@
<ul>
<li>
<label for="comment-author"><__trans phrase="Name"></label>
- <mt:IfRequireCommentEmails><img alt="<__trans phrase="Required">" src="<$MTStaticWebPath$>support/theme_static/smart_blog/images/icon-required.png" class="required-icon"></mt:IfRequireCommentEmails>
+ <mt:IfRequireCommentEmails><img alt="<__trans phrase="Required">" src="<$mt:SupportDirectoryURL$>theme_static/smart_blog/images/icon-required.png" class="required-icon"></mt:IfRequireCommentEmails>
<input type="text" id="comment-author" class="text" name="author" value="<mt:If name="comment_preview"><mt:CommentAuthor encode_html="1"></mt:If>" placeholder="<__trans phrase="Your Name">" onfocus="mtCommentFormOnFocus()">
</li>
<li>
<label for="comment-email"><__trans phrase="Email"></label>
- <mt:IfRequireCommentEmails><img alt="<__trans phrase="Required">" src="<$MTStaticWebPath$>support/theme_static/smart_blog/images/icon-required.png" class="required-icon"></mt:IfRequireCommentEmails>
+ <mt:IfRequireCommentEmails><img alt="<__trans phrase="Required">" src="<$mt:SupportDirectoryURL$>theme_static/smart_blog/images/icon-required.png" class="required-icon"></mt:IfRequireCommentEmails>
<input type="email" id="comment-email" class="text" name="email" value="<mt:If name="comment_preview"><mt:CommentEmail encode_html="1"></mt:If>" placeholder="mail@example.com" onfocus="mtCommentFormOnFocus()">
</li>
<li>
@@ -92,6 +92,11 @@
<mt:Ignore><!-- for Smart Phone --></mt:Ignore>
<$mt:Include module="<__trans phrase="JavaScript Footer - Mobile">"$>
+<mt:Else>
+
+ <mt:Ignore><!-- for Other --></mt:Ignore>
+ <$mt:Include module="<__trans phrase="JavaScript Footer">"$>
+
</mt:IfUserAgent>
</script>
@@ -95,6 +95,11 @@
<mt:Ignore><!-- for Smart Phone --></mt:Ignore>
<$mt:Include module="<__trans phrase="JavaScript Footer - Mobile">"$>
+<mt:Else>
+
+ <mt:Ignore><!-- for Other --></mt:Ignore>
+ <$mt:Include module="<__trans phrase="JavaScript Footer">"$>
+
</mt:IfUserAgent>
</script>
@@ -73,6 +73,11 @@
<mt:Ignore><!-- for Smart Phone --></mt:Ignore>
<$mt:Include module="<__trans phrase="JavaScript Footer - Mobile">"$>
+<mt:Else>
+
+ <mt:Ignore><!-- for Other --></mt:Ignore>
+ <$mt:Include module="<__trans phrase="JavaScript Footer">"$>
+
</mt:IfUserAgent>
</script>
@@ -141,6 +141,11 @@
<$mt:Include module="<__trans phrase="JavaScript Footer - Mobile">"$>
</mt:DynamicMTML>
+<mtml tag="mt:else">
+
+ <mt:Ignore><!-- for Other --></mt:Ignore>
+ <$mt:Include module="<__trans phrase="JavaScript Footer">"$>
+
<mtml tag="/mt:IfUserAgent">
</script>
@@ -33,7 +33,7 @@
<mt:Assets type="image" tag="@SITE_NO_IMAGE_ICON" limit="1">
<img src="<$mt:AssetThumbnailURL height="100" square="1"$>" alt="<__trans phrase="NO Image">" class="thumb ul-li-thumb">
<mt:Else>
- <img src="<$MTStaticWebPath$>support/theme_static/smart_blog/images/no-image.png" alt="<__trans phrase="No Image">" class="thumb ui-li-thumb">
+ <img src="<$mt:SupportDirectoryURL$>theme_static/smart_blog/images/no-image.png" alt="<__trans phrase="No Image">" class="thumb ui-li-thumb">
</mt:Assets>
</mt:EntryAssets>
</mt:EntryAssets>
@@ -5,10 +5,10 @@
<link rel="alternate" type="application/atom+xml" title="Recent Entries" href="<$mt:Link template="feed_recent"$>">
<link rel="stylesheet" href="<$mt:Link template="styles"$>">
<!--[if lt IE 8]>
-<link rel="stylesheet" href="<$MTStaticWebPath$>support/theme_static/smart_blog/style_library/ie.css"></script>
+<link rel="stylesheet" href="<$mt:SupportDirectoryURL$>theme_static/smart_blog/style_library/ie.css"></script>
<![endif]-->
<script src="<$mt:Link template="javascript"$>"></script>
-<script src="<$MTStaticWebPath$>support/theme_static/smart_blog/jquery/jquery.min.js"></script>
+<script src="<$mt:SupportDirectoryURL$>theme_static/smart_blog/jquery/jquery.min.js"></script>
<!--[if lt IE 9]>
-<script src="<$MTStaticWebPath$>support/theme_static/smart_blog/js/html5.js"></script>
+<script src="<$mt:SupportDirectoryURL$>theme_static/smart_blog/js/html5.js"></script>
<![endif]-->
@@ -7,13 +7,13 @@
<mt:Assets type="image" tag="@SITE_TOUCH_ICON" limit="1">
<link rel="apple-touch-icon-precomposed" href="<$mt:AssetThumbnailURL width="114" square="1"$>">
<mt:Else>
-<link rel="apple-touch-icon-precomposed" href="<$MTStaticWebPath$>support/theme_static/smart_blog/images/touch-icon-default.png">
+<link rel="apple-touch-icon-precomposed" href="<$mt:SupportDirectoryURL$>theme_static/smart_blog/images/touch-icon-default.png">
</mt:Assets>
-<link rel="stylesheet" href="<$MTStaticWebPath$>support/theme_static/smart_blog/jquerymobile/jquery.mobile.min.css">
+<link rel="stylesheet" href="<$mt:SupportDirectoryURL$>theme_static/smart_blog/jquerymobile/jquery.mobile.min.css">
<link rel="stylesheet" href="<$mt:Link template="styles"$>">
-<link rel="stylesheet" href="<$MTStaticWebPath$>support/theme_static/smart_blog/style_library/smartphone.css">
+<link rel="stylesheet" href="<$mt:SupportDirectoryURL$>theme_static/smart_blog/style_library/smartphone.css">
<script src="<$mt:Link template="javascript"$>"></script>
-<script src="<$MTStaticWebPath$>support/theme_static/smart_blog/jquery/jquery.min.js"></script>
+<script src="<$mt:SupportDirectoryURL$>theme_static/smart_blog/jquery/jquery.min.js"></script>
<script src="<$mt:Link template="javascript_theme"$>"></script>
-<script src="<$MTStaticWebPath$>support/theme_static/smart_blog/jquerymobile/jquery.mobile.min.js"></script>
+<script src="<$mt:SupportDirectoryURL$>theme_static/smart_blog/jquerymobile/jquery.mobile.min.js"></script>
Oops, something went wrong.

0 comments on commit 68ab63b

Please sign in to comment.