aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-30 00:56:24 -0700
committerFriendika <info@friendika.com>2011-09-30 00:56:24 -0700
commit30b7c689292b3a5d06fb9c52a369b53ecb05e57f (patch)
tree6813c160e32181f7e0ca800b5d069c13ca21b1ee
parent52557b011d2c05e83b1df91d2d766317dd2c5223 (diff)
parent6f610eb614f5d80c3a8dc1f69832dc9032876f6f (diff)
downloadvolse-hubzilla-30b7c689292b3a5d06fb9c52a369b53ecb05e57f.tar.gz
volse-hubzilla-30b7c689292b3a5d06fb9c52a369b53ecb05e57f.tar.bz2
volse-hubzilla-30b7c689292b3a5d06fb9c52a369b53ecb05e57f.zip
Merge pull request #10 from duthied/master
UI work on testbubble theme + core tpl files
-rw-r--r--view/admin_aside.tpl12
-rw-r--r--view/group_drop.tpl3
-rw-r--r--view/mail_conv.tpl7
-rw-r--r--view/mail_list.tpl4
-rw-r--r--view/photo_album.tpl2
-rw-r--r--view/prv_message.tpl3
-rw-r--r--view/settings_tabs.tpl4
-rw-r--r--view/theme/testbubble/mail_head.tpl6
-rw-r--r--view/theme/testbubble/style.css98
9 files changed, 55 insertions, 84 deletions
diff --git a/view/admin_aside.tpl b/view/admin_aside.tpl
index 63f109d7f..a10c06f4e 100644
--- a/view/admin_aside.tpl
+++ b/view/admin_aside.tpl
@@ -12,26 +12,26 @@
</script>
<h4><a href="$admurl">Admin</a></h4>
<ul class='admin linklist'>
- <li class='admin link $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
- <li class='admin link $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
- <li class='admin link $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
+ <li class='admin link button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
+ <li class='admin link button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
+ <li class='admin link button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
</ul>
<ul class='admin linklist'>
- <li class='admin link $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
+ <li class='admin link button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
</ul>
{{ if $admin.plugins_admin }}<h4>Plugins</h4>{{ endif }}
<ul class='admin linklist'>
{{ for $admin.plugins_admin as $l }}
- <li class='admin link $l.2'><a href='$l.0'>$l.1</a></li>
+ <li class='admin link button $l.2'><a href='$l.0'>$l.1</a></li>
{{ endfor }}
</ul>
<h4>Logs</h4>
<ul class='admin linklist'>
- <li class='admin link $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
+ <li class='admin link button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
</ul>
diff --git a/view/group_drop.tpl b/view/group_drop.tpl
index bd9852b96..cbae1610f 100644
--- a/view/group_drop.tpl
+++ b/view/group_drop.tpl
@@ -1,7 +1,6 @@
-<div class="group-delete-wrapper" id="group-delete-wrapper-$id" >
+<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
<a href="group/drop/$id"
onclick="return confirmDelete();"
- title="$delete"
id="group-delete-icon-$id"
class="icon drophide group-delete-icon"
onmouseover="imgbright(this);"
diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl
index d7ed14580..6c2af115b 100644
--- a/view/mail_conv.tpl
+++ b/view/mail_conv.tpl
@@ -7,9 +7,8 @@
<div class="mail-conv-date">$date</div>
<div class="mail-conv-subject">$subject</div>
<div class="mail-conv-body">$body</div>
- </div>
+ <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$id" ><a href="message/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="mail-conv-delete-icon-$id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+ <div class="mail-conv-outside-wrapper-end"></div>
+</div>
</div>
-<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$id" ><a href="message/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="mail-conv-delete-icon-$id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-
-<div class="mail-conv-outside-wrapper-end"></div>
<hr class="mail-conv-break" />
diff --git a/view/mail_list.tpl b/view/mail_list.tpl
index 8c8e78276..77673c792 100644
--- a/view/mail_list.tpl
+++ b/view/mail_list.tpl
@@ -6,10 +6,10 @@
<div class="mail-list-sender-name" >$from_name</div>
<div class="mail-list-date">$date</div>
<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
+ <div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
+ <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="icon drophide mail-list- delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
</div>
</div>
-<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
- <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="icon drophide mail-list-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
</div>
<div class="mail-list-delete-end"></div>
diff --git a/view/photo_album.tpl b/view/photo_album.tpl
index fab7d7254..e3f2ba91c 100644
--- a/view/photo_album.tpl
+++ b/view/photo_album.tpl
@@ -1,6 +1,6 @@
<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
<a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle">
- <img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo" id="photo-album-photo-$id" />
+ <img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize" id="photo-album-photo-$id" />
<p class='caption'>$desc</p>
</a>
diff --git a/view/prv_message.tpl b/view/prv_message.tpl
index 7c3894145..ead360deb 100644
--- a/view/prv_message.tpl
+++ b/view/prv_message.tpl
@@ -15,7 +15,7 @@ $select
<div id="prvmail-message-label">$yourmessage</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" ></textarea>
-</div>
+
<div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="Submit" />
<div id="prvmail-upload-wrapper" >
@@ -29,5 +29,6 @@ $select
</div>
</div>
<div id="prvmail-end"></div>
+</div>
</form>
</div>
diff --git a/view/settings_tabs.tpl b/view/settings_tabs.tpl
index 893fdfbce..5003ed8ce 100644
--- a/view/settings_tabs.tpl
+++ b/view/settings_tabs.tpl
@@ -1,6 +1,6 @@
<div id="profile-tabs-wrapper" >
- <a href="$account.1" id="profile-tab-status-link" class="profile-tabs" >$account.0</a>
- <a href="$plugins.1" id="profile-tab-profile-link" class="profile-tabs" >$plugins.0</a>
+ <a href="$account.1" id="profile-tab-status-link" class="profile-tabs button" >$account.0</a>
+ <a href="$plugins.1" id="profile-tab-profile-link" class="profile-tabs button" >$plugins.0</a>
<div id="profile-tabs-end"></div>
</div>
diff --git a/view/theme/testbubble/mail_head.tpl b/view/theme/testbubble/mail_head.tpl
index 89615cbd0..2a4fc42ea 100644
--- a/view/theme/testbubble/mail_head.tpl
+++ b/view/theme/testbubble/mail_head.tpl
@@ -1,7 +1,7 @@
<h3>$messages</h3>
<ul class="tabs-wrapper">
-<li><a href="message" class="tabs">$inbox</a></li>
-<li><a href="message/sent" class="tabs">$outbox</a></li>
-<li><a href="message/new" class="tabs">$new</a></li>
+<li><a href="message" class="tabs button">$inbox</a></li>
+<li><a href="message/sent" class="tabs button">$outbox</a></li>
+<li><a href="message/new" class="tabs button">$new</a></li>
</ul>
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 9727de6d1..deae9ae58 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -7,14 +7,11 @@
*/
/* ========== */
/* = Colors
-
Red links - #b20202
Red link hover - #db0503
Red Gradients (buttons and other gradients) - #b20202 and #d60808
-
Grey/body text - #626262
Grey Gradients (buttons and other gradients) - #bdbdbd and #a2a2a2
-
Dark Grey Gradients - #7c7d7b and #555753
You can switch out the colors of the header, buttons and links by using a find and replace in your text editor.
@@ -134,7 +131,7 @@ section {
.mframe {
padding: 5px;
background-color: #efefef;
- border: 2px dotted #eeeeee;
+ border: 2px solid #dddddd;
-moz-box-shadow: 3px 3px 4px #959494;
-webkit-box-shadow: 3px 3px 4px #959494;
box-shadow: 3px 3px 4px #959494;
@@ -452,14 +449,10 @@ aside a{
font-variant:small-caps;
}
-.marital {
- font-size: 1em;
- font-variant:small-caps;
-}
-
-.homepage-label {
- font-size: 1em;
- font-variant:small-caps;
+.vcard dd {
+ font-size: 12px;
+ font-variant: normal;
+ -webkit-margin-start: 10px;
}
.vcard .fn {
@@ -1304,7 +1297,11 @@ div[id$="wrapper"] br { clear: left; }
}
.photo-top-photo,
-.photo-album-photo {}
+.photo-album-photo {
+ width: 180px;
+ height: 180px;
+ overflow: hidden;
+}
.photo-top-album-name {
position: absolute;
@@ -1587,16 +1584,15 @@ input#photo_edit_form {
font-size: 1em;
}
-
#prvmail-submit-wrapper { margin-top: 10px; }
#prvmail-submit {
float: right;
margin-top: 0px;
- margin-right: 90px;
+ margin-right: 0px;
}
#prvmail-upload {
-margin-left: 90px;
+margin-left: 0px;
}
#prvmail-submit-wrapper > div {
@@ -1637,7 +1633,7 @@ margin-left: 90px;
float: right;
clear: block;
display: inline;
- font-size: 0.8em;
+ font-size: 0.9em;
padding-left: 10px;
font-stretch:ultra-condensed;
font-variant:small-caps;
@@ -1654,11 +1650,15 @@ margin-left: 90px;
color: #626262;
}
-.mail-list-delete-wrapper { float: left; margin-right:550px; }
+.mail-list-delete-wrapper { float: right;}
.mail-list-outside-wrapper-end {
clear: both;
}
+.mail-conv-outside-wrapper {
+ margin-bottom: 10px;
+}
+
.mail-conv-sender {float: left; margin: 0px 5px 5px 0px; }
.mail-conv-sender-photo {
width: 64px;
@@ -1675,13 +1675,20 @@ margin-left: 90px;
.mail-conv-detail {
width: 500px;
padding: 30px;
+ padding-bottom: 10px;
margin-left: 20px;
+ margin-bottom: 0px;
vertical-align: middle;
margin: auto;
border: 1px solid #dddddd;
}
.mail-conv-break { display: none; border: none;}
-.mail-conv-delete-wrapper { margin-top: 5px; width: 650px; text-align: right; }
+.mail-conv-delete-wrapper { padding-top: 10px; width: 510px; text-align: right; }
+
+#prvmail-subject {
+ font-weight: bold;
+ border: none;
+}
/* ================= */
/* = Notifications = */
@@ -2061,56 +2068,19 @@ margin-left: 90px;
padding-top: 10px;
}
-#profile-tab-status-link:hover {
+#profile-tab-status-link {
border: 0px;
padding: 5px 10px 5px 10px;
font-style: bold;
- color: #efefef;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
- background-color:#b20202;
-}
-
-#profile-tab-status-link:active {
- border: 0px;
- padding: 5px 10px 5px 10px;
- font-style: bold;
- background-color: #b20202;
- position:relative;
- top:1px;
-}
-
-#profile-tab-status-link a {
- color: #efefef;
}
#uexport-link a {
color: #efefef;
}
-#profile-tab-profile-link:hover {
+#profile-tab-profile-link {
border: 0px;
padding: 5px 10px 5px 10px;
- font-style: bold;
- color: #efefef;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
- background-color:#b20202;
-}
-
-#profile-tab-profile-link:active {
- border: 0px;
- padding: 5px 10px 5px 10px;
- font-style: bold;
- background-color: #b20202;
- position:relative;
- top:1px;
-}
-
-#profile-tab-profile-link a {
- color: #efefef;
}
#uexport-link {
@@ -2246,7 +2216,7 @@ margin-left: 90px;
display: inline;
padding: 5px;
margin-bottom: 10px;
- -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+/* -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
box-shadow:inset 0px 1px 0px 0px #cfcfcf;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
@@ -2255,10 +2225,10 @@ margin-left: 90px;
background-color:#bdbdbd;
-moz-border-radius:5px;
-webkit-border-radius:5px;
- border-radius:5px;
+ border-radius:5px;*/
}
-.group-delete-wrapper:hover {
+/*.group-delete-wrapper:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
@@ -2275,7 +2245,7 @@ margin-left: 90px;
.group-delete-wrapper a {
color: #efefef;
font-size: 0.9em;
-}
+}*/
#group-edit-desc { margin: 10px 0xp; }
#group-new-text {font-size: 1.1em;}
@@ -2602,7 +2572,9 @@ tr {
.admin.link {
list-style-position: inside;
font-size: 1em;
- padding: 3px;
+ padding: 5px;
+ width: 100px;
+ margin: 5px;
}
#adminpage dl {