summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPradeep Saran2012-07-26 18:06:09 (GMT)
committer Pradeep Saran2012-07-26 18:06:09 (GMT)
commita9b0fd3909fd7aec097170933bab657a3b989c25 (patch)
tree5090b13eada26fc1b7f5f96ddf140e977e8ea883
parentda0b0e566dc4db44c84f54c7937beeebd49898f8 (diff)
I18n support is added and Input field break on mobile screen is fixed.7.x-1.2
-rw-r--r--images/comment-arrow.gifbin0 -> 97 bytes
-rw-r--r--images/search-button.pngbin0 -> 725 bytes
-rw-r--r--style.css310
-rw-r--r--templates/comment-wrapper.tpl.php17
-rw-r--r--templates/comment.tpl.php72
-rw-r--r--templates/node.tpl.php4
-rw-r--r--templates/page.tpl.php6
7 files changed, 253 insertions, 156 deletions
diff --git a/images/comment-arrow.gif b/images/comment-arrow.gif
new file mode 100644
index 0000000..b597e65
--- /dev/null
+++ b/images/comment-arrow.gif
Binary files differ
diff --git a/images/search-button.png b/images/search-button.png
new file mode 100644
index 0000000..c6e820a
--- /dev/null
+++ b/images/search-button.png
Binary files differ
diff --git a/style.css b/style.css
index 7c75376..21b8a95 100644
--- a/style.css
+++ b/style.css
@@ -127,12 +127,6 @@ p {
margin-bottom:18px;
}
-fieldset {
- border: 1px solid #ccc;
- margin: 0 0 1.4615em;
- padding: 1.5385em;
-}
-
table {
border-collapse:collapse;
border-spacing:0;
@@ -173,66 +167,6 @@ td {
border-bottom: 1px solid #c8c7c7;
}
-
-input[type=text],
-input[type=password],
-textarea {
- padding:8px;
- box-shadow:#F0F0F0 0 1px 3px inset;
- background:#F9F9F9;
- border:#EEE 1px solid;
- color:#999;
- font-family:"Droid Sans", sans-serif;
- font-size:13px;
-}
-
-input[type=text]:focus,
-input[type=password]:focus,
-textarea:focus {
- box-shadow:#EEE 0 1px 3px inset;
- background:#FFF;
- color:#333;
-}
-
-textarea {
- font-size:15px;
-}
-
-input[type=submit],
-input[type=reset],
-input[type=button] {
- padding:4px 15px;
- border-radius:15px;
- box-shadow:#ccc 0 0 3px;
- background:#f0f0f0;
- background:-moz-linear-gradient(#F9F9F9, #EEE);
- background:-webkit-linear-gradient(#F9F9F9, #EEE);
- background:-o-linear-gradient(#F9F9F9, #EEE);
- background:-ms-linear-gradient(#F9F9F9, #EEE);
- background:linear-gradient(#F9F9F9, #EEE);
- border:none;
- color:#444;
- font-family:"Droid Sans", sans-serif;
- font-size:13px;
-}
-
-input[type=submit]:hover,
-input[type=reset]:hover,
-input[type=button]:hover {
- box-shadow:#aaa 0 0 5px;
-}
-
-input[type=submit]:focus,
-input[type=reset]:focus,
-input[type=button]:focus {
- box-shadow:#aaa 0 0 5px;
- background:-moz-linear-gradient(#EEE, #F9F9F9);
- background:-webkit-linear-gradient(#EEE, #F9F9F9);
- background:-o-linear-gradient(#EEE, #F9F9F9);
- background:-ms-linear-gradient(#EEE, #F9F9F9);
- background:linear-gradient(#EEE, #F9F9F9);
-}
-
code {
background: #d8d8d8;
text-shadow: 1px 1px #fff;
@@ -1063,58 +997,6 @@ ul.secondary a.active {
}
/*-------------------------------------------*
-/* comment
-/*-------------------------------------------*/
-#comments {
- clear: both;
- margin-top: 14px;
- padding: 5px;
- border: 1px solid #dddddd;
- border-radius: 8px;
-}
-
-.comment {
- margin-bottom: 1.5em;
- padding: 5px;
- border-radius: 7px;
- min-height: 150px;
- border-bottom: 1px solid #d9d9d9;
-}
-
-h3.comment-title a{
- margin-bottom: 5px;
- font-size: 16px;
- color: #67696d;
-}
-
-.comment .new {
- color: red;
- text-transform: capitalize;
- margin-left: 1em;
-}
-
-.form-textarea-wrapper textarea {
- border-radius: 3px;
-}
-
-.comment .submitted {
- display:inline;
- background: #e5e5e5;
-}
-
-.comment .user-picture{
- float: left;
- padding: 4px;
- border: 1px solid #d9d9d9;
- margin-right: 7px;
- margin-bottom: 7px;
-}
-
-.comment-new-comments{
- display: none;
-}
-
-/*-------------------------------------------*
/* Navigation
/*-------------------------------------------*/
.item-list .pager {
@@ -1190,6 +1072,181 @@ h3.comment-title a{
font-size: 16px;
}
+/* Images */
+
+img { outline: 0; }
+
+img.scale-with-grid { max-width: 100%; height: auto; }
+
+/* Comments */
+
+.comment h2.title { margin-bottom: 1em; }
+
+.comment div.user-picture img { margin-left: 0; }
+
+.comment { margin-bottom: 20px; display: table; vertical-align: top; }
+
+.comment .attribution { display: table-cell; padding: 0 35px 0 0; vertical-align: top; overflow: hidden; }
+
+.comment .attribution img { margin: 0; border: 1px solid #d3d7d9; }
+
+.comment .attribution .username { white-space: nowrap; }
+
+.comment .comment-submitted p { margin: 4px 0; font-size: 1.071em; line-height: 1.2; }
+
+.comment .comment-submitted .comment-time { font-size: 0.786em; }
+
+.comment .comment-submitted .comment-permalink { font-size: 0.786em; text-transform: lowercase; }
+
+.comment .content { font-size: 0.929em; line-height: 1.6; }
+
+.comment .comment-arrow { background: url(images/comment-arrow.gif) no-repeat 0 center transparent;
+border-left: 1px solid; border-right: 1px solid; height: 40px; margin-left: -36px; margin-top: 15px; position: absolute; width: 20px; }
+
+.comment .comment-text { padding: 0 25px 10px 35px; display: table-cell; vertical-align: top; position: relative; width: 100%; border-left: 1px solid #d3d7d9; }
+
+.comment .indented { margin-left: 40px; }
+
+.comment-unpublished { margin-right: 5px; padding: 5px 2px 5px 5px; }
+
+.comment .comment-text .comment-arrow { border-left: 1px solid #ffffff; border-right: 1px solid #ffffff; }
+
+/* -------------- Form Elements ------------- */
+
+fieldset { background: #ffffff; border: 1px solid #cccccc; margin-top: 10px; margin-bottom: 32px;
+padding: 0 0 10px; position: relative; top: 12px; /* Offsets the negative margin of legends */
+-khtml-border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+
+.fieldset-wrapper { margin-top: 25px; }
+
+.node-form .vertical-tabs .fieldset-wrapper { margin-top: 0; }
+
+.filter-wrapper { top: 0; padding: 1em 0 0.2em;
+-khtml-border-radius-topright: 0; -khtml-border-radius-topleft: 0; -moz-border-radius-topright: 0; -moz-border-radius-topleft: 0;
+-webkit-border-top-left-radius: 0; -webkit-border-top-right-radius: 0; border-top-left-radius: 0; border-top-right-radius: 0; }
+
+.filter-help a { font-size: 0.857em; padding: 2px 20px 0; }
+
+.filter-wrapper .form-item label { margin-right: 10px; }
+
+.filter-wrapper .form-item { padding: 0 0 0.5em 0.5em; }
+
+.filter-guidelines { padding: 0 1.5em 0 0.5em; }
+
+fieldset.collapsed { background: transparent; -khtml-border-radius: 0; -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; }
+
+fieldset legend { background: #dbdbdb; border: 1px solid #ccc; border-bottom: none; display: block; height: 2em;
+left: -1px; line-height: 2; padding: 0; position: absolute; text-indent: 10px; text-shadow: 0 1px 0 #fff; top: -12px; width: 100%;
+-khtml-border-radius-topleft: 4px; -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px;
+-khtml-border-radius-topright: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+
+fieldset.collapsed legend { -khtml-border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+
+fieldset .fieldset-wrapper { padding: 0 10px; }
+
+fieldset .fieldset-description { margin-top: 5px; margin-bottom: 1em; line-height: 1.4; font-style: italic; }
+
+input { margin: 2px 0; padding: 4px; }
+
+input, textarea { font-size: 0.929em; }
+
+textarea { line-height: 1.5; }
+
+textarea.form-textarea, select.form-select { padding: 4px; }
+
+input.form-text, textarea.form-textarea, select.form-select { border: 1px solid #ccc; }
+
+.password-suggestions ul li { margin-left: 1.2em; }
+
+.form-item { margin-bottom: 1em; margin-top: 2px; }
+
+.form-item label { font-size: 0.929em; }
+
+.form-type-radio label, .form-type-checkbox label { margin-left: 4px; }
+
+.form-type-radio .description, .form-type-checkbox .description { margin-left: 2px; }
+
+.form-actions { padding-top: 10px; }
+
+/* Form Buttons */
+
+button,
+input[type="submit"],
+input[type="reset"],
+input[type="button"] {
+/* IE10 */
+background-image: -ms-linear-gradient(top, #FFFFFF 0%, #E3E3E3 100%);
+/* Mozilla Firefox */
+background-image: -moz-linear-gradient(top, #FFFFFF 0%, #E3E3E3 100%);
+/* Opera */
+background-image: -o-linear-gradient(top, #FFFFFF 0%, #E3E3E3 100%);
+/* Webkit (Safari/Chrome 10) */
+background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #FFFFFF), color-stop(1, #E3E3E3));
+/* Webkit (Chrome 11+) */
+background-image: -webkit-linear-gradient(top, #FFFFFF 0%, #E3E3E3 100%);
+/* Proposed W3C Markup */
+background-image: linear-gradient(top, #FFFFFF 0%, #E3E3E3 100%);
+/* IE6-9 */
+filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFF', endColorstr='#E3E3E3');
+
+border: 1px solid #dbdbdb;
+-moz-border-radius: 6px; -webkit-border-radius: 6px; -o-border-radius: 6px; -ms-border-radius: 6px; -khtml-border-radius: 6px; border-radius: 6px;
+-moz-box-shadow: inset 0 1px 0 0 white; -webkit-box-shadow: inset 0 1px 0 0 white; -o-box-shadow: inset 0 1px 0 0 white; box-shadow: inset 0 1px 0 0 white;
+color: #333333; text-shadow: 0 1px 0 white; position: relative; font-weight:bold; padding: 8px 1em 9px 1em; }
+
+button:hover,
+input[type="submit"]:hover,
+input[type="reset"]:hover,
+input[type="button"]:hover {
+/* IE10 */
+background-image: -ms-linear-gradient(top, #DBDBDB 0%, #F2F2F2 100%);
+/* Mozilla Firefox */
+background-image: -moz-linear-gradient(top, #DBDBDB 0%, #F2F2F2 100%);
+/* Opera */
+background-image: -o-linear-gradient(top, #DBDBDB 0%, #F2F2F2 100%);
+/* Webkit (Safari/Chrome 10) */
+background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #DBDBDB), color-stop(1, #F2F2F2));
+/* Webkit (Chrome 11+) */
+background-image: -webkit-linear-gradient(top, #DBDBDB 0%, #F2F2F2 100%);
+/* Proposed W3C Markup */
+background-image: linear-gradient(top, #DBDBDB 0%, #F2F2F2 100%);
+/* IE6-9 */
+filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#DBDBDB', endColorstr='#F2F2F2');
+
+-moz-border-radius: 6px; -webkit-border-radius: 6px; -o-border-radius: 6px; -ms-border-radius: 6px; -khtml-border-radius: 6px; border-radius: 6px;
+-moz-box-shadow: inset 0 1px 0 0 white;
+-webkit-box-shadow: inset 0 1px 0 0 white;
+-o-box-shadow: inset 0 1px 0 0 white;
+box-shadow: inset 0 1px 0 0 white;
+cursor: pointer; }
+
+#block-search-form { padding-bottom: 7px; }
+
+#block-search-form .content { margin-top: 0; }
+
+#search-form input#edit-keys,
+#block-search-form .form-item-search-block-form input { float: left; font-size: 1em; height: 1.143em; margin-right: 5px; width: 9em; }
+
+#search-block-form input.form-submit,
+#search-form input.form-submit { margin-left: 0; margin-right: 0; height: 25px; width: 34px; padding: 0; cursor: pointer;
+text-indent: -9999px; border-color: #e4e4e4 #d2d2d2 #b4b4b4; background: url(images/search-button.png) no-repeat center top; overflow: hidden; }
+
+#search-block-form input.form-submit:hover,
+#search-block-form input.form-submit:focus,
+#search-form input.form-submit:hover,
+#search-form input.form-submit:focus { background-position: center bottom; }
+
+#search-form .form-item-keys label { display: block; }
+
+ol.search-results { padding-left: 0; }
+
+.search-results li { border-bottom: 1px solid #d3d7d9; padding-bottom: 0.4285em; margin-bottom: 0.5em; }
+
+.search-results li:last-child { border-bottom: none; padding-bottom: none; margin-bottom: 1em; }
+
+.search-results .search-snippet-info { padding-left: 0; }
+
+
#footer {
clear:both;
}
@@ -1303,6 +1360,7 @@ h3.comment-title a{
margin:0;
line-height:1.62em;
}
+
#site-title {
padding-top:18px;
@@ -1434,12 +1492,16 @@ h3.comment-title a{
}
.content-sidebar-wrap,
- #content,
#sidebar-first,
#sidebar-second {
float:none;
width:auto;
}
+
+ .content-sidebar-wrap #content {
+ float: left;
+ width:auto;
+ }
#sidebar-first .block,
#sidebar-second .block,
@@ -1463,4 +1525,14 @@ h3.comment-title a{
text-align:left;
}
+
+ @media screen and (max-width: 440px) {
+ input.form-text, select.form-select {
+ width: 93%;
+ }
+ textarea.form-textarea {
+ width: 100%
+ }
+ }
+
} \ No newline at end of file
diff --git a/templates/comment-wrapper.tpl.php b/templates/comment-wrapper.tpl.php
index 8123910..864dc41 100644
--- a/templates/comment-wrapper.tpl.php
+++ b/templates/comment-wrapper.tpl.php
@@ -1,7 +1,8 @@
<?php
+
/**
* @file
- * touch theme implementation to wrap comments.
+ * Bartik's theme implementation to provide an HTML container for comments.
*
* Available variables:
* - $content: The array of content-related elements for the node. Use
@@ -11,6 +12,12 @@
* CSS. It can be manipulated through the variable $classes_array from
* preprocess functions. The default value has the following:
* - comment-wrapper: The current template type, i.e., "theming hook".
+ * - $title_prefix (array): An array containing additional output populated by
+ * modules, intended to be displayed in front of the main title tag that
+ * appears in the template.
+ * - $title_suffix (array): An array containing additional output populated by
+ * modules, intended to be displayed after the main title tag that appears in
+ * the template.
*
* The following variables are provided for contextual information.
* - $node: Node object the comments are attached to.
@@ -38,9 +45,7 @@
<?php print render($content['comments']); ?>
<?php if ($content['comment_form']): ?>
- <section id="comment-form-wrapper">
- <h2 class="title"><?php print t('Add new comment'); ?></h2>
- <?php print render($content['comment_form']); ?>
- </section> <!-- /#comment-form-wrapper -->
+ <h2 class="title comment-form"><?php print t('Add new comment'); ?></h2>
+ <?php print render($content['comment_form']); ?>
<?php endif; ?>
-</div> <!-- /#comments -->
+</div>
diff --git a/templates/comment.tpl.php b/templates/comment.tpl.php
index 29de75d..7be9028 100644
--- a/templates/comment.tpl.php
+++ b/templates/comment.tpl.php
@@ -1,7 +1,8 @@
<?php
+
/**
* @file
- * touch theme implementation for comments.
+ * Bartik's theme implementation for comments.
*
* Available variables:
* - $author: Comment author. Can be link or plain text.
@@ -17,6 +18,8 @@
* desired parameters on the $comment->changed variable.
* - $new: New comment marker.
* - $permalink: Comment permalink.
+ * - $submitted: Submission information created from $author and $created during
+ * template_preprocess_comment().
* - $picture: Authors picture.
* - $signature: Authors signature.
* - $status: Comment status. Possible values are:
@@ -54,34 +57,49 @@
* @see theme_comment()
*/
?>
-<div class="<?php print $classes . ' ' . $zebra; ?>"<?php print $attributes; ?>>
-
- <header>
- <?php print $picture ?>
-
- <?php print render($title_prefix); ?>
- <h3 class="comment-title"><?php print $title ?></h3>
- <?php print render($title_suffix); ?>
-
- <div class="submitted"><?php print $author; ?> - <?php print $created; ?></div>
+<div class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
- <?php if ($new): ?>
- <span class="new"><?php print $new ?></span>
- <?php endif; ?>
- </header><!-- /.header -->
+ <div class="attribution">
+
+ <?php print $picture; ?>
- <div class="content"<?php print $content_attributes; ?>>
- <?php hide($content['links']); print render($content); ?>
- <?php if ($signature): ?>
- <div class="user-signature clearfix">
- <?php print $signature ?>
+ <div class="comment-submitted">
+ <p class="commenter-name">
+ <?php print $author; ?>
+ </p>
+ <p class="comment-time">
+ <?php print $created; ?>
+ </p>
+ <p class="comment-permalink">
+ <?php print $permalink; ?>
+ </p>
</div>
- <?php endif; ?>
</div>
- <?php if (!empty($content['links'])): ?>
- <footer>
- <?php print render($content['links']) ?>
- </footer>
- <?php endif; ?>
-</div> <!-- /.comment --> \ No newline at end of file
+ <div class="comment-text">
+ <div class="comment-arrow"></div>
+
+ <?php if ($new): ?>
+ <span class="new"><?php print $new; ?></span>
+ <?php endif; ?>
+
+ <?php print render($title_prefix); ?>
+ <h3<?php print $title_attributes; ?>><?php print $title; ?></h3>
+ <?php print render($title_suffix); ?>
+
+ <div class="content"<?php print $content_attributes; ?>>
+ <?php
+ // We hide the comments and links now so that we can render them later.
+ hide($content['links']);
+ print render($content);
+ ?>
+ <?php if ($signature): ?>
+ <div class="user-signature clearfix">
+ <?php print $signature; ?>
+ </div>
+ <?php endif; ?>
+ </div> <!-- /.content -->
+
+ <?php print render($content['links']); ?>
+ </div> <!-- /.comment-text -->
+</div>
diff --git a/templates/node.tpl.php b/templates/node.tpl.php
index 522ff01..d722e00 100644
--- a/templates/node.tpl.php
+++ b/templates/node.tpl.php
@@ -99,14 +99,12 @@
// Hide comments, tags, and links now so that we can render them later.
hide($content['comments']);
hide($content['links']);
- hide($content['field_tags']);
print render($content);
?>
</div>
- <?php if (!empty($content['field_tags']) || !empty($content['links'])): ?>
+ <?php if (!empty($content['links'])): ?>
<footer>
- <?php print render($content['field_tags']); ?>
<?php print render($content['links']); ?>
</footer>
<?php endif; ?>
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index 2e7fdf3..d7566ac 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -75,7 +75,11 @@
<a class="nav-toggle" href="#">Navigation</a>
<div class="menu-navigation-container">
<?php
- $main_menu_tree = menu_tree(variable_get('menu_main_links_source', 'main-menu'));
+ if (module_exists('i18n')) {
+ $main_menu_tree = i18n_menu_translated_tree(variable_get('menu_main_links_source', 'main-menu'));
+ } else {
+ $main_menu_tree = menu_tree(variable_get('menu_main_links_source', 'main-menu'));
+ }
print drupal_render($main_menu_tree);
?>
</div>