diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-26 17:28:12 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-26 17:28:12 -0400 |
commit | 0b53a820c2b4224b66b2a24f67302b4c5ca1deed (patch) | |
tree | 67086e31a9437327898920996bede11c1668f0e2 /theme | |
parent | 40d4668c7c5cdd41d36b878ad87f7737117efc9c (diff) | |
parent | c93031c2aa49b8a044e896ca1e07f5f4f429308e (diff) |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'theme')
-rw-r--r-- | theme/base/css/display.css | 35 | ||||
-rw-r--r-- | theme/base/css/facebookapp.css | 3 | ||||
-rw-r--r-- | theme/base/images/icons/clip-inline.png | bin | 0 -> 1646 bytes | |||
-rw-r--r-- | theme/default/css/display.css | 12 | ||||
-rw-r--r-- | theme/identica/css/display.css | 12 |
5 files changed, 35 insertions, 27 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5d2b5231c..9bc1417b1 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -742,15 +742,10 @@ border-top-style:dotted; .notices li { list-style-type:none; } -.notices li.hover { -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -} .notices .notices { margin-top:7px; -margin-left:3%; -width:97%; +margin-left:5%; +width:95%; float:left; } @@ -803,6 +798,9 @@ float:left; width:100%; overflow:hidden; } +.notice .entry-title.ov { +overflow:visible; +} #shownotice .notice .entry-title { font-size:2.2em; } @@ -827,7 +825,7 @@ clear:left; float:left; font-size:0.95em; margin-left:59px; -width:65%; +width:60%; } #showstream .notice div.entry-content, #shownotice .notice div.entry-content { @@ -857,15 +855,26 @@ 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 { -padding-left:2%; -float:left; -width:50%; position:relative; font-size:0.95em; -width:12.5%; +width:90px; float:right; +margin-right:11px; } .notice-options a { @@ -1049,8 +1058,6 @@ margin-left:18px; } - - /* TOP_POSTERS */ .section tbody td { padding-right:18px; diff --git a/theme/base/css/facebookapp.css b/theme/base/css/facebookapp.css index 163b41fb4..e6b1c9ee5 100644 --- a/theme/base/css/facebookapp.css +++ b/theme/base/css/facebookapp.css @@ -1,6 +1,3 @@ -@import url("display.css"); -@import url("../../identica/css/display.css"); - * { font-size:14px; font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; diff --git a/theme/base/images/icons/clip-inline.png b/theme/base/images/icons/clip-inline.png Binary files differnew file mode 100644 index 000000000..870f8b2e8 --- /dev/null +++ b/theme/base/images/icons/clip-inline.png diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 16c9322a5..737db7ce9 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -193,7 +193,9 @@ background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-r } .notices div.entry-content, -.notices div.notice-options { +.notices div.notice-options, +.notices li.hover .notices div.entry-content, +.notices li.hover .notices div.notice-options { opacity:0.4; } .notices li.hover div.entry-content, @@ -212,16 +214,16 @@ background-color:#fcfcfc; } .notices .notices { -background-color:rgba(200, 200, 200, 0.025); +background-color:rgba(200, 200, 200, 0.050); } .notices .notices .notices { -background-color:rgba(200, 200, 200, 0.050); +background-color:rgba(200, 200, 200, 0.100); } .notices .notices .notices .notices { -background-color:rgba(200, 200, 200, 0.075); +background-color:rgba(200, 200, 200, 0.150); } .notices .notices .notices .notices .notices { -background-color:rgba(200, 200, 200, 0.100); +background-color:rgba(200, 200, 200, 0.300); } /*END: NOTICES */ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 2fb123a20..f7abac482 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -193,7 +193,9 @@ background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-r } .notices div.entry-content, -.notices div.notice-options { +.notices div.notice-options, +.notices li.hover .notices div.entry-content, +.notices li.hover .notices div.notice-options { opacity:0.4; } .notices li.hover div.entry-content, @@ -212,16 +214,16 @@ background-color:#fcfcfc; } .notices .notices { -background-color:rgba(200, 200, 200, 0.025); +background-color:rgba(200, 200, 200, 0.050); } .notices .notices .notices { -background-color:rgba(200, 200, 200, 0.050); +background-color:rgba(200, 200, 200, 0.100); } .notices .notices .notices .notices { -background-color:rgba(200, 200, 200, 0.075); +background-color:rgba(200, 200, 200, 0.150); } .notices .notices .notices .notices .notices { -background-color:rgba(200, 200, 200, 0.100); +background-color:rgba(200, 200, 200, 0.300); } /*END: NOTICES */ |