wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

design consistency

Browse Source
This commit is contained in:
Hannes Mannerheim 2014-11-26 01:51:07 +01:00
parent e442a6d67d
commit 46bf7bf232
3 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/qvitter.php
View File

@ -234,7 +234,7 @@ class QvitterAction extends ApiAction
.queet-box-syntax[contenteditable="true"], .queet-box-syntax[contenteditable="true"],
.inline-reply-queetbox, .inline-reply-queetbox,
span.inline-reply-caret, span.inline-reply-caret,
.stream-item.expanded > .queet + .stream-item.conversation:not(.hidden-conversation), .stream-item.expanded .stream-item.first-visible-after-parent,
#popup-faq #faq-container p.indent { #popup-faq #faq-container p.indent {
border-color:rgb(155,206,224);/*LIGHTERBORDERCOLOREND*/ border-color:rgb(155,206,224);/*LIGHTERBORDERCOLOREND*/
} }

70
css/qvitter.css
View File

@ -505,7 +505,7 @@ body.rtl .front-welcome-text {
#federated-tooltip #what-is-federation { #federated-tooltip #what-is-federation {
background-color: rgba(255, 255, 255, 0.95); background-color: rgba(255, 255, 255, 0.95);
border: 1px solid #333333; border: 1px solid #333333;
border-radius: 5px 5px 5px 5px; border-radius: 6px 6px 6px 6px;
color: #333333; color: #333333;
display: none; display: none;
font-size: 17px; font-size: 17px;
@ -973,7 +973,7 @@ button#submit-login:hover {
border: 1px solid rgba(0, 0, 0, 0.1); border: 1px solid rgba(0, 0, 0, 0.1);
text-shadow: 0 1px 0 #FFFFFF; text-shadow: 0 1px 0 #FFFFFF;
background-clip: padding-box; background-clip: padding-box;
border-radius: 6px 6px 6px 6px; border-radius: 6px;
line-height: 16px; line-height: 16px;
margin-bottom: 10px; margin-bottom: 10px;
overflow:hidden; overflow:hidden;
@ -1170,8 +1170,8 @@ button#submit-login:hover {
border-bottom-width: 1px; border-bottom-width: 1px;
border-bottom-color: #E8E8E8; border-bottom-color: #E8E8E8;
border-bottom-style: solid; border-bottom-style: solid;
border-top-left-radius: 5px; border-top-left-radius: 6px;
border-top-right-radius: 5px; border-top-right-radius: 6px;
border-bottom-left-radius: 0px; border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px; border-bottom-right-radius: 0px;
min-height: 20px; min-height: 20px;
@ -1277,13 +1277,15 @@ button#submit-login:hover {
.stream-item.hidden { .stream-item.hidden {
display:none; display:none;
} }
.stream-item > div.last-visible, .stream-item.expanded > div.last-visible,
.stream-item > div.last-visible .queet { .stream-item.expanded > div.last-visible .queet,
border-radius: 0 0 5px 5px; .stream-item.expanded > div.last-visible .inline-reply-queetbox {
border-radius: 0 0 6px 6px;
} }
.stream-item.conversation { .stream-item.conversation {
background-color:#F6F6F6; background-color:#F6F6F6;
border:0 none; border:0 none;
border-top:1px solid #F6F6F6;
opacity:0.5; opacity:0.5;
-webkit-transition: all 0.5s ease; -webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease; -moz-transition: all 0.5s ease;
@ -1312,7 +1314,7 @@ button#submit-login:hover {
margin-top:-5px; margin-top:-5px;
width:10px; width:10px;
height:10px; height:10px;
border-radius:5px; border-radius:6px;
z-index:10; z-index:10;
} }
@ -1439,15 +1441,12 @@ background-repeat: no-repeat;
transition: margin-top 5s linear; transition: margin-top 5s linear;
} }
.stream-item.expanded .queet:hover {
background-color:#fff;
}
.stream-item.expanded .stream-item:last-child .queet { .stream-item.expanded .stream-item:last-child .queet {
border-bottom:0 none; border-bottom:0 none;
} }
.stream-item.expanded > div:last-child, .stream-item.expanded:not(.conversation) > div:last-child,
.stream-item.expanded > div:last-child .inline-reply-queetbox, .stream-item.expanded:not(.conversation) > div:last-child .inline-reply-queetbox,
.stream-item.expanded > div:last-child .queet { .stream-item.expanded:not(.conversation) > div:last-child .queet {
border-radius:0 0 6px 6px; border-radius:0 0 6px 6px;
} }
@ -1672,7 +1671,7 @@ body.rtl .view-more-container-bottom { direction:rtl; }
margin-top: 3px; margin-top: 3px;
left:12px; left:12px;
border:0 none; border:0 none;
border-radius: 5px; border-radius: 6px;
position:absolute; position:absolute;
cursor: pointer; cursor: pointer;
list-style-image: none; list-style-image: none;
@ -1689,7 +1688,7 @@ body.rtl .view-more-container-bottom { direction:rtl; }
left:12px; left:12px;
border:1px solid rgba(0, 0, 0, 0.1); border:1px solid rgba(0, 0, 0, 0.1);
box-sizing:border-box; box-sizing:border-box;
border-radius: 5px; border-radius: 6px;
} }
.modal-container .modal-body .stream-item-header .avatar { .modal-container .modal-body .stream-item-header .avatar {
left:10px; left:10px;
@ -2092,9 +2091,9 @@ ul.queet-actions li .icon.sm-fav:before {
background-position: 5px -218px; background-position: 5px -218px;
} }
.stream-item.expanded { .stream-item.expanded:not(.conversation) {
border: 1px solid rgba(0, 0, 0, 0.1); border: 1px solid rgba(0, 0, 0, 0.1);
border-radius: 6px 6px 6px 6px; border-radius: 6px;
margin:8px 0; margin:8px 0;
} }
.stream-item.expanded > .queet > .attachments{ .stream-item.expanded > .queet > .attachments{
@ -2105,8 +2104,9 @@ ul.queet-actions li .icon.sm-fav:before {
} }
.stream-item.expanded .stream-item.expanded { .stream-item.expanded .stream-item.expanded {
margin:0 0; margin:0 0;
border:0 none; border-bottom:0 none;
border-radius: 0 0 0 0; border-left:0 none;
border-right:0 none;
} }
.stream-item .media { .stream-item .media {
@ -2254,7 +2254,7 @@ ul.stats .avatar-row .avatar {
background-color:transparent; background-color:transparent;
border-top:1px solid #DDDDDD; border-top:1px solid #DDDDDD;
} }
.stream-item.expanded > .queet + .stream-item.conversation:not(.hidden-conversation) { .stream-item.expanded .stream-item.first-visible-after-parent {
border-top:1px solid #DDDDDD; border-top:1px solid #DDDDDD;
} }
@ -2354,8 +2354,8 @@ span.inline-reply-caret .caret-inner {
} }
#user-header { #user-header {
border-top-left-radius: 5px; border-top-left-radius: 6px;
border-top-right-radius: 5px; border-top-right-radius: 6px;
line-height: 16px; line-height: 16px;
padding: 12px; padding: 12px;
cursor: pointer; cursor: pointer;
@ -2545,8 +2545,8 @@ span.inline-reply-caret .caret-inner {
background-color:#fff; background-color:#fff;
border-top-left-radius: 0px; border-top-left-radius: 0px;
border-top-right-radius: 0px; border-top-right-radius: 0px;
border-bottom-left-radius: 5px; border-bottom-left-radius: 6px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 6px;
text-shadow: #FFFFFF 0px 1px 0px; text-shadow: #FFFFFF 0px 1px 0px;
position:relative; position:relative;
} }
@ -2561,7 +2561,7 @@ span.inline-reply-caret .caret-inner {
padding-bottom: 10px; padding-bottom: 10px;
padding-left: 12px; padding-left: 12px;
position:relative; position:relative;
border-radius: 0 0 5px 5px; border-radius: 0 0 6px 6px;
} }
#user-footer-inner img, #user-footer-inner img,
.inline-reply-queetbox img { .inline-reply-queetbox img {
@ -2710,10 +2710,10 @@ div.syntax-middle {
z-index: 100; z-index: 100;
display:none; display:none;
box-shadow:0 1px 4px rgba(0, 0, 0, 0.35); box-shadow:0 1px 4px rgba(0, 0, 0, 0.35);
border-radius: 0 0 5px 5px; border-radius: 0 0 6px 6px;
} }
.mentions-suggestions div:last-child { .mentions-suggestions div:last-child {
border-radius: 0 0 5px 5px; border-radius: 0 0 6px 6px;
} }
.mentions-suggestions div { .mentions-suggestions div {
@ -2871,7 +2871,7 @@ div.nav-session {
.profile-card { .profile-card {
background-clip: padding-box; background-clip: padding-box;
border-radius: 6px 6px 6px 6px; border-radius: 6px;
line-height: 16px; line-height: 16px;
margin-bottom: 10px; margin-bottom: 10px;
border: 1px solid rgba(0, 0, 0, 0.1); border: 1px solid rgba(0, 0, 0, 0.1);
@ -2888,8 +2888,8 @@ div.nav-session {
.profile-header-inner { .profile-header-inner {
text-shadow: 0 1px 0 #FFFFFF; text-shadow: 0 1px 0 #FFFFFF;
line-height: 16px; line-height: 16px;
border-top-left-radius: 5px; border-top-left-radius: 6px;
border-top-right-radius: 5px; border-top-right-radius: 6px;
background-color: #444444; background-color: #444444;
background-repeat: no-repeat; background-repeat: no-repeat;
box-shadow: 0 -1px 0 rgba(0, 0, 0, 0.1) inset; box-shadow: 0 -1px 0 rgba(0, 0, 0, 0.1) inset;
@ -2918,7 +2918,7 @@ div.nav-session {
outline: 0 none; outline: 0 none;
background-color: #FFFFFF; background-color: #FFFFFF;
border: 4px solid #FFFFFF; border: 4px solid #FFFFFF;
border-radius: 5px 5px 5px 5px; border-radius: 6px 6px 6px 6px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
display: block; display: block;
height: 73px; height: 73px;
@ -3023,8 +3023,8 @@ div.nav-session {
background-color: #FFFFFF; background-color: #FFFFFF;
line-height: 16px; line-height: 16px;
text-shadow: 0 1px 0 #FFFFFF; text-shadow: 0 1px 0 #FFFFFF;
border-bottom-left-radius: 5px; border-bottom-left-radius: 6px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 6px;
} }
.profile-banner-footer ul.stats { .profile-banner-footer ul.stats {
border-bottom: 0 none; border-bottom: 0 none;
@ -3439,7 +3439,7 @@ background:rgba(0,0,0,0.2);
.modal-content { .modal-content {
background-clip: padding-box; background-clip: padding-box;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 6px 6px 6px 6px; border-radius: 6px;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.4), 0 1px 0 rgba(255, 255, 255, 0.5) inset; box-shadow: 0 4px 12px rgba(0, 0, 0, 0.4), 0 1px 0 rgba(255, 255, 255, 0.5) inset;
position: relative; position: relative;
overflow:hidden; overflow:hidden;

2
js/dom-functions.js
View File

@ -1366,7 +1366,9 @@ function showConversation(qid) {
· · · · · · · · · · · · · */ · · · · · · · · · · · · · */
function findAndMarkLastVisibleInConversation(streamItem) { function findAndMarkLastVisibleInConversation(streamItem) {
streamItem.children().removeClass('last-visible'); streamItem.children().removeClass('last-visible');
streamItem.children().removeClass('first-visible-after-parent');
streamItem.children().not('.hidden-conversation').last().addClass('last-visible'); streamItem.children().not('.hidden-conversation').last().addClass('last-visible');
streamItem.children('.queet').nextAll().not('.hidden-conversation').first().addClass('first-visible-after-parent');
} }