summaryrefslogtreecommitdiff
path: root/theme/base
diff options
context:
space:
mode:
authorRobin Millette <millette@controlyourself.ca>2009-05-31 17:12:04 -0400
committerRobin Millette <millette@controlyourself.ca>2009-05-31 17:12:04 -0400
commitebeb5f744cbfd5bfea0da1b350a3757865ec4b3b (patch)
treee94ceadeeba967759cb332211a5adb5d6dceab0b /theme/base
parent3e0c291810d23bb54c337c0fe95c1ba441459c4c (diff)
parent36fe5a85b2de9f71a5c963abd0074dd5b7ae1e61 (diff)
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload
Conflicts: js/util.js lib/attachmentlist.php
Diffstat (limited to 'theme/base')
-rw-r--r--theme/base/css/display.css84
-rw-r--r--theme/base/css/ie.css6
-rw-r--r--theme/base/images/icons/twotone/green/clip-02.gifbin0 -> 70 bytes
3 files changed, 76 insertions, 14 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 9bc1417b1..7d495c539 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -855,20 +855,6 @@ display:inline-block;
text-transform:lowercase;
}
-.notice .attachment {
-position:relative;
-}
-.notice .attachment img {
-position:absolute;
-top:18px;
-left:0;
-z-index:99;
-}
-#shownotice .notice .attachment img {
-position:static;
-}
-
-
.notice-options {
position:relative;
font-size:0.95em;
@@ -936,6 +922,75 @@ padding:0;
}
+.notice .attachment {
+position:relative;
+padding-left:16px;
+}
+#attachments .attachment {
+padding-left:0;
+}
+.notice .attachment img {
+position:absolute;
+top:18px;
+left:0;
+z-index:99;
+}
+#shownotice .notice .attachment img {
+position:static;
+}
+
+#attachments {
+clear:both;
+float:left;
+width:100%;
+margin-top:18px;
+}
+#attachments dt {
+font-weight:bold;
+font-size:1.3em;
+margin-bottom:4px;
+}
+
+#attachments ol li {
+margin-bottom:18px;
+list-style-type:decimal;
+float:left;
+clear:both;
+}
+
+#jOverlayContent,
+#jOverlayContent #content,
+#jOverlayContent #content_inner {
+width: auto !important;
+margin-bottom:0;
+}
+#jOverlayContent #content {
+padding:11px;
+min-height:auto;
+}
+#jOverlayContent .external span {
+display:block;
+margin-bottom:11px;
+}
+#jOverlayContent button {
+position:absolute;
+top:0;
+right:0;
+width:29px;
+height:29px;
+text-align:center;
+font-weight:bold;
+padding:0;
+}
+#jOverlayContent h1 {
+max-width:475px;
+}
+#jOverlayContent #content {
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+}
+
#usergroups #new_group {
float: left;
margin-right: 2em;
@@ -1182,6 +1237,7 @@ width:33%;
}
#settings_design_color .form_data label {
float:none;
+display:block;
}
#settings_design_color .form_data .swatch {
padding:11px;
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 5d8bea8ae..df0388a5a 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -30,3 +30,9 @@ margin-right:4px;
.entity_profile {
width:64%;
}
+#jOverlayContent .notice * {
+z-index:1;
+}
+#jOverlayContent .notice .attachment img {
+z-index:9999;
+}
diff --git a/theme/base/images/icons/twotone/green/clip-02.gif b/theme/base/images/icons/twotone/green/clip-02.gif
new file mode 100644
index 000000000..77a729799
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/clip-02.gif
Binary files differ