aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-04 19:15:42 -0800
committerfriendica <info@friendica.com>2012-03-04 19:15:42 -0800
commitb57247d6a6fa1c8123093422a257847ead3b7f8b (patch)
tree73ec16cc942f687fb22ad3f59308425fd6eb5f21 /view
parentb9bea3a549af9bae92d4dee361fce8e198b45548 (diff)
parentd369fcc9945f7e9635f154089d455410fe88495a (diff)
downloadvolse-hubzilla-b57247d6a6fa1c8123093422a257847ead3b7f8b.tar.gz
volse-hubzilla-b57247d6a6fa1c8123093422a257847ead3b7f8b.tar.bz2
volse-hubzilla-b57247d6a6fa1c8123093422a257847ead3b7f8b.zip
Merge branch 'pull'
Diffstat (limited to 'view')
-rwxr-xr-xview/theme/diabook/jot.tpl15
-rw-r--r--view/theme/diabook/style.css29
-rw-r--r--view/theme/diabook/wallwall_item.tpl3
3 files changed, 25 insertions, 22 deletions
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
index 4f784c3f8..59066a19c 100755
--- a/view/theme/diabook/jot.tpl
+++ b/view/theme/diabook/jot.tpl
@@ -45,23 +45,25 @@
</div>
<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-
- <button onclick="preview_post();" id="jot-preview-link" class="button creation1">$preview</button>
-
+
+ <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
+
<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
</div>
- <div id="profile-jot-perms-end"></div>
<div id="profile-jot-plugin-wrapper">
$jotplugins
</div>
-
+
<div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
+ </div>
+ <div id="profile-jot-perms-end"></div>
+
<div id="jot-preview-content" style="display:none;"></div>
<div style="display: none;">
@@ -75,9 +77,8 @@
</div>
-</div>
-<div id="profile-jot-end"></div>
+
</form>
</div>
{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index f005ff4bd..06ddf6de1 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -384,9 +384,7 @@ body {
font-size: 13px;
background-color: #ffffff;
color: #2d2d2d;
- margin-left: : auto;
- margin-right: auto;
- margin-top: 50px;
+ margin: 50px auto auto;
display: table;
}
h4 {
@@ -1005,24 +1003,24 @@ section {
display: table-cell;
vertical-align: top;
width: 800px;
- padding: 0px 0px 0px 10px;
+ padding: 0px 0px 0px 12px;
}
.tabs {
background-position: 0 -20px;
background-repeat: repeat-x;
-
height: 27px;
padding: 0;
}
.tab.button {
- margin-right: 15px;
- margin-left: 15px;
- background: none repeat scroll 0 0 #F8F8F8;
+ margin-right: 5px;
+ margin-left: 5px;
+ /*background: none repeat scroll 0 0 #F8F8F8;*/
border: 1px solid #CCCCCC;
border-radius: 3px 3px 3px 3px;
- font-weight: bold;
+ font-weight: normal;
padding: 3px;
+ color: #333333;
}
/* wall item */
.tread-wrapper {
@@ -1045,6 +1043,8 @@ section {
display: table;
width: 780px;
}
+
+
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
display: table-row;
}
@@ -1221,8 +1221,12 @@ section {
border-right: 1px solid #A7C7F7;
padding-right: 12px;
}
+
+#jot-preview-content{
+ margin-top: 30px;}
+
#jot-preview-content .tread-wrapper {
- background-color: #fce94f;
+ background-color: #fff797;
}
.wall-item-tags {
@@ -1667,11 +1671,10 @@ ul.tabs {
}
ul.tabs li {
float: left;
- margin-left: 7px;
+ margin-left: 5px;
}
ul.tabs li .active {
- background-color: #33ACFF;
- background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+ background-color: #333333;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 08ea36781..effb7273f 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -103,5 +103,4 @@
<div class="wall-item-comment-wrapper" >
$item.comment
-</div>
-tb \ No newline at end of file
+</div> \ No newline at end of file