aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-09-18 21:11:18 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-09-18 21:11:18 -0700
commit65a420b22755f774dc2422f7fdf3709e01289945 (patch)
tree43848b09e1eb8e5c2d211f5a1ebb6fa498feb39e /view
parent881037a0d9430b13e852ccac46590945a5093957 (diff)
downloadvolse-hubzilla-65a420b22755f774dc2422f7fdf3709e01289945.tar.gz
volse-hubzilla-65a420b22755f774dc2422f7fdf3709e01289945.tar.bz2
volse-hubzilla-65a420b22755f774dc2422f7fdf3709e01289945.zip
theme cleanup
Diffstat (limited to 'view')
-rw-r--r--view/default.php2
-rw-r--r--view/directory_header.tpl2
-rw-r--r--view/profile.php2
-rw-r--r--view/profile_edit.tpl2
-rw-r--r--view/settings.tpl2
-rw-r--r--view/theme/clean/style.css6
-rw-r--r--view/theme/darkness/style.css15
-rw-r--r--view/theme/default/style.css81
-rw-r--r--view/theme/goldenrod/style.css4
-rw-r--r--view/theme/shady/style.css70
10 files changed, 152 insertions, 34 deletions
diff --git a/view/default.php b/view/default.php
index 47adf4a76..2d45d946a 100644
--- a/view/default.php
+++ b/view/default.php
@@ -6,7 +6,7 @@
</head>
<body>
<header><?php echo $page['header']; ?></header>
- <nav><?php echo $page['nav']; ?></nav>
+ <nav><div id="top-margin"></div><?php echo $page['nav']; ?></nav>
<aside><?php echo $page['aside']; ?></aside>
<section><?php echo $page['content']; ?>
<div id="page-footer"></div>
diff --git a/view/directory_header.tpl b/view/directory_header.tpl
index c4217ac48..ba39236f2 100644
--- a/view/directory_header.tpl
+++ b/view/directory_header.tpl
@@ -1,6 +1,6 @@
<h1>Site Directory</h1>
-<ul><li><div id="global-directory-link"><a href="http://dir.dfrn.org">Global Community Directory</a></div></li></ul>
+<ul><li><div id="global-directory-link"><a href="http://dir.dfrn.org">Global Directory</a></div></li></ul>
$finding
diff --git a/view/profile.php b/view/profile.php
index e2c190da0..a07a45220 100644
--- a/view/profile.php
+++ b/view/profile.php
@@ -6,7 +6,7 @@
</head>
<body>
<header><?php echo $page['header']; ?></header>
-<nav><?php echo $page['nav']; ?></nav>
+<nav><div id="top-margin"></div><?php echo $page['nav']; ?></nav>
<aside>
<?php if((is_array($profile)) && count($profile)) { ?>
<div class="vcard">
diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
index 7bbd4091b..8d32226bc 100644
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -2,7 +2,7 @@
<div id="profile-edit-links">
<ul>
-<li><a href="profile/$profile_id/view" id="profile-edit-view-link" title="View this profile">View this profile</a></li>
+<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">View this profile</a></li>
<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clone this profile</a></li>
<li></li>
<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></li>
diff --git a/view/settings.tpl b/view/settings.tpl
index 84fc38926..da330bcd1 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -44,7 +44,7 @@ $profile_in_dir
$profile_in_net_dir
-<div id="settings-default-perms" class="settings-default-perms" >
+<div id="settings-default-perms" class="settings-default-perms fakelink" >
<div id="settings-default-perms-menu" onClick="openClose('settings-default-perms-select');" >$permissions</div>
<div id="settings-default-perms-menu-end"></div>
diff --git a/view/theme/clean/style.css b/view/theme/clean/style.css
index f32462b3c..f190b3d1a 100644
--- a/view/theme/clean/style.css
+++ b/view/theme/clean/style.css
@@ -1,5 +1,9 @@
@import url('../default/style.css');
+nav {
+ background: #F4F4F4;
+}
+
body {
background: #FFFFFF;
color: #444444;
@@ -8,11 +12,13 @@ body {
.nav-link {
color: #444444;
background: #EEE;
+ border: 2px solid #888888;
}
.nav-commlink {
color: #444444;
background: #EEE;
+ border: 2px solid #888888;
}
.profile-tabs {
diff --git a/view/theme/darkness/style.css b/view/theme/darkness/style.css
index a93f87a90..a7097d543 100644
--- a/view/theme/darkness/style.css
+++ b/view/theme/darkness/style.css
@@ -4,29 +4,32 @@ body {
background: #000000;
color: #FF0000;
}
+.nav-selected {
+ background: #000000 !important;
+}
.nav-link {
color: #FF0000;
- background: #888888;
+ background: #444444;
}
.nav-commlink {
color: #FF0000;
- background: #888888;
+ background: #444444;
}
.profile-tabs {
color: #FF0000;
- background: #888888;
+ background: #444444;
}
-a, a:visited {
- color: #444444;
+a, a:visited, .fakelink, .fakelink:visited {
+ color: #888888;
text-decoration: none;
}
-a:hover {
+a:hover, .fakelink:hover {
color: #FF0000;
text-decoration: underline;
}
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 916b32fd2..9edb6424a 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -31,7 +31,21 @@ img {
#sysmsg {
width: 600px;
}
-
+#top-margin {
+ height: 20px;
+}
+#banner {
+ color: lightgreen;
+ font-size: 1.4em;
+ font-weight: bold;
+ position: absolute;
+ filter:alpha(opacity=50);
+ -moz-opacity:0.5;
+ -khtml-opacity: 0.5;
+ opacity: 0.5;
+ top: 12px;
+ left: 42%;
+}
code {
font-family: monospace;
white-space: pre;
@@ -49,7 +63,7 @@ blockquote:before {
}
body {
- background: #DDDDDD;
+ background: #FFFFFF;
color: #444444;
font-family: "Lucida Grande", Tahoma, sans-serif;
font-size: 90%;
@@ -91,6 +105,7 @@ section {
position: absolute;
left: 270px;
top: 60px;
+ margin-top: 25px;
margin-left: 20px;
margin-right: 20px;
right: 0px;
@@ -102,10 +117,10 @@ h1 {
nav {
position: absolute;
top: 0px;
- height: 30px;
+ height: 48px;
left: 0px;
right: 0px;
- margin-top: 20px;
+ background: #444;
}
footer {
@@ -136,11 +151,17 @@ footer {
float: right;
margin-left: 0px;
margin-right: 10px;
- padding: 3px;
- border: 1px solid #AAAAAA;
- background: #F4F4F4;
+ padding: 4px;
+ border: 2px solid #000000;
+ background: #EEE;
font-size: 90%;
font-weight: bold;
+ -moz-border-radius-topleft: 3px;
+ -moz-border-radius-topright: 3px;
+ -webkit-border-radius-topleft: 3px;
+ -webkit-border-radius-topright: 3px;
+ border-radius-topleft: 3px;
+ border-radius-topright: 3px;
}
@@ -150,6 +171,20 @@ footer {
font-size: 0.6em;
font-weight: bold;
color: #FF0000;
+ background: #FFFFFF;
+}
+
+
+
+.nav-selected {
+ border-bottom: none !important;
+ background: #FFFFFF !important;
+ padding: 5px !important;
+}
+
+
+.nav-ajax-left:hover {
+ font-size: 1.5em;
}
.nav-ajax-right {
@@ -164,12 +199,19 @@ footer {
float: left;
margin-left: 10px;
margin-right: 0px;
- padding: 3px;
- border: 1px solid #AAAAAA;
- background: #F4F4F4;
+ padding: 4px;
+ border: 2px solid #000000;
+ background: #EEE;
font-size: 90%;
font-weight: bold;
text-decoration: none;
+ -moz-border-radius-topleft: 3px;
+ -moz-border-radius-topright: 3px;
+ -webkit-border-radius-topleft: 3px;
+ -webkit-border-radius-topright: 3px;
+ border-radius-topleft: 3px;
+ border-radius-topright: 3px;
+
}
#nav-end {
@@ -639,6 +681,7 @@ input#dfrn-url {
.wall-item-content-wrapper {
margin-top: 10px;
+ border: 1px solid #CCC;
}
.wall-item-content-wrapper.comment {
@@ -701,6 +744,7 @@ input#dfrn-url {
float: left;
width: 450px;
margin-left: 10px;
+ margin-bottom: 20px;
}
.wall-item-title {
@@ -1115,12 +1159,12 @@ input#dfrn-url {
.profile-tabs {
float: left;
- padding: 3px;
+ padding: 4px;
margin-top: 10px;
margin-bottom: 10px;
margin-right: 5px;
- border: 1px solid #AAAAAA;
- background: #F4F4F4;
+ border: 1px solid #CCC;
+ background: #F8F8F8;
font-size: 0.8em;
font-weight: bold;
}
@@ -1445,20 +1489,11 @@ input#dfrn-url {
text-decoration: underline;
cursor: pointer;
}
-#settings-default-perms-menu, #settings-default-perms-menu:visited {
- color: #8888FF;
- text-decoration: none;
- cursor: pointer;
+#settings-default-perms-menu {
margin-top: 15px;
margin-bottom: 15px;
}
-#settings-default-perms-menu:hover {
- color: #0000FF;
- text-decoration: underline;
- cursor: pointer;
-}
-
#photo-edit-caption-label, #photo-edit-tags-label {
float: left;
width: 150px;
diff --git a/view/theme/goldenrod/style.css b/view/theme/goldenrod/style.css
index e84cf5d64..8743dcbf5 100644
--- a/view/theme/goldenrod/style.css
+++ b/view/theme/goldenrod/style.css
@@ -15,6 +15,10 @@ body {
background: #FFCC55;
}
+.nav-selected {
+ background: #FFDDAA !important;
+}
+
.profile-tabs {
color: #444444;
background: #FFCC55;
diff --git a/view/theme/shady/style.css b/view/theme/shady/style.css
new file mode 100644
index 000000000..071310541
--- /dev/null
+++ b/view/theme/shady/style.css
@@ -0,0 +1,70 @@
+@import url('../default/style.css');
+
+body {
+ background: #DDDDDD;
+ color: #444444;
+}
+
+.nav-link {
+ color: #444444;
+ background: #F4F4F4;
+}
+.nav-selected {
+ background: #DDDDDD !important;
+}
+
+.nav-commlink {
+ color: #444444;
+ background: #F4F4F4;
+}
+
+.profile-tabs {
+ color: #444444;
+ background: #F4F4F4;
+
+}
+
+a, a:visited {
+ color: #8888FF;
+ text-decoration: none;
+}
+
+a:hover {
+ color: #0000FF;
+ text-decoration: underline;
+}
+
+.fakelink, .fakelink:visited {
+ color: #8888FF;
+}
+
+.fakelink:hover {
+ color: #0000FF;
+}
+
+.wall-item-content-wrapper.comment {
+ background: #CCCCCC;
+}
+
+.comment-edit-wrapper {
+ background: #CCCCCC;
+}
+
+.comment-wwedit-wrapper {
+ background: #CCCCCC;
+}
+
+#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
+ color: #8888FF;
+}
+
+#photos-upload-perms-menu:hover {
+ color: #0000FF;
+}
+#settings-default-perms-menu, #settings-default-perms-menu:visited {
+ color: #8888FF;
+}
+
+#settings-default-perms-menu:hover {
+ color: #0000FF;
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 08:41:38 +0000