diff options
author | friendica <info@friendica.com> | 2012-06-25 16:05:42 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-06-25 16:05:42 -0700 |
commit | fad2679c7e2ac32027ffd42064213ab48762dda2 (patch) | |
tree | 05e9ef81c479ccd5cc3973412d00e5cad03c806e /view/theme/dispy/light | |
parent | b044cd922d389b5bb9367ce1004d00a711562cf9 (diff) | |
parent | c291581e13c139fd7575cc7425ac8495dfc5b866 (diff) | |
download | volse-hubzilla-fad2679c7e2ac32027ffd42064213ab48762dda2.tar.gz volse-hubzilla-fad2679c7e2ac32027ffd42064213ab48762dda2.tar.bz2 volse-hubzilla-fad2679c7e2ac32027ffd42064213ab48762dda2.zip |
Merge https://github.com/friendica/friendica into pull
Conflicts:
include/bbcode.php
Diffstat (limited to 'view/theme/dispy/light')
-rw-r--r-- | view/theme/dispy/light/style.css | 2 | ||||
-rw-r--r-- | view/theme/dispy/light/style.less | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 793feb6fc..3d44cc8c4 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -214,7 +214,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-subtools1{width:30px;height:30px;list-style:none outside none;margin:18px 0 30px -20px;padding:0;} .wall-item-subtools2{width:25px;height:25px;list-style:none outside none;margin:-78px 0 0 5px;padding:0;} .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-body{margin:1em;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:#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{color:#111111;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 13f296d22..c5641605e 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -1430,7 +1430,7 @@ nav #nav-notifications-linkmenu { margin-bottom: 1.4em; } .wall-item-body { - margin: 15px 10px 10px 0px; + margin: 1em; text-align: left; overflow-x: auto; } |