Merge branch 'testing' into filesize

[quix0rs-gnu-social.git] / theme / base / css / display.css

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 7ac66095a83510cff63c1800da9b70a7d06af9e4..3268aea39be0bffa884774f39dd764d584abcf7b 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -346,14 +346,12 @@ list-style-type:none;
 float:left;
 text-decoration:none;
 padding:4px 11px;
-border-radius-topleft:4px;
-border-radius-topright:4px;
+border-top-left-radius:4px;
+border-top-right-radius:4px;
 -moz-border-radius-topleft:4px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-left-radius:4px;
 -webkit-border-top-right-radius:4px;
-border-radius-topleft:0;
-border-radius-topright:0;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
@@ -381,13 +379,13 @@ display:block;
 width:80%;
 padding-right:10%;
 padding-left:10%;
-border-radius-toprleft:0;
+border-top-left-radius:0;
 -moz-border-radius-topleft:0;
 -webkit-border-top-left-radius:0;
-border-radius-topright:4px;
+border-top-right-radius:4px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-right-radius:4px;
-border-radius-bottomright:4px;
+border-bottom-right-radius:4px;
 -moz-border-radius-bottomright:4px;
 -webkit-border-bottom-right-radius:4px;
 }
@@ -398,13 +396,10 @@ box-shadow:none;
 }
 
 body[id$=adminpanel] #content {
-border-radius-topleft:7px;
-border-radius-topright:7px;
+border-top-left-radius:7px;
 -moz-border-radius-topleft:7px;
--moz-border-radius-topright:7px;
 -webkit-border-top-left-radius:7px;
--webkit-border-top-right-radius:7px;
-border-radius-topright:0;
+border-top-right-radius:0;
 -moz-border-radius-topright:0;
 -webkit-border-top-right-radius:0;
 }
@@ -488,6 +483,7 @@ min-height:259px;
 padding:1.795%;
 float:left;
 border-radius:7px;
+border-top-left-radius:0;
 -moz-border-radius:7px;
 -moz-border-radius-topleft:0;
 -webkit-border-radius:7px;
@@ -1325,15 +1321,6 @@ margin-left:4px;
 .notice .attachment.more {
 padding-left:0;
 }
-.notice .attachment img {
-position:absolute;
-top:18px;
-left:0;
-z-index:99;
-}
-#shownotice .notice .attachment img {
-position:static;
-}
 
 #attachments {
 clear:both;
@@ -1716,6 +1703,12 @@ width:auto;
 min-width:0;
 }
 
+.inline-attachment img {
+    /* Why on earth is this changed to block at the top? */
+    display: inline;
+    border: solid 1px #aaa;
+    padding: 1px;
+}
 }/*end of @media screen, projection, tv*/