From 2687f4377c301205afbbcf2034cbb1b9556e08e7 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 14 May 2012 19:29:06 -0400 Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: * master: From fca09c9d4c5e9577b38288aeecbdf6dceef70745 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 16 May 2012 01:58:55 -0400 Subject: [PATCH 2/2] slight re-design of wall stuff and css/font cleaning Signed-off-by: Simon L'nu --- view/theme/dispy/dark/style.css | 23 ++++----- view/theme/dispy/dark/style.less | 79 ++++++++++++++++++++---------- view/theme/dispy/light/style.css | 19 +++---- view/theme/dispy/light/style.less | 75 +++++++++++++++++++--------- view/theme/dispy/nav.tpl | 13 +++-- view/theme/dispy/wall_item.tpl | 14 ++++-- view/theme/dispy/wallwall_item.tpl | 14 ++++-- 7 files changed, 154 insertions(+), 83 deletions(-) diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 3a5e59fb3..60e7db6e1 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -55,7 +55,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;} -[class$="-desc"],[id$="-desc"]{color:#2e2f2e;background:#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,#profile-listing-desc{width:25%;height:auto;background:#555753;color:#eeeecc;border:2px outset #222321;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;font-size:smaller;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-size:smaller;font-weight:bold;} +[class$="-desc"],[id$="-desc"]{color:#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;} #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;} @@ -166,7 +168,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #profile-jot-net{margin:5px 0;} #jot-preview-link{margin:0 0 0 10px;border:0;text-decoration:none;float:right;} .icon-text-preview{margin:0 0 -18px 0;display:block;width:20px;height:20px;background:url(dark/icons.png) no-repeat -128px -40px;border:0;text-decoration:none;float:right;cursor:pointer;} -#profile-jot-perms{float:right;color:#555753;width:20px;height:20px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 5px 0 #111111;-o-box-shadow:3px 3px 5px 0 #111111;-webkit-box-shadow:3px 3px 5px 0 #111111;-ms-box-shadow:3px 3px 5px 0 #111111;box-shadow:3px 3px 5px 0 #111111;border:2px outset #eeeeee;overflow:hidden;margin:0 10px 0 10px;} +#profile-jot-perms{float:right;color:#555753;width:20px;height:20px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 5px 0 #111111;-o-box-shadow:3px 3px 5px 0 #111111;-webkit-box-shadow:3px 3px 5px 0 #111111;-ms-box-shadow:3px 3px 5px 0 #111111;box-shadow:3px 3px 5px 0 #111111;border:2px outset #555753;overflow:hidden;margin:0 10px 0 10px;} #profile-jot-plugin-wrapper{width:1px;margin:10px 0 0 0;float:right;} #profile-jot-submit-wrapper{float:right;width:100%;margin:10px 0 0 0;padding:0;} #profile-jot-submit{height:auto;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:2px outset #2e3436;margin:0;float:right;-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;width:auto;}#profile-jot-submit: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;} @@ -186,7 +188,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #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:#2e2f2e;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 a{border:0;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;} @@ -199,7 +201,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm [id^="tread-wrapper"],[class^="tread-wrapper"]{margin:1.2em 0 0 0;padding:0px;} .wall-item-photo-menu{display:none;} .wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(dark/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;width:90px;height:20px;top:85px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;} -.wall-item-info{float:left;width:110px;} +.wall-item-info{float:left;width:8em;} .wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} [class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{} .wall-item-tools{float:right;opacity:0.4;-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;}.wall-item-tools:hover{opacity:1;-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;} @@ -209,22 +211,22 @@ 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{clear:left;float:left;font-size:0.8em;color:#888b85;margin:1em auto 0 0.2em;} -.wall-item-ago{display:inline;padding-left:10px;} +.wall-item-author,.wall-item-actions-author,.wall-item-ago{clear:left;float:left;color:#eeeecc;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;} .wall-item-location>br{display:none;} .wallwall .wwto{left:5px;margin:0;position:absolute;top:75px;z-index:10001;width:30px;height:30px;}.wallwall .wwto img{width:30px !important;height:30px !important;} .wallwall .wall-item-photo-end{clear:both;} .wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;} -.wall-item-photo-menu{min-width:92px;border:2px solid #ffffff;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 2px;color:#eeeeee;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeee;} +.wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeee;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeee;} #item-delete-selected{overflow:auto;width:100%;} #connect-services-header,#connect-services,#extra-help-header,#extra-help,#postit-header,#postit{margin:5px 0 0 0;} .ccollapse-wrapper{font-size:0.9em;margin-left:5em;} +.hide-comments-outer{font-size:small;} .wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;} .wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;} .wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:50px;top:45px;background-position:35px center;} -.wall-item-outside-wrapper.comment .wall-item-info{width:60px;} .wall-item-outside-wrapper.comment .wall-item-body{margin-left:10px;} .wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;} .wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:50px;top:60px;} @@ -415,8 +417,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le #adminpage .toggleplugin{float:left;margin-right:1em;} #adminpage table{width:100%;border-bottom:1px solid #111111;margin:5px 0;}#adminpage table th{font-weight:bold;text-align:left;} #adminpage table td{padding:5px;vertical-align:middle;} -#adminpage table#users{padding:5px;} -#adminpage table#users img{width:16px;height:16px;} +#adminpage table#users{padding:5px;}#adminpage table#users img{width:16px;height:16px;} #adminpage table#users a{color:#eeeecc;text-decoration:underline;} #adminpage td .icon{float:left;} #adminpage .selectall{text-align:right;} @@ -513,7 +514,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le footer{display:block;clear:both;} #profile-jot-text{height:20px;color:#eeeecc;background:#2e2f2e;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;} #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eeeecc;} -#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;} +#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;font-size:small;} #acl-wrapper{width:660px;margin:0 auto;} #acl-search{float:right;background:#ffffff url("../../../images/search_18.png") no-repeat right center;padding-right:20px;margin:6px;color:#111111;} #acl-showall{float:left;display:block;width:auto;height:18px;background:#eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;padding:7px 10px 7px 30px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#999999;margin:5px 0;}#acl-showall.selected{color:black;background:#ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 3521b4398..7634db1d7 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -280,10 +280,30 @@ h6 { .box(100%, 100%); margin: 0 auto; } +.button, +#profile-listing-desc { + .box(25%, auto); + background: @menu_bg_colour; + color: @main_colour; + .borders(2px, outset, darken(@menu_bg_colour, 20%)); + .rounded_corners; + padding: 5px; + font-size: smaller; + cursor: pointer; + &.active { + .box_shadow(4px, 4px, 7px); + } + a { + color: @main_colour; + font-size: smaller; + font-weight: bold; + } +} [class$="-desc"], [id$="-desc"] { color: @bg_colour; - background: @main_colour; + // background: @main_colour; + .borders(1px, outset, @main_colour); .rounded_corners; // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; @@ -1074,7 +1094,7 @@ nav #nav-notifications-linkmenu { .box(20px, 20px); .rounded_corners; .box_shadow(3px, 3px, 5px, 0); - .borders(2px, outset, @main_alt_colour); + .borders(2px, outset, @menu_bg_colour); overflow: hidden; margin: 0 10px 0 10px; } @@ -1218,7 +1238,7 @@ nav #nav-notifications-linkmenu { .borders(1px, solid, @hover_colour); &:hover { background: @shiny_colour; - color: @bg_colour; + color: @main_colour; .borders(1px, solid, @hover_colour); } a { @@ -1287,7 +1307,7 @@ nav #nav-notifications-linkmenu { } .wall-item-info { float: left; - width: 110px; + width: 8em; } .wall-item-photo-wrapper { .box(80px, 80px); @@ -1352,16 +1372,21 @@ nav #nav-notifications-linkmenu { } } .wall-item-author, -.wall-item-actions-author { +.wall-item-actions-author, +.wall-item-ago { clear: left; float: left; - font-size: 0.8em; - color: lighten(@menu_bg_colour, 20%); - margin: 1em auto 0 0.2em; + color: @main_colour; + line-height: 1; + display: inline-block; + font-size: 0.75em; + margin: 0.5em auto 0; } -.wall-item-ago { - display: inline; - padding-left: 10px; +.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; @@ -1371,7 +1396,8 @@ nav #nav-notifications-linkmenu { .icon { float: left; } - > a, .smalltext { + > a, + .smalltext { margin-left: 25px; font-size: 0.7em; display: block; @@ -1405,7 +1431,8 @@ nav #nav-notifications-linkmenu { } .wall-item-photo-menu { min-width: 92px; - .borders(2px, solid, white); + font-size: 0.75em; + .borders(2px, solid, @menu_bg_colour); border-top: 0px; background: @menu_bg_colour; position: absolute; @@ -1417,7 +1444,7 @@ nav #nav-notifications-linkmenu { li a { white-space: nowrap; display: block; - padding: 5px 2px; + padding: 5px 6px; color: @main_alt_colour; &:hover { color: @menu_bg_colour; @@ -1446,6 +1473,9 @@ nav #nav-notifications-linkmenu { font-size: 0.9em; margin-left: 5em; } +.hide-comments-outer { + font-size: small; +} .wall-item-outside-wrapper.comment { margin-left: 5em; .wall-item-photo { @@ -1460,9 +1490,6 @@ nav #nav-notifications-linkmenu { top: 45px; background-position: 35px center; } - .wall-item-info { - width: 60px; - } .wall-item-body { margin-left: 10px; } @@ -2455,13 +2482,13 @@ div { } &#users { padding: 5px; - } - &#users img { - .box(16px, 16px); - } - &#users a { - color: @main_colour; - text-decoration: underline; + img { + .box(16px, 16px); + } + a { + color: @main_colour; + text-decoration: underline; + } } } td .icon { @@ -2584,7 +2611,8 @@ div { background-color: @link_colour; color: @bg_colour; } -.grey, .gray { +.grey, +.gray { color: gray; } .orange { @@ -2938,6 +2966,7 @@ footer { margin: 0 10px; .borders(1px, solid, @menu_bg_colour); border-top: 0; + font-size: small; // .box_shadow; } #acl-wrapper { diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index e1bbdd09a..e89ee7d24 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -55,7 +55,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;} -[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;-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,#profile-listing-desc{width:25%;height:auto;background:#555753;color:#eeeeec;border:2px outset #222321;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;font-size:smaller;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-size:smaller;font-weight:bold;} +[class$="-desc"],[id$="-desc"]{color:#eeeeec;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;} @@ -199,7 +201,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm [id^="tread-wrapper"],[class^="tread-wrapper"]{margin:1.2em 0 0 0;padding:0px;} .wall-item-photo-menu{display:none;} .wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(light/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;width:90px;height:20px;top:85px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;} -.wall-item-info{float:left;width:110px;} +.wall-item-info{float:left;width:8em;} .wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} [class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{} .wall-item-tools{float:right;opacity:0.4;-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;}.wall-item-tools:hover{opacity:1;-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;} @@ -209,22 +211,22 @@ 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{clear:left;float:left;font-size:0.8em;color:#888b85;margin:1em auto 0 0.2em;} -.wall-item-ago{display:inline;padding-left:10px;} +.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{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;} .wall-item-location>br{display:none;} .wallwall .wwto{left:5px;margin:0;position:absolute;top:75px;z-index:10001;width:30px;height:30px;}.wallwall .wwto img{width:30px !important;height:30px !important;} .wallwall .wall-item-photo-end{clear:both;} .wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;} -.wall-item-photo-menu{min-width:92px;border:2px solid #ffffff;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 2px;color:#eeeeec;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeec;} +.wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeec;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeec;} #item-delete-selected{overflow:auto;width:100%;} #connect-services-header,#connect-services,#extra-help-header,#extra-help,#postit-header,#postit{margin:5px 0 0 0;} .ccollapse-wrapper{font-size:0.9em;margin-left:5em;} +.hide-comments-outer{font-size:small;} .wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;} .wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;} .wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:50px;top:45px;background-position:35px center;} -.wall-item-outside-wrapper.comment .wall-item-info{width:60px;} .wall-item-outside-wrapper.comment .wall-item-body{margin-left:10px;} .wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;} .wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:50px;top:60px;} @@ -415,8 +417,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le #adminpage .toggleplugin{float:left;margin-right:1em;} #adminpage table{width:100%;border-bottom:1px solid #111111;margin:5px 0;}#adminpage table th{font-weight:bold;text-align:left;} #adminpage table td{padding:5px;vertical-align:middle;} -#adminpage table#users{padding:5px;} -#adminpage table#users img{width:16px;height:16px;} +#adminpage table#users{padding:5px;}#adminpage table#users img{width:16px;height:16px;} #adminpage table#users a{color:#111111;text-decoration:underline;} #adminpage td .icon{float:left;} #adminpage .selectall{text-align:right;} @@ -513,7 +514,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le footer{display:block;clear:both;} #profile-jot-text{height:20px;color:#666666;background:#cccccc;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;} #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#eeeeec;color:#111111;} -#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;} +#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;font-size:small;} #acl-wrapper{width:660px;margin:0 auto;} #acl-search{float:right;background:#ffffff url("../../../images/search_18.png") no-repeat right center;padding-right:20px;margin:6px;color:#111111;} #acl-showall{float:left;display:block;width:auto;height:18px;background:#eeeeec url("../../../images/show_all_off.png") 8px 8px no-repeat;padding:7px 10px 7px 30px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#999999;margin:5px 0;}#acl-showall.selected{color:black;background:#ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 176f3ba6a..51ffbd1f2 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -281,10 +281,30 @@ h6 { .box(100%, 100%); margin: 0 auto; } +.button, +#profile-listing-desc { + .box(25%, auto); + background: @menu_bg_colour; + color: @bg_colour; + .borders(2px, outset, darken(@menu_bg_colour, 20%)); + .rounded_corners; + padding: 5px; + font-size: smaller; + cursor: pointer; + &.active { + .box_shadow(4px, 4px, 7px); + } + a { + color: @bg_colour; + font-size: smaller; + font-weight: bold; + } +} [class$="-desc"], [id$="-desc"] { color: @bg_colour; - background: @dk_bg_colour; + // background: @main_colour; + .borders(1px, outset, @bg_colour); .rounded_corners; // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; @@ -1288,7 +1308,7 @@ nav #nav-notifications-linkmenu { } .wall-item-info { float: left; - width: 110px; + width: 8em; } .wall-item-photo-wrapper { .box(80px, 80px); @@ -1353,16 +1373,21 @@ nav #nav-notifications-linkmenu { } } .wall-item-author, -.wall-item-actions-author { +.wall-item-actions-author, +.wall-item-ago { clear: left; float: left; - font-size: 0.8em; - color: lighten(@menu_bg_colour, 20%); - margin: 1em auto 0 0.2em; + color: @bg_colour; + line-height: 1; + display: inline-block; + font-size: 0.75em; + margin: 0.5em auto 0; } -.wall-item-ago { - display: inline; - padding-left: 10px; +.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; @@ -1372,7 +1397,8 @@ nav #nav-notifications-linkmenu { .icon { float: left; } - > a, .smalltext { + > a, + .smalltext { margin-left: 25px; font-size: 0.7em; display: block; @@ -1406,7 +1432,8 @@ nav #nav-notifications-linkmenu { } .wall-item-photo-menu { min-width: 92px; - .borders(2px, solid, white); + font-size: 0.75em; + .borders(2px, solid, @menu_bg_colour); border-top: 0px; background: @menu_bg_colour; position: absolute; @@ -1418,7 +1445,7 @@ nav #nav-notifications-linkmenu { li a { white-space: nowrap; display: block; - padding: 5px 2px; + padding: 5px 6px; color: @bg_colour; &:hover { color: @menu_bg_colour; @@ -1447,6 +1474,9 @@ nav #nav-notifications-linkmenu { font-size: 0.9em; margin-left: 5em; } +.hide-comments-outer { + font-size: small; +} .wall-item-outside-wrapper.comment { margin-left: 5em; .wall-item-photo { @@ -1461,9 +1491,6 @@ nav #nav-notifications-linkmenu { top: 45px; background-position: 35px center; } - .wall-item-info { - width: 60px; - } .wall-item-body { margin-left: 10px; } @@ -2456,13 +2483,13 @@ div { } &#users { padding: 5px; - } - &#users img { - .box(16px, 16px); - } - &#users a { - color: @main_colour; - text-decoration: underline; + img { + .box(16px, 16px); + } + a { + color: @main_colour; + text-decoration: underline; + } } } td .icon { @@ -2585,7 +2612,8 @@ div { background-color: @link_colour; color: @bg_colour; } -.grey, .gray { +.grey, +.gray { color: gray; } .orange { @@ -2939,6 +2967,7 @@ footer { margin: 0 10px; .borders(1px, solid, @menu_bg_colour); border-top: 0; + font-size: small; // .box_shadow; } #acl-wrapper { diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index af91d101f..21343aea5 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -50,7 +50,7 @@
- $sitelocation + $sitelocation
    @@ -90,7 +90,9 @@ {{ if $userinfo }} {{ endif }} @@ -121,8 +123,7 @@ $langselector
@@ -133,6 +134,8 @@ $langselector diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 35e65f397..d2878d17d 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -13,7 +13,15 @@
-
{{ if $item.location }}$item.location {{ endif }}
+
+ {{ if $item.location }}$item.location {{ endif }} +
+
+ $item.name +
+
+ $item.ago +
@@ -67,10 +75,6 @@
-
- $item.name -
$item.ago
-
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index e8cbc2cd4..2705d3e68 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -18,7 +18,15 @@
-
{{ if $item.location }}$item.location {{ endif }}
+
+ {{ if $item.location }}$item.location {{ endif }} +
+
+ $item.name +
+
+ $item.ago +
@@ -73,10 +81,6 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
-
- $item.name -
$item.ago
-