Skip to content

Commit

Permalink
improved popup triangles UI
Browse files Browse the repository at this point in the history
  • Loading branch information
llj committed Oct 22, 2014
1 parent f970ac5 commit 34c8299
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
22 changes: 9 additions & 13 deletions media/css/seahub.css
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,10 @@ textarea:-moz-placeholder {/* for FF */
.outer-caret,
.inner-caret {
height:0;
width:1px;
border:14px solid;
width:0;
border-width:14px 14px 0; /* default: arrow to the bottom */
border-style:dashed solid; /* 'dashed' for firefox */
border-color:#CBCBCB transparent;
border-bottom-width:0;
z-index:100;
margin:0 auto;
}
Expand All @@ -417,16 +417,16 @@ textarea:-moz-placeholder {/* for FF */
}
.up-outer-caret,
.up-outer-caret .inner-caret {
border-top-width:0;
border-bottom-width:14px;
border-width:0 10px 10px;
}
.up-outer-caret .inner-caret {
border-bottom-color:#fff;
top:1px;
left:-10px;
}
.up-outer-caret {
position:absolute;
top:-15px;
top:-11px;
}
/**** info-item *****/
.info-item {
Expand Down Expand Up @@ -1354,18 +1354,14 @@ textarea:-moz-placeholder {/* for FF */
font-size:14px;
}
#top-nav-grp-info .outer-caret {
left:39px;
left:38px;
}
#notice-popup .outer-caret {
left:138px;
}
#user-info-popup .outer-caret,
#user-info-popup .inner-caret {
border-bottom-width:10px;
left:143px;
}
#user-info-popup .outer-caret {
top:-10px;
left:178px;
left:181px;
}
.top-info-popup .item {
display:block;
Expand Down
3 changes: 2 additions & 1 deletion seahub/templates/snippets/bottom_bar.html
Original file line number Diff line number Diff line change
Expand Up @@ -146,5 +146,6 @@
$(function() {
var btn_height = $('#bottom-bar').outerHeight();
$('#discuss-to-group-caret, #to-group-caret').css({'bottom': btn_height});
$('#to-group, #discuss-to-group').css({'bottom': btn_height + $('.outer-caret').outerHeight()});
$('#to-group').css({'bottom': btn_height + $('#to-group-caret').outerHeight()});
$('#discuss-to-group').css({'bottom': btn_height + $('#discuss-to-group-caret').outerHeight()});
});

0 comments on commit 34c8299

Please sign in to comment.