From d6ca4a1b42083319945cbbeb0affca78e084e63b Mon Sep 17 00:00:00 2001
From: Thomas Willingham
Date: Sat, 19 May 2012 14:51:10 +0100
Subject: Give Darkzero some loving.
Everything that used to be hidden with light text on light backgrounds is legible now.
---
view/theme/darkzero/style.css | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
(limited to 'view/theme')
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index a3df740eb..5a0559e3d 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -22,7 +22,11 @@ div.wall-item-content-wrapper.shiny { background-image: url('shiny.png'); }
nav #banner #logo-text a { color: #ffffff; }
-.wall-item-content-wrapper { border: 1px solid #444444; }
+.wall-item-content-wrapper {
+border: 1px solid #444444;
+background: #444;
+
+}
.wall-item-tools { background-color: #444444; background-image: none;}
.comment-wwedit-wrapper{ background-color: #333333; }
.comment-edit-preview{ color: #000000; }
@@ -118,4 +122,17 @@ input#acl-search {
#nav-notifications-menu li:hover {
background: #444;
+}
+
+.acpopupitem{
+ background:#2e2f2e;
+}
+
+code {
+ background:#2e2f2e !important;
+}
+
+blockquote {
+ background:#2e2f2e !important;
+ color:#eec !important;
}
\ No newline at end of file
--
cgit v1.2.3
From a1b96d11a72a28915725cee898edb461b0a2dd23 Mon Sep 17 00:00:00 2001
From: Thomas Willingham
Date: Sat, 19 May 2012 15:17:35 +0100
Subject: Okay, so maybe not *everything*
---
view/theme/darkzero/style.css | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
(limited to 'view/theme')
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index 5a0559e3d..a1a684355 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -103,7 +103,7 @@ blockquote {
}
.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
- color: #000000;
+ color: #eec;
}
input#acl-search {
@@ -135,4 +135,13 @@ code {
blockquote {
background:#2e2f2e !important;
color:#eec !important;
-}
\ No newline at end of file
+}
+
+.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+ background:#2e2f2e;
+}
+
+#fancybox-content{
+ background:#444;
+}
+
--
cgit v1.2.3
From b1c58511ad65b0701db881124cbdf5e414643616 Mon Sep 17 00:00:00 2001
From: Thomas Willingham
Date: Sat, 19 May 2012 17:20:27 +0100
Subject: Diabook-dark - some more cleaning up
---
view/theme/diabook/diabook-dark/style-network.css | 7 ++++---
view/theme/diabook/diabook-dark/style-profile.css | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
(limited to 'view/theme')
diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
index 678e8597c..ee2e76d3b 100644
--- a/view/theme/diabook/diabook-dark/style-network.css
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -464,7 +464,7 @@ code {
position: absolute;
width: 12em;
background: #2e2f2e;
- color: #2e2f2e;
+ color: #eec;
margin: 0px;
padding: 1em;
list-style: none;
@@ -667,7 +667,7 @@ nav .nav-menu-icon:hover {
}
nav .nav-menu-icon.selected {
- background-color: #fff;
+ background-color: #308dbf;
}
nav .nav-menu-icon img {
width: 22px;
@@ -1434,7 +1434,8 @@ transition: all 0.2s ease-in-out;
}
.wall-item-comment-wrapper textarea {
height: 2.0em;
- width: 100%;
+ /**No idea what's going on here, but at 100%, it's fugly **/
+ width: 98% !important;
font-size: 10px;
color: #999999;
border: 1px solid #2e2e2f;
diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css
index 4b6bc15b5..216ccfc58 100644
--- a/view/theme/diabook/diabook-dark/style-profile.css
+++ b/view/theme/diabook/diabook-dark/style-profile.css
@@ -1216,7 +1216,7 @@ right_aside {
/* background: #F1F1F1; */
}
-right_aside a{color: #1872A2;}
+right_aside a{color: #88a9d2;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
--
cgit v1.2.3
From 4484bd0e9736c2ba86900120012b779d51a39df6 Mon Sep 17 00:00:00 2001
From: Thomas Willingham
Date: Sat, 19 May 2012 17:30:55 +0100
Subject: Darkzero, another missing part of "everything"
---
view/theme/darkzero/style.css | 1 +
1 file changed, 1 insertion(+)
(limited to 'view/theme')
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index a1a684355..6f238bec6 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -130,6 +130,7 @@ input#acl-search {
code {
background:#2e2f2e !important;
+ color:#fff !important;
}
blockquote {
--
cgit v1.2.3
From c6104fb856cfe282cd56a29d4007903382f960e0 Mon Sep 17 00:00:00 2001
From: Thomas Willingham
Date: Sun, 20 May 2012 01:44:07 +0100
Subject: Darkzero-NS + 'Friendicaland' countries.
---
view/theme/darkzero-NS/style.css | 75 +++++++++++++++++++++++++++++++++++-----
1 file changed, 66 insertions(+), 9 deletions(-)
(limited to 'view/theme')
diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css
index 047381a92..1efe093ed 100644
--- a/view/theme/darkzero-NS/style.css
+++ b/view/theme/darkzero-NS/style.css
@@ -22,9 +22,14 @@ div.wall-item-content-wrapper.shiny { background-image: url('shiny.png'); }
nav #banner #logo-text a { color: #ffffff; }
-.wall-item-content-wrapper { border: 1px solid #444444; }
+.wall-item-content-wrapper {
+border: 1px solid #444444;
+background: #444;
+
+}
.wall-item-tools { background-color: #444444; background-image: none;}
-.comment-edit-wrapper{ background-color: #333333; }
+.comment-wwedit-wrapper{ background-color: #333333; }
+.comment-edit-preview{ color: #000000; }
.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
.photo-top-album-name{ background-color: #333333; }
.photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }
@@ -75,25 +80,77 @@ input#dfrn-url {
}
-#jot-title {
+#jot-title, #jot-category {
background-color: #333333;
border: 1px solid #333333;
}
#jot-title::-webkit-input-placeholder{ color: #555555!important;}
#jot-title:-moz-placeholder{color: #555555!important;}
+#jot-category::-webkit-input-placeholder{ color: #555555!important;}
+#jot-category:-moz-placeholder{color: #555555!important;}
#jot-title:hover,
-#jot-title:focus {
+#jot-title:focus,
+#jot-category:hover,
+#jot-category:focus {
border: 1px solid #cccccc;
}
-
-.wall-item-content {
- max-height: 20000px;
- overflow: none;
-}
blockquote {
background: #ddd;
color: #000;
}
+
+.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
+ color: #eec;
+}
+
+input#acl-search {
+ background-color: #aaa;
+}
+
+
+
+.notify-seen {
+ background:#666;
+}
+
+#nav-notifications-menu {
+ background: #2e2e2f;
+}
+
+#nav-notifications-menu li:hover {
+ background: #444;
+}
+
+.acpopupitem{
+ background:#2e2f2e;
+}
+
+code {
+ background:#2e2f2e !important;
+ color:#fff !important;
+}
+
+blockquote {
+ background:#2e2f2e !important;
+ color:#eec !important;
+}
+
+.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+ background:#2e2f2e;
+}
+
+#fancybox-content{
+ background:#444;
+}
+
+
+
+
+
+.wall-item-content {
+ max-height: 20000px;
+ overflow: none;
+}
\ No newline at end of file
--
cgit v1.2.3
From 2ac55c9f21f859e626da94fd6c87015c066603ee Mon Sep 17 00:00:00 2001
From: Simon L'nu
Date: Sun, 20 May 2012 14:37:20 -0400
Subject: fix dispy light
Signed-off-by: Simon L'nu
---
view/theme/dispy/light/style.css | 2 +-
view/theme/dispy/light/style.less | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'view/theme')
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index 1099f0913..eb6abee71 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -56,7 +56,7 @@ h6{font-size:xx-small;}
.tool{margin:5px 0;list-style:none;}
#articlemain{width:100%;height:100%;margin:0 auto;}
.button,#profile-listing-desc{color:#111111;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
-.button a,#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
+.button a,#profile-listing-desc a{color:#111111;font-weight:bold;}
[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#111111;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
.intro-approve-as-friend-desc{margin-top:10px;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 4e1b85031..ed9dfdd69 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -295,7 +295,7 @@ h6 {
.box_shadow(4px, 4px, 7px);
}
a {
- color: @bg_colour;
+ color: @main_colour;
// font-size: smaller;
font-weight: bold;
}
--
cgit v1.2.3
From cb2702249fd80ce4e9d82f98a9a152f82e123dc7 Mon Sep 17 00:00:00 2001
From: Simon L'nu
Date: Mon, 21 May 2012 02:47:43 -0400
Subject: fix dumb mistake in light
Signed-off-by: Simon L'nu
---
view/theme/dispy/light/style.css | 6 +++---
view/theme/dispy/light/style.less | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'view/theme')
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index eb6abee71..5c6545a58 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -13,7 +13,7 @@ audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;}
audio:not([controls]),[hidden]{display:none;}
html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-o-text-size-adjust:100%;font-size-adjust:100%;}
body{margin:0;padding:0;font-size:14pt;line-height:1.1em;font-family:sans-serif;color:#111111;background-color:#eeeeec;}
-button,input,select,textarea{color:#111111;background-color:#eeeeec;}
+button,input,select,textarea{color:#111111;background-color:white;}
select{border:1px dotted #555555;padding:1px;margin:3px;color:#111111;background:#eeeeec;max-width:85%;min-width:85px;}
option{padding:1px;color:#111111;background:#eeeeec;}option[selected="selected"]{color:#eeeeec;background:#2e3436;}
tr:nth-child(even){background-color:#d6d6d1;}
@@ -57,7 +57,7 @@ h6{font-size:xx-small;}
#articlemain{width:100%;height:100%;margin:0 auto;}
.button,#profile-listing-desc{color:#111111;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
.button a,#profile-listing-desc a{color:#111111;font-weight:bold;}
-[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#111111;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
+[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
.intro-approve-as-friend-desc{margin-top:10px;}
.intro-desc{margin-bottom:20px;font-weight:bold;}
@@ -211,7 +211,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;}
.wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;}
.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
-.wall-item-author,.wall-item-actions-author,.wall-item-ago{clear:left;float:left;color:#eeeeec;line-height:1;display:inline-block;font-size:0.75em;margin:0.5em auto 0;}
+.wall-item-author,.wall-item-actions-author,.wall-item-ago{clear:left;float:left;color:#111111;line-height:1;display:inline-block;font-size:0.75em;margin:0.5em auto 0;}
.wall-item-author,.wall-item-actions-author{margin:0.5em auto 0;font-size:0.75em;font-weight:bold;}
.wall-item-location{margin-top:15px;width:100px;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
.wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index ed9dfdd69..86a30109b 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -62,7 +62,7 @@ input,
select,
textarea {
color: @main_colour;
- background-color: @bg_colour;
+ background-color: white;
}
select {
.borders(1px, dotted, darken(@main_alt_colour, 26.8%));
@@ -303,7 +303,7 @@ h6 {
[class$="-desc"],
[id$="-desc"] {
color: @bg_colour;
- background: @main_colour;
+ background: @dk_bg_colour;
.borders(1px, outset, @bg_colour);
.rounded_corners;
// .box_shadow(3px, 3px, 5px);
@@ -1377,7 +1377,7 @@ nav #nav-notifications-linkmenu {
.wall-item-ago {
clear: left;
float: left;
- color: @bg_colour;
+ color: @main_colour;
line-height: 1;
display: inline-block;
font-size: 0.75em;
--
cgit v1.2.3
From 627367e1ee241fcd3508dd5e8c0e021316420787 Mon Sep 17 00:00:00 2001
From: Simon L'nu
Date: Mon, 21 May 2012 06:48:08 -0400
Subject: more light fixes
Signed-off-by: Simon L'nu
---
view/theme/dispy/light/style.css | 2 +-
view/theme/dispy/light/style.less | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'view/theme')
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index 5c6545a58..bd4088b06 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -210,7 +210,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1.4em;}
.wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;}
.wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;}
-.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
+.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#111111;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
.wall-item-author,.wall-item-actions-author,.wall-item-ago{clear:left;float:left;color:#111111;line-height:1;display:inline-block;font-size:0.75em;margin:0.5em auto 0;}
.wall-item-author,.wall-item-actions-author{margin:0.5em auto 0;font-size:0.75em;font-weight:bold;}
.wall-item-location{margin-top:15px;width:100px;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 86a30109b..92c8547ee 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -1364,7 +1364,7 @@ nav #nav-notifications-linkmenu {
.wall-item-like {
clear: left;
font-size: 0.8em;
- color: lighten(@menu_bg_colour, 20%);
+ color: @main_colour;
margin: 5px 0 5px 10.2em;
.transition;
opacity: 0.5;
--
cgit v1.2.3
From 54e2c1ca81b99d4ac418e9287e00440de1fdc664 Mon Sep 17 00:00:00 2001
From: friendica
Date: Mon, 21 May 2012 16:40:11 -0700
Subject: rev update, bug 428, 429, and ability to block globaldir submissions
from demo sites
---
view/theme/duepuntozero/style.css | 25 +++++++++++-----
view/theme/slackr/style.css | 62 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 78 insertions(+), 9 deletions(-)
(limited to 'view/theme')
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 826acc7ef..c556dcead 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1963,23 +1963,29 @@ aside input[type='text'] {
}
-.photos {
+/*.photos {
height: auto;
overflow: auto;
+}*/
+
+.photos-end {
+ clear: both;
+ margin-bottom: 25px;
}
.photo-album-image-wrapper {
float: left;
margin-top: 15px;
margin-right: 15px;
- width: 200px; height: 200px;
+ margin-left: 15px;
+/* width: 200px; height: 200px;
overflow: hidden;
- position: relative;
+ position: relative; */
}
.photo-album-image-wrapper .caption {
display: none;
width: 100%;
- position: absolute;
+/* position: absolute; */
bottom: 0px;
padding: 0.5em 0.5em 0px 0.5em;
background-color: rgba(245, 245, 255, 0.8);
@@ -1992,20 +1998,23 @@ aside input[type='text'] {
#photo-album-end {
clear: both;
+ margin-bottom: 25px;
}
.photo-top-image-wrapper {
- position: relative;
+/* position: relative; */
float: left;
margin-top: 15px;
margin-right: 15px;
- width: 200px; height: 200px;
- overflow: hidden;
+ margin-left: 15px;
+ margin-bottom: 15px;
+/* width: 200px; height: 200px;
+ overflow: hidden; */
}
.photo-top-album-name {
width: 100%;
min-height: 2em;
- position: absolute;
+/* position: absolute; */
bottom: 0px;
padding: 0px 3px;
padding-top: 0.5em;
diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css
index abb431ab9..41f4e58ee 100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/style.css
@@ -52,10 +52,70 @@ nav #site-location {
box-shadow: 3px 3px 10px -2px #000000;
}
-.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img {
+.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
border-radius: 3px;
-moz-border-radius: 3px;
box-shadow: 3px 3px 10px 0 #000000;
}
+.photo-top-photo, .photo-album-photo {
+ padding: 10px;
+ max-width: 300px;
+}
+
+.rotleft1 {
+-webkit-transform: rotate(-1deg);
+-moz-transform: rotate(-1deg);
+-ms-transform: rotate(-1deg);
+-o-transform: rotate(-1deg);
+}
+
+.rotleft2 {
+-webkit-transform: rotate(-2deg);
+-moz-transform: rotate(-2deg);
+-ms-transform: rotate(-2deg);
+-o-transform: rotate(-2deg);
+}
+
+.rotleft3 {
+-webkit-transform: rotate(-3deg);
+-moz-transform: rotate(-3deg);
+-ms-transform: rotate(-3deg);
+-o-transform: rotate(-3deg);
+}
+
+.rotleft4 {
+-webkit-transform: rotate(-4deg);
+-moz-transform: rotate(-4deg);
+-ms-transform: rotate(-4deg);
+-o-transform: rotate(-4deg);
+}
+
+.rotright1 {
+-webkit-transform: rotate(1deg);
+-moz-transform: rotate(1deg);
+-ms-transform: rotate(1deg);
+-o-transform: rotate(1deg);
+}
+
+.rotright2 {
+-webkit-transform: rotate(2deg);
+-moz-transform: rotate(2deg);
+-ms-transform: rotate(2deg);
+-o-transform: rotate(2deg);
+}
+
+.rotright3 {
+-webkit-transform: rotate(3deg);
+-moz-transform: rotate(3deg);
+-ms-transform: rotate(3deg);
+-o-transform: rotate(3deg);
+}
+
+.rotright4 {
+-webkit-transform: rotate(4deg);
+-moz-transform: rotate(4deg);
+-ms-transform: rotate(4deg);
+-o-transform: rotate(4deg);
+}
--
cgit v1.2.3
From bd3c0edf34488736e04bb04d02e4bc393cbbd13a Mon Sep 17 00:00:00 2001
From: Simon L'nu
Date: Mon, 21 May 2012 21:29:18 -0400
Subject: updates to dispy family; fix typo in INSTALL.txt
Signed-off-by: Simon L'nu
---
view/theme/dispy/dark/style.css | 45 ++++++-----
view/theme/dispy/dark/style.less | 156 ++++++++++++++++++------------------
view/theme/dispy/dark/theme.php | 16 ++--
view/theme/dispy/light/_base.less | 3 +-
view/theme/dispy/light/connect.png | Bin 443 -> 0 bytes
view/theme/dispy/light/style.css | 45 ++++++-----
view/theme/dispy/light/style.less | 159 +++++++++++++++++++------------------
view/theme/dispy/light/theme.php | 12 +--
8 files changed, 225 insertions(+), 211 deletions(-)
delete mode 100644 view/theme/dispy/light/connect.png
(limited to 'view/theme')
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 3bb30be83..59c893176 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -37,8 +37,9 @@ img{border:0 none;}
a{color:#88a9d2;text-decoration:none;margin-bottom:1px;}a:hover{color:#638ec4;border-bottom:1px dotted #638ec4;}
a:hover img{text-decoration:none;}
blockquote{background:#444444;color:#eeeecc;text-indent:5px;padding:5px;border:1px solid #9a9a9a;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
-label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:5px;background:#eeeecc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
-input{width:250px;height:25px;border:1px solid #999999;}input[type="checkbox"],input[type="radio"]{margin:0;width:15px;height:15px;}
+label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:3px 5px;background:#eeeecc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
+input{width:250px;height:25px;border:1px solid #999999;width:17em;}input[type="checkbox"],input[type="radio"]{width:15px;height:15px;margin:0;}
+input[type="radio"]{margin:5px 0;}
input[type="submit"],input[type="button"]{background-color:#eeeeee;border:2px outset #b1b1b1;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:1px 3px 4px 0 #111111;-o-box-shadow:1px 3px 4px 0 #111111;-webkit-box-shadow:1px 3px 4px 0 #111111;-ms-box-shadow:1px 3px 4px 0 #111111;box-shadow:1px 3px 4px 0 #111111;color:#2e302e;cursor:pointer;font-weight:bold;width:auto;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;}
input[type="submit"]:active,input[type="button"]:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
h1,h2,h3,h4,h5,h6{margin:10px 0px;font-weight:bold;border-bottom:1px solid #638ec4;}
@@ -55,9 +56,9 @@ h6{font-size:xx-small;}
.action{margin:5px 0;}
.tool{margin:5px 0;list-style:none;}
#articlemain{width:100%;height:100%;margin:0 auto;}
-.button,#profile-listing-desc{color:#eeeecc;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
-.button a,#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
-[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:1px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
+.button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;}
+#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
+[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
.intro-approve-as-friend-desc{margin-top:10px;}
.intro-desc{margin-bottom:20px;font-weight:bold;}
@@ -105,9 +106,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;}
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
-#search-text,#mini-search-text{background:#2e2f2e;color:#eeeecc;margin:8px;}
-#search-text{border:1px solid #eeeecc;}
-#mini-search-text{font-size:8pt;height:14px;width:10em;}
+#search-text,#mini-search-text{background:white;color:#eeeecc;margin:8px;}
+#search-text{border:1px solid #eeeeee;margin:8px 0;}
+#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
@@ -120,7 +121,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#intro-update{background-position:-120px 0px;}
#lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
#language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
-.menu-popup{position:absolute;display:none;width:11em;background:white;color:#2e2f2e;margin:0px;padding:0px;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;}
+.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;}
.menu-popup .menu-sep{border-top:1px solid #4e4f4e;}
.menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}
.menu-popup .empty{padding:5px;text-align:center;color:#9ea8ac;}
@@ -155,7 +156,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#profile-jot-text_tbl{margin-bottom:10px;background:#777777;}
#profile-jot-text_ifr{width:99.900002% !important;}
#profile-jot-text_toolbargroup,.mceCenter tr{background:#777777;}
-[id$="jot-text_ifr"]{width:99.900002% !important;color:#2e2f2e;background:#eeeecc;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eeeecc;}
+[id$="jot-text_ifr"]{color:#2e2f2e;background:#eeeecc;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eeeecc;}
.defaultSkin tr.mceFirst{background:#777777;}
.defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eeeecc;}
.defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eeeecc;}
@@ -187,10 +188,10 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#jot-preview-content{background-color:#2e3436;color:#eeeecc;border:1px solid #2e2f2e;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
#sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;}
.tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;}
-.tab{border:1px solid #638ec4;padding:4px;}.tab:hover,.tab:active{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
-.tab.active{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;}.tab.active:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
-.tab.active a{color:#2e2f2e;text-decoration:none;}
+.tab{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
.tab a{border:0;text-decoration:none;}
+.tab.active{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab.active:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
+.tab.active a{color:#2e2f2e;text-decoration:none;}
.wall-item-outside-wrapper{border:1px solid #a9a9a9;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:6px 1px 10px -2px #111111;-o-box-shadow:6px 1px 10px -2px #111111;-webkit-box-shadow:6px 1px 10px -2px #111111;-ms-box-shadow:6px 1px 10px -2px #111111;box-shadow:6px 1px 10px -2px #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;}
.wall-item-content-wrapper{position:relative;padding:0.75em;width:auto;}
.wall-item-outside-wrapper .wall-item-comment-wrapper{}
@@ -243,7 +244,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.comment-edit-submit{height:22px;background-color:#555753;color:#eeeeee;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:0;}
.wall-item-body code{background-color:#444444;border-bottom:1px dashed #cccccc;border-left:5px solid #cccccc;border-top:1px dashed #cccccc;color:#eeeecc;display:block;overflow-x:auto;padding:5px 0 15px 10px;width:95%;}.wall-item-body code a{color:#adc4e0;}
div[id$="text"]{font-weight:bold;border-bottom:1px solid #cccccc;}
-div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
+div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
[id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;}
@@ -317,17 +318,16 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
#contact-edit-last-update-text{margin-bottom:15px;}
#contact-edit-last-updated{font-weight:bold;}
#contact-edit-poll-text{display:inline;}
-#contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;}
#contact-edit-end{clear:both;margin-bottom:65px;}
.contact-photo-menu-button{position:absolute;background:url("dark/photo-menu.jpg") top left no-repeat transparent;margin:0px;padding:0px;width:16px;height:16px;top:64px;left:0px;overflow:hidden;text-indent:40px;display:none;}
-.contact-photo-menu{width:auto;border:2px solid #444444;background:#2e2f2e;color:#eeeecc;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:2px;}.contact-photo-menu li a:hover{color:white;background:#3465A4;text-decoration:none;}
+.contact-photo-menu{width:auto;border:2px solid #88a9d2;background:#2e2f2e;color:#eeeecc;position:absolute;font-size:smaller;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:4px;color:#88a9d2;background:#eeeecc;line-height:1;}.contact-photo-menu li a:hover{background:#88a9d2;color:#eeeecc;text-decoration:none;}
#id_openid_url{background:url(dark/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;}
#settings-default-perms{margin-bottom:20px;}
#register-form div,#profile-edit-form div{clear:both;}
.settings-block label{clear:left;}
.settings-block input{margin:10px 5px;}
-#register-form label,#profile-edit-form label{width:300px;float:left;}
-#register-form span,#profile-edit-form span{color:#555753;display:block;margin-bottom:20px;}
+#register-form label,#profile-edit-form label{width:23em;}
+#register-form span,#profile-edit-form span{color:#555753;display:inline-block;margin-bottom:20px;}
#profile-edit-marital-label span{margin:-4px;}
.settings-submit-wrapper,.profile-edit-submit-wrapper{margin:0 0 30px;}
.profile-edit-side-div{display:none;}
@@ -389,18 +389,19 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
.fc-state-highlight{background:#eeeecc;color:#2e2f2e;}
.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
#group-sidebar{margin-bottom:10px;}
-.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#2e2f2e;background:#eeeecc;border:1px solid #88a9d2;}
-.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{padding:3px;color:#88a9d2;background:#2e2f2e;border:1px solid #88a9d2;}
+.group-selected,.nets-selected,.fileas-selected{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
+.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;}
.groupsideedit{margin-right:10px;}
#sidebar-group-ul{padding-left:0;}
#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
#sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
-.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#eeeecc;background:#2e3436;border:1px solid #638ec4;padding:3px;}
+.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
+.sidebar-group-element a{border:0;text-decoration:none;}
#sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;}
#peoplefind-sidebar form{margin-bottom:10px;}
#sidebar-new-group:hover{}
#sidebar-new-group:active{position:relative;top:1px;}
-#side-peoplefind-url{background-color:#2e2f2e;color:#eeeecc;border:1px solid #999999;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#eeeeee;color:#222222;border:1px solid #333333;}
+#side-peoplefind-url{border:1px solid #999999;margin-right:3px;width:75%;}
.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;}
.nets-link,.nets-all{margin-left:0px;}
#netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index 4967ac9c2..a9b881c55 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -190,7 +190,7 @@ label {
font-size: small;
margin: 0 10px 1em 0;
.borders(1px, solid, @bg_colour);
- padding: 5px;
+ padding: 3px 5px;
background: @main_colour;
color: darken(@main_alt_colour, 86.5%);
.box_shadow(3px, 3px, 5px);
@@ -198,10 +198,14 @@ label {
input {
.box(250px, 25px);
.borders(1px, solid, darken(@main_alt_colour, 33.5%));
+ width: 17em;
&[type="checkbox"],
&[type="radio"] {
- margin: 0;
.box(15px, 15px);
+ margin: 0;
+ }
+ &[type="radio"] {
+ margin: 5px 0;
}
&[type="submit"],
&[type="button"] {
@@ -280,30 +284,35 @@ h6 {
.box(100%, 100%);
margin: 0 auto;
}
-.button,
-#profile-listing-desc {
+.button {
// .box(25%, auto);
// background: @menu_bg_colour;
color: @main_colour;
// .borders(2px, outset, darken(@menu_bg_colour, 20%));
- // .rounded_corners;
+ .rounded_corners;
padding: 5px;
// font-size: smaller;
cursor: pointer;
- &.active {
- .box_shadow(4px, 4px, 7px);
- }
+ // &.active {
+ // .box_shadow(4px, 4px, 7px);
+ // }
a {
color: @main_colour;
// font-size: smaller;
font-weight: bold;
}
}
+#profile-listing-desc {
+ a {
+ color: @main_colour;
+ font-weight: bold;
+ }
+}
[class$="-desc"],
[id$="-desc"] {
color: @main_colour;
background: @bg_colour;
- .borders(1px, outset, @main_colour);
+ .borders(3px, outset, @main_colour);
.rounded_corners;
// .box_shadow(3px, 3px, 5px);
margin: 3px 10px 7px 0;
@@ -658,17 +667,19 @@ nav #nav-notifications-linkmenu {
}
#search-text,
#mini-search-text {
- background: @bg_colour;
+ background: white;
color: @main_colour;
margin: 8px;
}
#search-text {
- .borders;
+ .borders(1px, solid, @main_alt_colour);
+ margin: 8px 0;
}
#mini-search-text {
font-size: 8pt;
height: 14px;
width: 10em;
+ margin: 5px;
}
#scrollup {
position: fixed;
@@ -754,11 +765,13 @@ nav #nav-notifications-linkmenu {
.menu-popup {
position: absolute;
display: none;
- width: 11em;
+ // width: 11em;
background: white;
color: @bg_colour;
margin: 0px;
padding: 0px;
+ font-size: small;
+ line-height: 1.1;
.borders(3px, solid, @link_colour);
.rounded_corners;
z-index: 100000;
@@ -1016,7 +1029,7 @@ nav #nav-notifications-linkmenu {
background: darken(@main_alt_colour, 46.8%);
}
[id$="jot-text_ifr"] {
- width: 99.900002% !important;
+ // width: 99.900002% !important;
color: @bg_colour;
background: @main_colour;
.mceContentBody {
@@ -1226,34 +1239,45 @@ nav #nav-notifications-linkmenu {
font-size: smaller;
}
}
-.tab {
+.multibutton () {
.borders(1px, solid, @hover_colour);
padding: 4px;
- &:hover,
- &:active {
+ .rounded_corners;
+ &:active,
+ &:hover {
background: @shiny_colour;
color: @main_colour;
.borders(1px, solid, @hover_colour);
}
- &.active {
- background: @main_colour;
- color: @bg_colour;
+ a {
+ border: 0;
+ text-decoration: none;
+ }
+}
+.multibutton_active () {
+ background: @main_colour;
+ color: @bg_colour;
+ .borders(1px, solid, @hover_colour);
+ padding: 4px;
+ .rounded_corners;
+ &:hover {
+ background: @shiny_colour;
+ color: @main_colour;
.borders(1px, solid, @hover_colour);
- &:hover {
- background: @shiny_colour;
- color: @main_colour;
- .borders(1px, solid, @hover_colour);
- }
- a {
- color: @bg_colour;
- text-decoration: none;
- }
}
a {
- border: 0;
+ color: @bg_colour;
text-decoration: none;
}
}
+.tab {
+ .multibutton;
+}
+.tab {
+ &.active {
+ .multibutton_active;
+ }
+}
/**
@@ -1595,7 +1619,6 @@ div {
}
&[id$="wrapper"] {
height: 100%;
- margin-bottom: 1em;
br {
clear: left;
}
@@ -1933,11 +1956,6 @@ div {
#contact-edit-poll-text {
display: inline;
}
-#contact-edit-info_tbl,
-#contact-edit-info_parent,
-.mceLayout {
- width: 100%;
-}
#contact-edit-end {
clear: both;
margin-bottom: 65px;
@@ -1956,20 +1974,25 @@ div {
}
.contact-photo-menu {
width: auto;
- .borders(2px, solid, darken(@main_alt_colour, 66.5%));
+ .borders(2px, solid, @link_colour);
background: @bg_colour;
color: @main_colour;
position: absolute;
+ font-size: smaller;
+ .rounded_corners;
left: 0px;
top: 90px;
display: none;
z-index: 10000;
li a {
display: block;
- padding: 2px;
+ padding: 4px;
+ color: @link_colour;
+ background: @main_colour;
+ line-height: 1;
&:hover {
- color: white;
- background: #3465A4;
+ background: @link_colour;
+ color: @main_colour;
text-decoration: none;
}
}
@@ -2001,13 +2024,12 @@ div {
}
#register-form label,
#profile-edit-form label {
- width: 300px;
- float: left;
+ width: 23em;
}
#register-form span,
#profile-edit-form span {
color: @menu_bg_colour;
- display: block;
+ display: inline-block;
margin-bottom: 20px;
}
#profile-edit-marital-label span {
@@ -2020,12 +2042,6 @@ div {
.profile-edit-side-div {
display: none;
}
-/*.profile-edit-side-div:hover {
- display: block;
-}
-.profile-edit-side-link {
- margin: 3px 0px 0px 70px;
-}*/
#profiles-menu-trigger {
margin: 0px 0px 0px 25px;
}
@@ -2320,19 +2336,20 @@ div {
.group-selected,
.nets-selected,
.fileas-selected {
- padding: 3px;
- color: @bg_colour;
- background: @main_colour;
- .borders(1px, solid, @link_colour);
-}
-.group-selected:hover,
-.nets-selected:hover,
-.fileas-selected:hover {
- padding: 3px;
- color: @link_colour;
- background: @bg_colour;
- .borders(1px, solid, @link_colour);
-}
+ // padding: 4px;
+ // color: @bg_colour;
+ // background: @main_colour;
+ // .borders(1px, solid, @link_colour);
+ .multibutton_active;
+}
+// .group-selected:hover,
+// .nets-selected:hover,
+// .fileas-selected:hover {
+// padding: 4px;
+// color: @link_colour;
+// background: @bg_colour;
+// .borders(1px, solid, @link_colour);
+// }
.groupsideedit {
margin-right: 10px;
}
@@ -2350,13 +2367,8 @@ div {
}
}
.sidebar-group-element {
- padding: 3px;
- &:hover {
- color: @main_colour;
- background: @shiny_colour;
- .borders(1px, solid, @hover_colour);
- padding: 3px;
- }
+ .multibutton;
+ .rounded_corners;
}
#sidebar-new-group {
margin: auto;
@@ -2380,17 +2392,9 @@ div {
}
}
#side-peoplefind-url {
- background-color: @bg_colour;
- color: @main_colour;
.borders(1px, solid, darken(@main_alt_colour, 33.5%));
margin-right: 3px;
width: 75%;
- &:hover,
- &:focus {
- background-color: @main_alt_colour;
- color: darken(@main_alt_colour, 80%);
- .borders(1px, solid, darken(@main_alt_colour, 73.5%));
- }
}
.nets-ul {
.list_reset;
diff --git a/view/theme/dispy/dark/theme.php b/view/theme/dispy/dark/theme.php
index 339c477a0..e156b6a7d 100644
--- a/view/theme/dispy/dark/theme.php
+++ b/view/theme/dispy/dark/theme.php
@@ -1,19 +1,19 @@
-* Maintainer: Simon
-* Screenshot: Screenshot
-*/
+ * Name: Dispy Dark
+ * Description: Dispy Dark: Dark, Spartan, Sleek, and Functional
+ * Version: 1.2.1
+ * Author: Simon
+ * Maintainer: Simon
+ * Screenshot: Screenshot
+ */
$a = get_app();
$a->theme_info = array(
'family' => 'dispy',
'name' => 'dark',
- 'version' => '1.2'
+ 'version' => '1.2.1'
);
function dispy_dark_init(&$a) {
diff --git a/view/theme/dispy/light/_base.less b/view/theme/dispy/light/_base.less
index 70576145c..3046c1bac 100644
--- a/view/theme/dispy/light/_base.less
+++ b/view/theme/dispy/light/_base.less
@@ -59,7 +59,8 @@
@dk_main_colour: darken(@bg_colour, 10%);
//* links */
-@link_colour: #3465a4;
+// yes our link colour is "friendica blue" ;)
+@link_colour: @friendica_blue;
@dk_link_colour: darken(@link_colour, 10%);
@lt_link_colour: lighten(@link_colour, 10%);
//@hover_colour: #729fcf;
diff --git a/view/theme/dispy/light/connect.png b/view/theme/dispy/light/connect.png
deleted file mode 100644
index b76fc13dc..000000000
Binary files a/view/theme/dispy/light/connect.png and /dev/null differ
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index bd4088b06..bd3da3189 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -37,8 +37,9 @@ img{border:0 none;}
a{color:#3465a4;text-decoration:none;margin-bottom:1px;}a:hover{color:#284d7d;border-bottom:1px dotted #284d7d;}
a:hover img{text-decoration:none;}
blockquote{background:#aaaaaa;color:#111111;text-indent:5px;padding:5px;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
-label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #eeeeec;padding:5px;background:#cccccc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
-input{width:250px;height:25px;border:1px solid #444444;}input[type="checkbox"],input[type="radio"]{margin:0;width:15px;height:15px;}
+label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #eeeeec;padding:3px 5px;background:#cccccc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
+input{width:250px;height:25px;border:1px solid #444444;width:17em;}input[type="checkbox"],input[type="radio"]{width:15px;height:15px;margin:0;}
+input[type="radio"]{margin:5px 0;}
input[type="submit"],input[type="button"]{background-color:#555753;border:2px outset #444444;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:1px 3px 4px 0 #111111;-o-box-shadow:1px 3px 4px 0 #111111;-webkit-box-shadow:1px 3px 4px 0 #111111;-ms-box-shadow:1px 3px 4px 0 #111111;box-shadow:1px 3px 4px 0 #111111;color:#eeeeec;cursor:pointer;font-weight:bold;width:auto;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;}
input[type="submit"]:active,input[type="button"]:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
h1,h2,h3,h4,h5,h6{margin:10px 0px;font-weight:bold;border-bottom:1px solid #284d7d;}
@@ -55,9 +56,9 @@ h6{font-size:xx-small;}
.action{margin:5px 0;}
.tool{margin:5px 0;list-style:none;}
#articlemain{width:100%;height:100%;margin:0 auto;}
-.button,#profile-listing-desc{color:#111111;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
-.button a,#profile-listing-desc a{color:#111111;font-weight:bold;}
-[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
+.button{color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#111111;font-weight:bold;}
+#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
+[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:3px outset #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
.intro-approve-as-friend-desc{margin-top:10px;}
.intro-desc{margin-bottom:20px;font-weight:bold;}
@@ -106,8 +107,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;}
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
#search-text,#mini-search-text{background:white;color:#111111;margin:8px;}
-#search-text{border:1px solid #999999;}
-#mini-search-text{font-size:8pt;height:14px;width:10em;}
+#search-text{border:1px solid #999999;margin:8px 0;}
+#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
@@ -120,7 +121,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#intro-update{background-position:-120px 0px;}
#lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
#language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
-.menu-popup{position:absolute;display:none;width:11em;background:white;color:#111111;margin:0px;padding:0px;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;}
+.menu-popup{position:absolute;display:none;background:white;color:#111111;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;}
.menu-popup .menu-sep{border-top:1px solid #4e4f4e;}
.menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}
.menu-popup .empty{padding:5px;text-align:center;color:#ffffff;}
@@ -140,7 +141,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;}
.aprofile dt{background:transparent;color:#666666;font-weight:bold;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:15px 0 5px;padding-left:5px;}
#profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;}
-#dfrn-request-link{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#111111;display:block;font-size:1.2em;padding:0.2em 0.5em;background-color:#3465a4;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");background-repeat:no-repeat;background-position:95% center;}
+#dfrn-request-link{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#eeeeec;display:block;font-size:1.2em;padding:0.2em 0.5em;background-color:#3465a4;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");background-repeat:no-repeat;background-position:95% center;}
#wallmessage-link{color:#eeeeec;display:block;font-size:1.2em;padding:0.2em 0.5em;}
.ttright{margin:0px;}
.contact-block-div{width:50px;height:50px;float:left;}
@@ -155,7 +156,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#profile-jot-text_tbl{margin-bottom:10px;background:#808080;}
#profile-jot-text_ifr{width:99.900002% !important;}
#profile-jot-text_toolbargroup,.mceCenter tr{background:#808080;}
-[id$="jot-text_ifr"]{width:99.900002% !important;color:#111111;background:#eeeeec;}[id$="jot-text_ifr"] .mceContentBody{color:#111111;background:#eeeeec;}
+[id$="jot-text_ifr"]{color:#111111;background:#eeeeec;}[id$="jot-text_ifr"] .mceContentBody{color:#111111;background:#eeeeec;}
.defaultSkin tr.mceFirst{background:#808080;}
.defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eeeeec;}
.defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eeeeec;}
@@ -187,10 +188,10 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#jot-preview-content{background-color:#f2f2c3;color:#111111;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
#sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;}
.tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;}
-.tab{border:1px solid #284d7d;padding:4px;}.tab:hover,.tab:active{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
-.tab.active{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;}.tab.active:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
-.tab.active a{color:#eeeeec;text-decoration:none;}
+.tab{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
.tab a{border:0;text-decoration:none;}
+.tab.active{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab.active:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
+.tab.active a{color:#eeeeec;text-decoration:none;}
.wall-item-outside-wrapper{border:1px solid #545454;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:6px 1px 10px -2px #111111;-o-box-shadow:6px 1px 10px -2px #111111;-webkit-box-shadow:6px 1px 10px -2px #111111;-ms-box-shadow:6px 1px 10px -2px #111111;box-shadow:6px 1px 10px -2px #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;}
.wall-item-content-wrapper{position:relative;padding:0.75em;width:auto;}
.wall-item-outside-wrapper .wall-item-comment-wrapper{}
@@ -243,7 +244,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.comment-edit-submit{height:22px;background-color:#555753;color:#eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:0;}
.wall-item-body code{background-color:#dddddd;border-bottom:1px dashed #888888;border-left:5px solid #888888;border-top:1px dashed #888888;color:#191919;display:block;overflow-x:auto;padding:5px 0 15px 10px;width:95%;}.wall-item-body code a{color:#477ec4;}
div[id$="text"]{font-weight:bold;border-bottom:1px solid #eeeeec;}
-div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
+div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
[id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;}
@@ -317,17 +318,16 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
#contact-edit-last-update-text{margin-bottom:15px;}
#contact-edit-last-updated{font-weight:bold;}
#contact-edit-poll-text{display:inline;}
-#contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;}
#contact-edit-end{clear:both;margin-bottom:65px;}
.contact-photo-menu-button{position:absolute;background:url("light/photo-menu.jpg") top left no-repeat transparent;margin:0px;padding:0px;width:16px;height:16px;top:64px;left:0px;overflow:hidden;text-indent:40px;display:none;}
-.contact-photo-menu{width:auto;border:2px solid #444444;background:#eeeeec;color:#111111;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:2px;}.contact-photo-menu li a:hover{color:white;background:#3465A4;text-decoration:none;}
+.contact-photo-menu{width:auto;border:2px solid #3465a4;background:#eeeeec;color:#111111;position:absolute;font-size:smaller;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:4px;color:#3465a4;background:#eeeeec;line-height:1;}.contact-photo-menu li a:hover{background:#3465a4;color:#eeeeec;text-decoration:none;}
#id_openid_url{background:url(light/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;}
#settings-default-perms{margin-bottom:20px;}
#register-form div,#profile-edit-form div{clear:both;}
.settings-block label{clear:left;}
.settings-block input{margin:10px 5px;}
-#register-form label,#profile-edit-form label{width:300px;float:left;}
-#register-form span,#profile-edit-form span{color:#555753;display:block;margin-bottom:20px;}
+#register-form label,#profile-edit-form label{width:23em;}
+#register-form span,#profile-edit-form span{color:#555753;display:inline-block;margin-bottom:20px;}
#profile-edit-marital-label span{margin:-4px;}
.settings-submit-wrapper,.profile-edit-submit-wrapper{margin:0 0 30px;}
.profile-edit-side-div{display:none;}
@@ -389,18 +389,19 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
.fc-state-highlight{background:#eeeeec;color:#111111;}
.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
#group-sidebar{margin-bottom:10px;}
-.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#eeeeec;background:#2e3436;border:1px solid #3465a4;}
-.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{padding:3px;color:#3465a4;background:#eeeeec;border:1px solid #3465a4;}
+.group-selected,.nets-selected,.fileas-selected{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
+.group-selected a,.nets-selected a,.fileas-selected a{color:#eeeeec;text-decoration:none;}
.groupsideedit{margin-right:10px;}
#sidebar-group-ul{padding-left:0;}
#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
#sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
-.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#111111;background:#f2f2c3;border:1px solid #284d7d;padding:3px;}
+.sidebar-group-element{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
+.sidebar-group-element a{border:0;text-decoration:none;}
#sidebar-new-group{margin:auto;display:inline-block;color:#eeeeec;text-decoration:none;text-align:center;}
#peoplefind-sidebar form{margin-bottom:10px;}
#sidebar-new-group:hover{}
#sidebar-new-group:active{position:relative;top:1px;}
-#side-peoplefind-url{background-color:#eeeeec;color:#666666;border:1px solid #666666;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#999999;color:#eeeeec;border:1px solid #111111;}
+#side-peoplefind-url{border:1px solid #666666;margin-right:3px;width:75%;}
.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;}
.nets-link,.nets-all{margin-left:0px;}
#netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 92c8547ee..d8bd922cc 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -191,7 +191,7 @@ label {
font-size: small;
margin: 0 10px 1em 0;
.borders(1px, solid, @bg_colour);
- padding: 5px;
+ padding: 3px 5px;
background: lighten(@main_alt_colour, 20%);
color: @main_colour;
.box_shadow(3px, 3px, 5px);
@@ -199,10 +199,14 @@ label {
input {
.box(250px, 25px);
.borders(1px, solid, darken(@main_alt_colour, 33.5%));
+ width: 17em;
&[type="checkbox"],
&[type="radio"] {
- margin: 0;
.box(15px, 15px);
+ margin: 0;
+ }
+ &[type="radio"] {
+ margin: 5px 0;
}
&[type="submit"],
&[type="button"] {
@@ -281,30 +285,35 @@ h6 {
.box(100%, 100%);
margin: 0 auto;
}
-.button,
-#profile-listing-desc {
+.button {
// .box(25%, auto);
// background: @menu_bg_colour;
color: @main_colour;
// .borders(2px, outset, darken(@menu_bg_colour, 20%));
- // .rounded_corners;
+ .rounded_corners;
padding: 5px;
// font-size: smaller;
cursor: pointer;
- &.active {
- .box_shadow(4px, 4px, 7px);
- }
+ // &.active {
+ // .box_shadow(4px, 4px, 7px);
+ // }
a {
color: @main_colour;
// font-size: smaller;
font-weight: bold;
}
}
+#profile-listing-desc {
+ a {
+ color: @bg_colour;
+ font-weight: bold;
+ }
+}
[class$="-desc"],
[id$="-desc"] {
color: @bg_colour;
background: @dk_bg_colour;
- .borders(1px, outset, @bg_colour);
+ .borders(3px, outset, @main_colour);
.rounded_corners;
// .box_shadow(3px, 3px, 5px);
margin: 3px 10px 7px 0;
@@ -569,6 +578,9 @@ div.jGrowl div {
padding-left: 58px;
margin-top: 50px;
}
+ // &.jGrowl-message {
+
+ // }
}
#nav-notifications-menu {
margin: 30px 0 0 -20px;
@@ -662,11 +674,13 @@ nav #nav-notifications-linkmenu {
}
#search-text {
.borders(1px, solid, @main_alt_colour);
+ margin: 8px 0;
}
#mini-search-text {
font-size: 8pt;
height: 14px;
width: 10em;
+ margin: 5px;
}
#scrollup {
position: fixed;
@@ -752,11 +766,13 @@ nav #nav-notifications-linkmenu {
.menu-popup {
position: absolute;
display: none;
- width: 11em;
+ // width: 11em;
background: white;
color: @main_colour;
margin: 0px;
padding: 0px;
+ font-size: small;
+ line-height: 1.1;
.borders(3px, solid, @link_colour);
.rounded_corners;
z-index: 100000;
@@ -904,11 +920,11 @@ nav #nav-notifications-linkmenu {
}
#dfrn-request-link {
.rounded_corners;
- color: @main_colour;
+ color: @bg_colour;
display: block;
font-size: 1.2em;
padding: 0.2em 0.5em;
- background-color: @friendica_blue;
+ background-color: @link_colour;
// background-image: url(icons/connect.png);
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");
background-repeat: no-repeat;
@@ -1014,7 +1030,7 @@ nav #nav-notifications-linkmenu {
background: darken(@main_alt_colour, 10%);
}
[id$="jot-text_ifr"] {
- width: 99.900002% !important;
+ // width: 99.900002% !important;
color: @main_colour;
background: @bg_colour;
.mceContentBody {
@@ -1224,34 +1240,45 @@ nav #nav-notifications-linkmenu {
font-size: smaller;
}
}
-.tab {
+.multibutton () {
.borders(1px, solid, @hover_colour);
padding: 4px;
- &:hover,
- &:active {
+ .rounded_corners;
+ &:active,
+ &:hover {
background: @shiny_colour;
color: @main_colour;
.borders(1px, solid, @hover_colour);
}
- &.active {
- background: @dk_bg_colour;
- color: @bg_colour;
+ a {
+ border: 0;
+ text-decoration: none;
+ }
+}
+.multibutton_active () {
+ background: @dk_bg_colour;
+ color: @bg_colour;
+ .borders(1px, solid, @hover_colour);
+ padding: 4px;
+ .rounded_corners;
+ &:hover {
+ background: @shiny_colour;
+ color: @main_colour;
.borders(1px, solid, @hover_colour);
- &:hover {
- background: @shiny_colour;
- color: @main_colour;
- .borders(1px, solid, @hover_colour);
- }
- a {
- color: @bg_colour;
- text-decoration: none;
- }
}
a {
- border: 0;
+ color: @bg_colour;
text-decoration: none;
}
}
+.tab {
+ .multibutton;
+}
+.tab {
+ &.active {
+ .multibutton_active;
+ }
+}
/**
@@ -1593,7 +1620,6 @@ div {
}
&[id$="wrapper"] {
height: 100%;
- margin-bottom: 1em;
br {
clear: left;
}
@@ -1931,11 +1957,6 @@ div {
#contact-edit-poll-text {
display: inline;
}
-#contact-edit-info_tbl,
-#contact-edit-info_parent,
-.mceLayout {
- width: 100%;
-}
#contact-edit-end {
clear: both;
margin-bottom: 65px;
@@ -1954,20 +1975,25 @@ div {
}
.contact-photo-menu {
width: auto;
- .borders(2px, solid, darken(@main_alt_colour, 33.5%));
+ .borders(2px, solid, @link_colour);
background: @bg_colour;
color: @main_colour;
position: absolute;
+ font-size: smaller;
+ .rounded_corners;
left: 0px;
top: 90px;
display: none;
z-index: 10000;
li a {
display: block;
- padding: 2px;
+ padding: 4px;
+ color: @link_colour;
+ background: @bg_colour;
+ line-height: 1;
&:hover {
- color: white;
- background: #3465A4;
+ background: @link_colour;
+ color: @bg_colour;
text-decoration: none;
}
}
@@ -1999,13 +2025,12 @@ div {
}
#register-form label,
#profile-edit-form label {
- width: 300px;
- float: left;
+ width: 23em;
}
#register-form span,
#profile-edit-form span {
color: @menu_bg_colour;
- display: block;
+ display: inline-block;
margin-bottom: 20px;
}
#profile-edit-marital-label span {
@@ -2018,12 +2043,6 @@ div {
.profile-edit-side-div {
display: none;
}
-/*.profile-edit-side-div:hover {
- display: block;
-}
-.profile-edit-side-link {
- margin: 3px 0px 0px 70px;
-}*/
#profiles-menu-trigger {
margin: 0px 0px 0px 25px;
}
@@ -2318,19 +2337,20 @@ div {
.group-selected,
.nets-selected,
.fileas-selected {
- padding: 3px;
- color: @bg_colour;
- background: @dk_bg_colour;
- .borders(1px, solid, @link_colour);
-}
-.group-selected:hover,
-.nets-selected:hover,
-.fileas-selected:hover {
- padding: 3px;
- color: @link_colour;
- background: @bg_colour;
- .borders(1px, solid, @link_colour);
-}
+ // padding: 4px;
+ // color: @bg_colour;
+ // background: @dk_bg_colour;
+ // .borders(1px, solid, @hover_colour);
+ .multibutton_active;
+}
+// .group-selected:hover,
+// .nets-selected:hover,
+// .fileas-selected:hover {
+// padding: 4px;
+// color: @link_colour;
+// background: @bg_colour;
+// .borders(1px, solid, @link_colour);
+// }
.groupsideedit {
margin-right: 10px;
}
@@ -2348,13 +2368,8 @@ div {
}
}
.sidebar-group-element {
- padding: 3px;
- &:hover {
- color: @main_colour;
- background: @shiny_colour;
- .borders(1px, solid, @hover_colour);
- padding: 3px;
- }
+ .multibutton;
+ .rounded_corners;
}
#sidebar-new-group {
margin: auto;
@@ -2378,17 +2393,9 @@ div {
}
}
#side-peoplefind-url {
- background-color: @bg_colour;
- color: darken(@main_alt_colour, 20%);
.borders(1px, solid, darken(@main_alt_colour, 20%));
margin-right: 3px;
width: 75%;
- &:hover,
- &:focus {
- background-color: @main_alt_colour;
- color: @bg_colour;
- .borders(1px, solid, @main_colour);
- }
}
.nets-ul {
.list_reset;
diff --git a/view/theme/dispy/light/theme.php b/view/theme/dispy/light/theme.php
index 2b37c0671..df3cca042 100644
--- a/view/theme/dispy/light/theme.php
+++ b/view/theme/dispy/light/theme.php
@@ -1,9 +1,9 @@
Dispy: Light, Spartan, Sleek, and Functional
Dispy Dark: Dark, Spartan, Sleek, and Functional
- * Version: 1.2
+ * Name: Dispy Light
+ * Description: Dispy Light: Light, Spartan, Sleek, and Functional
+ * Version: 1.2.1
* Author: Simon
* Maintainer: Simon
* Screenshot: Screenshot
@@ -13,7 +13,7 @@ $a = get_app();
$a->theme_info = array(
'family' => 'dispy',
'name' => 'light',
- 'version' => '1.2'
+ 'version' => '1.2.1'
);
function dispy_light_init(&$a) {
@@ -21,10 +21,10 @@ function dispy_light_init(&$a) {
/** @purpose set some theme defaults
*/
$cssFile = null;
- $colour = false;
$colour = 'light';
+ $colour_path = "/light/";
- // custom css
+ // set css
if (!is_null($cssFile)) {
$a->page['htmlhead'] .= sprintf('', $cssFile);
}
--
cgit v1.2.3
From d466c9ab08bb843d0f31d3b555ada738d8dd0a0e Mon Sep 17 00:00:00 2001
From: Simon L'nu
Date: Mon, 21 May 2012 21:38:53 -0400
Subject: fix (min-)search-text text
Signed-off-by: Simon L'nu
---
view/theme/dispy/dark/style.css | 2 +-
view/theme/dispy/dark/style.less | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'view/theme')
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 59c893176..6f29ef1f4 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -106,7 +106,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;}
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
-#search-text,#mini-search-text{background:white;color:#eeeecc;margin:8px;}
+#search-text,#mini-search-text{background:white;color:#2e2f2e;margin:8px;}
#search-text{border:1px solid #eeeeee;margin:8px 0;}
#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index a9b881c55..000918a9b 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -668,7 +668,7 @@ nav #nav-notifications-linkmenu {
#search-text,
#mini-search-text {
background: white;
- color: @main_colour;
+ color: @bg_colour;
margin: 8px;
}
#search-text {
--
cgit v1.2.3
From 18983bb932209336aa4b0e804c936c74e37e4260 Mon Sep 17 00:00:00 2001
From: Thomas Willingham
Date: Tue, 22 May 2012 19:14:58 +0100
Subject: Fix darkzero/ns BB icon background colours.
---
view/theme/darkzero-NS/style.css | 8 ++++----
view/theme/darkzero/style.css | 9 +++++++++
2 files changed, 13 insertions(+), 4 deletions(-)
(limited to 'view/theme')
diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css
index 1efe093ed..6dc788f35 100644
--- a/view/theme/darkzero-NS/style.css
+++ b/view/theme/darkzero-NS/style.css
@@ -146,11 +146,11 @@ blockquote {
background:#444;
}
-
-
-
-
.wall-item-content {
max-height: 20000px;
overflow: none;
+}
+
+.editicon:hover {
+ background-color: #ccc;
}
\ No newline at end of file
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index 6f238bec6..e0155144d 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -146,3 +146,12 @@ blockquote {
background:#444;
}
+.editicon {
+ background-color: #333;
+}
+
+/* This seems okay to me...we might not need a new iconset, lets see how people react */
+
+.editicon:hover {
+ background-color: #ccc;
+}
\ No newline at end of file
--
cgit v1.2.3
From b962559570fe3a7381c7721a62989072661f01e9 Mon Sep 17 00:00:00 2001
From: Thomas Willingham
Date: Tue, 22 May 2012 19:19:36 +0100
Subject: Oops - but lets commit the right revision, sorry. There's a spare
line in the last one.
---
view/theme/darkzero/style.css | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
(limited to 'view/theme')
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index e0155144d..77650a91a 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -146,12 +146,7 @@ blockquote {
background:#444;
}
+/* This seems okay to me...we might not need a new iconset, lets see how people react */
.editicon {
background-color: #333;
-}
-
-/* This seems okay to me...we might not need a new iconset, lets see how people react */
-
-.editicon:hover {
- background-color: #ccc;
}
\ No newline at end of file
--
cgit v1.2.3
From 3ac7c4e8599266aba69bf521c7ba94393df3c728 Mon Sep 17 00:00:00 2001
From: friendica
Date: Tue, 22 May 2012 21:20:31 -0700
Subject: keep FB out of private notes
---
view/theme/slackr/theme.php | 1 +
1 file changed, 1 insertion(+)
(limited to 'view/theme')
diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php
index 99e061a2f..516132f5c 100644
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
@@ -45,6 +45,7 @@ function cmtBbClose(id) {
}
$(document).ready(function() {
+
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
$('.group-edit-icon').hover(
--
cgit v1.2.3
From af495879af8c3600fc0889f5c91ac6ea1312643b Mon Sep 17 00:00:00 2001
From: friendica
Date: Tue, 22 May 2012 21:54:19 -0700
Subject: mark bubbles unsupported
---
view/theme/darkbubble/unsupported | 0
view/theme/testbubble/unsupported | 0
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 view/theme/darkbubble/unsupported
create mode 100644 view/theme/testbubble/unsupported
(limited to 'view/theme')
diff --git a/view/theme/darkbubble/unsupported b/view/theme/darkbubble/unsupported
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/theme/testbubble/unsupported b/view/theme/testbubble/unsupported
new file mode 100644
index 000000000..e69de29bb
--
cgit v1.2.3
From 86a38cca248f969c61f825205e21a6d33fff3c8d Mon Sep 17 00:00:00 2001
From: friendica
Date: Tue, 22 May 2012 22:06:52 -0700
Subject: import quattro event reminder
---
view/theme/slackr/birthdays_reminder.tpl | 1 +
view/theme/slackr/events_reminder.tpl | 39 ++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
create mode 100644 view/theme/slackr/birthdays_reminder.tpl
create mode 100644 view/theme/slackr/events_reminder.tpl
(limited to 'view/theme')
diff --git a/view/theme/slackr/birthdays_reminder.tpl b/view/theme/slackr/birthdays_reminder.tpl
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/view/theme/slackr/birthdays_reminder.tpl
@@ -0,0 +1 @@
+
diff --git a/view/theme/slackr/events_reminder.tpl b/view/theme/slackr/events_reminder.tpl
new file mode 100644
index 000000000..fc13fa68b
--- /dev/null
+++ b/view/theme/slackr/events_reminder.tpl
@@ -0,0 +1,39 @@
+
+
+
+
+
--
cgit v1.2.3
From 8ffb65ceef4de1b1088ace577682812cba6016af Mon Sep 17 00:00:00 2001
From: friendica
Date: Tue, 22 May 2012 22:34:35 -0700
Subject: event calendar theming
---
view/theme/slackr/style.css | 3 +++
1 file changed, 3 insertions(+)
(limited to 'view/theme')
diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css
index 41f4e58ee..635f5bcf0 100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/style.css
@@ -40,6 +40,9 @@ nav #site-location {
right: 36px;
}
+.fc-event-skin {
+ background-color: #3465a4 !important;
+}
.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
border-radius: 3px;
-moz-border-radius: 3px;
--
cgit v1.2.3
From 61dba985c14ebcfd20d18b579aee9b781f98bc23 Mon Sep 17 00:00:00 2001
From: friendica
Date: Wed, 23 May 2012 01:01:04 -0700
Subject: photo rotation
---
view/theme/duepuntozero/style.css | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
(limited to 'view/theme')
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index c556dcead..fca935dee 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2118,7 +2118,7 @@ aside input[type='text'] {
margin-bottom: 15px;
}
-#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label {
float: left;
width: 150px;
}
@@ -2127,7 +2127,7 @@ aside input[type='text'] {
margin-bottom: 15px;
}
-#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate {
float: left;
margin-bottom: 25px;
}
@@ -2138,10 +2138,14 @@ aside input[type='text'] {
margin-bottom: 25px;
}
-#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
clear: both;
}
+#photo-edit-rotate-end {
+ margin-bottom: 15px;
+}
+
#photo-edit-delete-button {
margin-left: 200px;
}
--
cgit v1.2.3
From 325343a4922543a0043b91054984354624cf5504 Mon Sep 17 00:00:00 2001
From: root
Date: Wed, 23 May 2012 07:38:31 -0400
Subject: Update install wizard - writable .htconfig.php not required - add
test for working .htaccess/mod_rewrite configuration - fix last pass: create
tables, eventually show config text and print a "What next" section
---
view/theme/duepuntozero/style.css | 1 +
1 file changed, 1 insertion(+)
(limited to 'view/theme')
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index fca935dee..f984cab68 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2950,6 +2950,7 @@ aside input[type='text'] {
.starred { background-position: -16px -48px; }
.unstarred { background-position: -32px -48px; }
.tagged { background-position: -48px -48px; }
+.yellow { background-position: -64px -48px; }
.filer-icon {
--
cgit v1.2.3
From 789063da399675575f61e150f11dbe534d7db3c5 Mon Sep 17 00:00:00 2001
From: Simon L'nu
Date: Wed, 23 May 2012 15:58:22 -0400
Subject: add a placeholder attribute on search-text; dispy fixes
Signed-off-by: Simon L'nu
---
view/theme/darkbubble/unsupported | 0
view/theme/dispy/dark/style.css | 18 ++++++++++--------
view/theme/dispy/dark/style.less | 31 +++++++++++++++++++++----------
view/theme/dispy/group_side.tpl | 5 ++---
view/theme/dispy/light/style.css | 6 +++---
view/theme/dispy/light/style.less | 31 +++++++++++++++++++++----------
6 files changed, 57 insertions(+), 34 deletions(-)
delete mode 100644 view/theme/darkbubble/unsupported
(limited to 'view/theme')
diff --git a/view/theme/darkbubble/unsupported b/view/theme/darkbubble/unsupported
deleted file mode 100644
index e69de29bb..000000000
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 6f29ef1f4..612c24f5c 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -58,7 +58,7 @@ h6{font-size:xx-small;}
#articlemain{width:100%;height:100%;margin:0 auto;}
.button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;}
#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
-[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
+[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px ridge #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
.intro-approve-as-friend-desc{margin-top:10px;}
.intro-desc{margin-bottom:20px;font-weight:bold;}
@@ -121,7 +121,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#intro-update{background-position:-120px 0px;}
#lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
#language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
-.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;}
+.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.2;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;}
.menu-popup .menu-sep{border-top:1px solid #4e4f4e;}
.menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}
.menu-popup .empty{padding:5px;text-align:center;color:#9ea8ac;}
@@ -135,7 +135,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#asidemain{float:left;font-size:small;margin:20px 0 20px 35px;width:25%;display:inline;}
#asideright,#asideleft{display:none;}
.vcard .fn{font-size:1.5em;font-weight:bold;border-bottom:1px solid #638ec4;padding-bottom:3px;}
-.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;}
+.vcard #profile-photo-wrapper{margin:20px 0;background-color:#555753;padding:5px;width:175px;height:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;}
#asidemain h4{font-size:1.2em;}
#asidemain #viewcontacts{text-align:right;}
#asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;}
@@ -389,21 +389,23 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
.fc-state-highlight{background:#eeeecc;color:#2e2f2e;}
.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
#group-sidebar{margin-bottom:10px;}
-.group-selected,.nets-selected,.fileas-selected{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
-.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;}
+.categories-selected,.group-selected,.nets-selected,.fileas-selected{color:#2e2f2e;background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.categories-selected:hover,.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
+.categories-selected a,.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;}
.groupsideedit{margin-right:10px;}
#sidebar-group-ul{padding-left:0;}
#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
#sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
-.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
+.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#eeeecc;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
.sidebar-group-element a{border:0;text-decoration:none;}
+.sidebar-group-element.group-selected{color:#2e2f2e;}
#sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;}
#peoplefind-sidebar form{margin-bottom:10px;}
#sidebar-new-group:hover{}
#sidebar-new-group:active{position:relative;top:1px;}
#side-peoplefind-url{border:1px solid #999999;margin-right:3px;width:75%;}
-.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;}
-.nets-link,.nets-all{margin-left:0px;}
+.categories-ul,.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.categories-ul li,.nets-ul li{margin:10px 0 0;}
+.categories-link,.nets-link,.nets-all{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin-left:0px;}.categories-link:active,.nets-link:active,.nets-all:active,.categories-link:hover,.nets-link:hover,.nets-all:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
+.categories-link a,.nets-link a,.nets-all a{border:0;text-decoration:none;}
#netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
#pending-update{float:right;color:white;font-weight:bold;background-color:red;padding:0 0.3em;}
.admin.linklist{border:0;padding:0;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index 000918a9b..51bf7ca30 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -312,7 +312,7 @@ h6 {
[id$="-desc"] {
color: @main_colour;
background: @bg_colour;
- .borders(3px, outset, @main_colour);
+ .borders(3px, ridge, @main_colour);
.rounded_corners;
// .box_shadow(3px, 3px, 5px);
margin: 3px 10px 7px 0;
@@ -510,7 +510,8 @@ nav .nav-link {
background-position: -44px -190px;
}
}
-#nav-login-link, #nav-logout-link {
+#nav-login-link,
+#nav-logout-link {
background-position: 0 -88px;
&:hover {
background-position: -22px -88px;
@@ -669,11 +670,10 @@ nav #nav-notifications-linkmenu {
#mini-search-text {
background: white;
color: @bg_colour;
- margin: 8px;
}
#search-text {
.borders(1px, solid, @main_alt_colour);
- margin: 8px 0;
+ margin: 5px 0;
}
#mini-search-text {
font-size: 8pt;
@@ -771,7 +771,7 @@ nav #nav-notifications-linkmenu {
margin: 0px;
padding: 0px;
font-size: small;
- line-height: 1.1;
+ line-height: 1.2;
.borders(3px, solid, @link_colour);
.rounded_corners;
z-index: 100000;
@@ -880,10 +880,12 @@ nav #nav-notifications-linkmenu {
padding-bottom: 3px;
}
#profile-photo-wrapper {
- margin: 20px;
- img {
- .box_shadow(3px, 3px, 10px, 0);
- }
+ margin: 20px 0;
+ background-color: @menu_bg_colour;
+ padding: 5px;
+ .box(175px, 175px);
+ .rounded_corners;
+ .box_shadow(3px, 3px, 10px, 0);
}
}
#asidemain {
@@ -2333,11 +2335,12 @@ div {
#group-sidebar {
margin-bottom: 10px;
}
+.categories-selected,
.group-selected,
.nets-selected,
.fileas-selected {
// padding: 4px;
- // color: @bg_colour;
+ color: @bg_colour;
// background: @main_colour;
// .borders(1px, solid, @link_colour);
.multibutton_active;
@@ -2369,6 +2372,10 @@ div {
.sidebar-group-element {
.multibutton;
.rounded_corners;
+ color: @main_colour;
+ &.group-selected {
+ color: @bg_colour;
+ }
}
#sidebar-new-group {
margin: auto;
@@ -2396,14 +2403,18 @@ div {
margin-right: 3px;
width: 75%;
}
+.categories-ul,
.nets-ul {
.list_reset;
li {
margin: 10px 0 0;
}
}
+.categories-link,
.nets-link,
.nets-all {
+ .multibutton;
+ .rounded_corners;
margin-left: 0px;
}
#netsearch-box {
diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl
index 10ecec2e8..be8e23de0 100644
--- a/view/theme/dispy/group_side.tpl
+++ b/view/theme/dispy/group_side.tpl
@@ -5,10 +5,9 @@