some cleanup - Thomas we can put the radius/shadow stuff back later for the hipster kids, it's quite distracting at the moment and makes it hard to get serious work done. Hmmm. Wonder if we could make radius/shadow configurable like colours.... and maybe even screen transparency.... that could be interesting.
This commit is contained in:
friendica
parent
5d008a6923
commit
fa8b4e98b7
@ -703,6 +703,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
|
||||
'$mode' => $mode,
|
||||
'$user' => $a->user,
|
||||
'$threads' => $threads,
|
||||
'$wait' => t('Loading...'),
|
||||
'$dropping' => ($page_dropping?t('Delete Selected Items'):False),
|
||||
));
|
||||
|
||||
|
||||
@ -462,7 +462,7 @@ function updateConvItems(mode,data) {
|
||||
}
|
||||
|
||||
if(page_load)
|
||||
$("#profile-jot-text-loading").show();
|
||||
$("#page-spinner").show();
|
||||
|
||||
$.get(update_url,function(data) {
|
||||
var update_mode = ((page_load) ? 'replace' : 'update');
|
||||
@ -472,7 +472,7 @@ function updateConvItems(mode,data) {
|
||||
scroll_next = false;
|
||||
in_progress = false;
|
||||
updateConvItems(update_mode,data);
|
||||
$("#profile-jot-text-loading").hide();
|
||||
$("#page-spinner").hide();
|
||||
});
|
||||
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
2012-12-15.170
|
||||
2012-12-16.171
|
||||
|
||||
@ -22,9 +22,9 @@ abbr {
|
||||
/*Should we be doing this here, or should we be changing default.css? */
|
||||
|
||||
aside {
|
||||
box-shadow: 3px 3px 3px #ccc;
|
||||
/*box-shadow: 3px 3px 3px #ccc;*/
|
||||
border: none;
|
||||
border-radius: 0px 0px 20px 0px;
|
||||
/*border-radius: 0px 0px 20px 0px;*/
|
||||
width: 210px;
|
||||
color: #d00;
|
||||
}
|
||||
@ -347,8 +347,8 @@ div.wall-item-content-wrapper.shiny {
|
||||
margin-bottom: 5px;
|
||||
font-weight: bold;
|
||||
border: solid 1px #ccc;
|
||||
box-shadow: 5px 5px 5px #666 inset;
|
||||
border-radius: 20px;
|
||||
/* box-shadow: 5px 5px 5px #666 inset; */
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
#jot-title::-webkit-input-placeholder{font-weight: normal;}
|
||||
@ -965,8 +965,8 @@ input#dfrn-url {
|
||||
margin-top: 30px;
|
||||
position: relative;
|
||||
background: #fff;
|
||||
border-radius: 20px;
|
||||
box-shadow: 12px 12px 12px #111;
|
||||
border-radius: 5px;
|
||||
/* box-shadow: 12px 12px 12px #111; */
|
||||
border: 1px solid #eec;
|
||||
|
||||
}
|
||||
@ -974,7 +974,7 @@ input#dfrn-url {
|
||||
background: #fff;
|
||||
border-left: 1px solid #e0e0e0;
|
||||
margin-left: 50px;
|
||||
box-shadow: 5px 5px 5px #222;
|
||||
/* box-shadow: 5px 5px 5px #222; */
|
||||
}
|
||||
|
||||
.thread-end-wrapper {
|
||||
@ -1144,7 +1144,7 @@ input#dfrn-url {
|
||||
.wall-item-content img {
|
||||
max-height: 95% !important;
|
||||
max-width: 95% !important;
|
||||
box-shadow: 8px 8px 8px #666;
|
||||
/* box-shadow: 8px 8px 8px #666; can't really have this because of smileys */
|
||||
}
|
||||
|
||||
.wall-item-content img.smiley {
|
||||
@ -1174,12 +1174,12 @@ width: 90%;
|
||||
.wall-item-tools {
|
||||
clear: both;
|
||||
/* background-image: url("../img/head.jpg"); */
|
||||
background-position: 0 -20px;
|
||||
/* background-position: 0 -20px;
|
||||
background-repeat: repeat-x;
|
||||
background: #eee;
|
||||
padding: 5px 10px;
|
||||
border-radius: 0px 0px 20px 20px;
|
||||
border: 1px #eec solid;
|
||||
border: 1px #eec solid; */
|
||||
}
|
||||
|
||||
.wall-item-like {
|
||||
@ -1221,7 +1221,7 @@ margin: 15px;
|
||||
border: 1px solid #ccc;
|
||||
padding: 8px;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
box-shadow: 5px 5px 5px #666 inset;
|
||||
/* box-shadow: 5px 5px 5px #666 inset; */
|
||||
}
|
||||
|
||||
.comment-edit-text-empty {
|
||||
@ -1693,8 +1693,8 @@ tr.mceLast {
|
||||
padding: 8px;
|
||||
width: 90%;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 20px;
|
||||
box-shadow: 4px 4px 3px 0 #666 inset;
|
||||
border-radius: 5px;
|
||||
/* box-shadow: 4px 4px 3px 0 #666 inset; */
|
||||
}
|
||||
#profile-jot-text:hover {
|
||||
color: #000000;
|
||||
@ -2044,6 +2044,19 @@ aside input[type='text'] {
|
||||
/* cursor: pointer !important; */
|
||||
}
|
||||
|
||||
#vcard-end {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#contact-block {
|
||||
margin-top: 25px;
|
||||
}
|
||||
|
||||
#contact-block-numcontacts {
|
||||
font-weight: bold;
|
||||
margin-bottom:8px;
|
||||
}
|
||||
|
||||
.contact-block-div {
|
||||
float: left;
|
||||
width: 52px;
|
||||
@ -2727,7 +2740,7 @@ brain is weird like that */
|
||||
|
||||
.tools { background-position: 0px -32px;}
|
||||
.lock { background-position: -16px -32px;}
|
||||
.unlock { background: url(../img/jotperms.png) no-repeat;}
|
||||
.unlock { background-position: -32px -32px; }
|
||||
.video { background-position: -48px -32px;}
|
||||
.youtube { background-position: -64px -32px;}
|
||||
.attach { background-position: -80px -32px; }
|
||||
@ -3034,7 +3047,7 @@ nav .nav-menu {
|
||||
padding: 5px;
|
||||
margin: 3px 15px 0px;
|
||||
font-size: 14px;
|
||||
border-bottom: 3px solid #d00;
|
||||
border-bottom: 3px solid #ff0000;
|
||||
}
|
||||
nav .nav-menu.selected {
|
||||
border-bottom: 4px solid #CCCCCC;
|
||||
@ -3212,3 +3225,6 @@ ul.menu-popup {
|
||||
background: #DDDDDD;
|
||||
}
|
||||
|
||||
#page-spinner {
|
||||
margin-left: 50%;
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
<div id="contact-block">
|
||||
<h4 class="contact-block-h4">$contacts</h4>
|
||||
<div id="contact-block-numcontacts">$contacts</div>
|
||||
{{ if $micropro }}
|
||||
<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
|
||||
<div class='contact-block-content'>
|
||||
|
||||
@ -9,3 +9,6 @@
|
||||
</div>
|
||||
<div id="item-delete-selected-end"></div>
|
||||
{{ endif }}
|
||||
|
||||
<img id="page-spinner" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
|
||||
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div id="vcard-end"></div>
|
||||
$contact_block
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user