harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2013-09-05 19:31:46 -07:00
commit f880118558
3 changed files with 19 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
view/css/default.css
View File

@ -1,7 +1,10 @@
nav { nav {
height: 94px; height: 24px;
display: block; display: block;
position: fixed;
width: 100%;
z-index: 100;
} }
aside { aside {

279
view/theme/redbasic/css/style.css
View File

@ -22,11 +22,6 @@ abbr {
border-bottom: none; border-bottom: none;
} }
aside {
border: none;
color: #444444;
}
/* icons */ /* icons */
.icon { .icon {
background-color: transparent ; background-color: transparent ;
@ -39,67 +34,6 @@ color: #444444;
.icon.text { .icon.text {
text-indent: 0px; text-indent: 0px;
} }
.icon.notify {
background-image: url("../img/notify_on.png");
min-width: 22px;
height: 22px;
margin-top: -4px;
background-position: left center;
padding: 1px;
}
.icon.gear {
background-image: url("../img/settings.png");
min-width: 22px;
height: 22px;
margin-top: -2px;
background-position: left center;
padding: 1px;
}
.icon.home {
background-image: url("../img/home.png");
min-width: 22px;
height: 22px;
margin-top: -4px;
background-position: left center;
padding: 1px;
}
.icon.network {
background-image: url("../img/network.png");
min-width: 22px;
height: 22px;
margin-top: -3px;
background-position: left center;
padding: 1px;
}
.icon.introductions {
background-image: url("../img/introductions.png");
min-width: 22px;
height: 22px;
margin-top: -4px;
background-position: left center;
padding: 1px;
}
.icon.mail {
background-image: url("../img/message.png");
min-width: 22px;
height: 22px;
margin-top: -2px;
background-position: left center;
padding: 1px;
}
.icon.events {
background-image: url("../img/events.png");
min-width: 22px;
height: 22px;
margin-top: -4px;
background-position: left center;
padding: 1px;
}
a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
font-weight: bold; font-weight: bold;
@ -120,8 +54,6 @@ input {
padding: 3px; padding: 3px;
} }
img { border :0px; }
code { code {
font-family: Courier, monospace; font-family: Courier, monospace;
@ -167,13 +99,6 @@ blockquote {
/* nav */
nav {
display: block;
}
#langselector { #langselector {
position: fixed; position: fixed;
top: 3px; top: 3px;
@ -304,19 +229,16 @@ nav #nav-link-wrapper .nav-link {
border-bottom: 1px solid #aaaaaa; border-bottom: 1px solid #aaaaaa;
padding:0px; padding:0px;
width: 90%; width: 90%;
/* margin-right: 5px; */
} }
.tabs li { margin: 0px; list-style: none; } .tabs li { margin: 0px; list-style: none; }
.tab { .tab {
display:block; display:block;
float:left; float:left;
/* padding: 0.4em; */
margin-right: 15px ; margin-right: 15px ;
} }
.tab.active { .tab.active {
/* font-weight: bold; */
color: #444444; color: #444444;
} }
@ -338,15 +260,6 @@ footer {
padding-right: 3em; padding-right: 3em;
} }
#powered-by {
position: fixed;
bottom: 1px;
left: 15px;
opacity: 0.3;
filter:alpha(opacity=30);
}
.birthday-today, .event-today { .birthday-today, .event-today {
font-weight: bold; font-weight: bold;
} }
@ -513,7 +426,6 @@ footer {
margin-left: 100px; margin-left: 100px;
margin-top: 10px; margin-top: 10px;
/* margin-left: 200px; */
} }
@ -884,40 +796,16 @@ footer {
margin-bottom: 15px; margin-bottom: 15px;
} }
#network-star-link{
margin-top: 10px;
}
.network-star {
float: left;
margin-right: 5px;
}
#network-bmark-link {
margin-top: 10px;
}
.thread-wrapper .wall-item-comment-wrapper { .thread-wrapper .wall-item-comment-wrapper, .wall-item-content-wrapper.comment {
margin-left: 50px; margin-left: 50px;
} }
/* Give the top level post bigger shadows than the comments. This makes them appear "higher" and the comments "lower", which separates posts from each other reasonably without literally drawing a line under it */
.wall-item-content-wrapper { .wall-item-content-wrapper {
margin-top: 10px; margin-top: 10px;
position: relative; position: relative;
border-radius: $radiuspx; border-radius: $radiuspx;
border: 1px solid #eec; border: 1px solid #eec;
/* background: #fff; */
/* border-radius: 5px; */
/* box-shadow: 12px 12px 12px #111; */
/* border-left: 1px solid #eec; */
}
.wall-item-content-wrapper.comment {
/* background: #fff; */
/* border-left: 1px solid #e0e0e0; */
margin-left: 50px;
/* box-shadow: 5px 5px 5px #222; */
} }
.thread-end-wrapper { .thread-end-wrapper {
@ -925,12 +813,6 @@ footer {
} }
.wall-item-content-wrapper.comment {
/* background: #ffffff;
border-left: 1px solid #e0e0e0;
*/
}
.wall-item-like.comment, .wall-item-dislike.comment { .wall-item-like.comment, .wall-item-dislike.comment {
margin-left: 50px; margin-left: 50px;
} }
@ -1006,14 +888,9 @@ footer {
z-index: 99; z-index: 99;
} }
.wall-item-wrapper { .wall-item-wrapper {
/*float: left;
margin-right: 5px;
width: 250px;*/
margin-left:10px; margin-left:10px;
} }
.wall-item-lock { .wall-item-lock {
/*height: 20px;*/
/*margin-top: 10px;*/
left: 105px; left: 105px;
position: absolute; position: absolute;
top: 1px; top: 1px;
@ -1065,11 +942,7 @@ footer {
.wall-item-wrapper-end { .wall-item-wrapper-end {
clear: both; clear: both;
} }
.wall-item-name-link {
font-weight: bold;
text-decoration: none;
color: #3172BD;
}
.wall-item-photo { .wall-item-photo {
border: none; border: none;
} }
@ -1084,16 +957,11 @@ footer {
.wall-item-content img { .wall-item-content img {
max-width: 95% !important; max-width: 95% !important;
/* box-shadow: 8px 8px 8px #666; can't really have this because of smileys */
} }
.wall-item-content img.smiley {
box-shadow: none;
}
.wall-item-title { .wall-item-title {
float: left; float: left;
font-weight: bold; font-weight: bold;
/*width: 450px;*/
} }
.wall-item-title-end { .wall-item-title-end {
@ -1101,13 +969,10 @@ footer {
} }
.thread-wrapper.toplevel_item { .thread-wrapper.toplevel_item {
width: 92%; width: 92%;
} }
.wall-item-body { .wall-item-body {
/* float: left; */
/*width: 450px;*/
margin-top: 10px; margin-top: 10px;
} }
@ -1121,23 +986,13 @@ footer {
} }
.wall-item-like, .wall-item-dislike { .wall-item-like, .wall-item-dislike {
margin-left: 0px; margin-top: 5px;
margin-top: 3px;
} }
.wall-item-author { .wall-item-author {
margin-top: 10px; margin-top: 10px;
} }
.comment-edit-wrapper {
margin-top: 15px;
margin-left: 50px;
}
.comment-wwedit-wrapper {
margin-top: 2px;
}
.comment-edit-photo { .comment-edit-photo {
margin-top: 10px; margin-top: 10px;
margin-left: 10px; margin-left: 10px;
@ -1159,7 +1014,6 @@ footer {
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 8px; padding: 8px;
border-radius: $radiuspx; border-radius: $radiuspx;
/* box-shadow: 5px 5px 5px #666 inset; */
} }
.comment-edit-text-empty { .comment-edit-text-empty {
@ -1200,9 +1054,6 @@ footer {
width:90%; width:90%;
} }
#profile-jot-submit {
float: left;
}
#profile-upload-wrapper { #profile-upload-wrapper {
float: left; float: left;
margin-left: 15px; margin-left: 15px;
@ -1271,7 +1122,6 @@ footer {
} }
#profile-jot-perms-end { #profile-jot-perms-end {
/*clear: left;*/
height: 30px; height: 30px;
} }
@ -1290,7 +1140,6 @@ footer {
} }
#profile-jot-end { #profile-jot-end {
/*clear: both;*/
margin-bottom: 30px; margin-bottom: 30px;
} }
#about-jot-submit-wrapper { #about-jot-submit-wrapper {
@ -1497,17 +1346,8 @@ footer {
DIV#profile-jot-text_toolbargroup{ DIV#profile-jot-text_toolbargroup{
background: #FFF; background: #FFF;
border: 1px #111; border: 1px #111;
/*box-shadow: 5px 5px 5px #000 inset;*/
} }
/*
#profile-jot-text_parent, .mceLayout {
border-radius: $radiuspx;
-moz-border-radius: $radiuspx;
box-shadow: 4px 4px 3px 0 #444444;
}
*/
iframe#profile-jot-text_ifr { iframe#profile-jot-text_ifr {
width: 100% !important; width: 100% !important;
@ -1528,7 +1368,6 @@ tr.mceLast {
width: 90%; width: 90%;
-moz-border-radius: $radiuspx; -moz-border-radius: $radiuspx;
border-radius: $radiuspx; border-radius: $radiuspx;
/* box-shadow: 4px 4px 3px 0 #666 inset; */
} }
#profile-jot-text:hover { #profile-jot-text:hover {
color: #000000; color: #000000;
@ -1701,14 +1540,10 @@ tr.mceLast {
margin-top: 15px; margin-top: 15px;
margin-right: 15px; margin-right: 15px;
margin-left: 15px; margin-left: 15px;
/* width: 200px; height: 200px;
overflow: hidden;
position: relative; */
} }
.photo-album-image-wrapper .caption { .photo-album-image-wrapper .caption {
display: none; display: none;
width: 100%; width: 100%;
/* position: absolute; */
bottom: 0px; bottom: 0px;
padding: 0.5em 0.5em 0px 0.5em; padding: 0.5em 0.5em 0px 0.5em;
background-color: rgba(245, 245, 255, 0.8); background-color: rgba(245, 245, 255, 0.8);
@ -1725,19 +1560,15 @@ tr.mceLast {
} }
.photo-top-image-wrapper { .photo-top-image-wrapper {
/* position: relative; */
float: left; float: left;
margin-top: 15px; margin-top: 15px;
margin-right: 15px; margin-right: 15px;
margin-left: 15px; margin-left: 15px;
margin-bottom: 15px; margin-bottom: 15px;
/* width: 200px; height: 200px;
overflow: hidden; */
} }
.photo-top-album-name { .photo-top-album-name {
width: 100%; width: 100%;
min-height: 2em; min-height: 2em;
/* position: absolute; */
bottom: 0px; bottom: 0px;
padding: 0px 3px; padding: 0px 3px;
padding-top: 0.5em; padding-top: 0.5em;
@ -1918,13 +1749,6 @@ a.mail-list-link {
/*
*a.mail-list-link:hover {
* background-color: #15607B;
* color: #F5F6FB;
*}
*/
.mail-list-outside-wrapper-end { .mail-list-outside-wrapper-end {
clear: both; clear: both;
} }
@ -2107,21 +1931,12 @@ aside input[type='text'] {
} }
#dfrn-request-networks {
margin-bottom: 30px;
}
#pause { #pause {
position: fixed; position: fixed;
bottom: 5px; bottom: 5px;
right: 5px; right: 5px;
} }
.sparkle {
cursor: url('../img/lock.cur'), pointer;
/* cursor: pointer !important; */
}
#vcard-end { #vcard-end {
clear: both; clear: both;
} }
@ -3058,61 +2873,6 @@ div.jGrowl div.info {
width: 90%; width: 90%;
} }
/* nav */
nav {
width: 100%;
height: 24px;
position: fixed;
// opacity: 0.6;
// filter:alpha(opacity=60);
left: 0px;
top: 0px;
padding: 0px;
background-color: #d00;
color: #eec;
z-index: 100;
/* -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); */
/* TODO find a better way to do this without different code for every single browser. */
background-image: linear-gradient(bottom, #f88 26%, #b00 82%);
background-image: -o-linear-gradient(bottom, #f88 26%, #b00 82%);
background-image: -moz-linear-gradient(bottom, #f88 26%, #b00 82%);
background-image: -webkit-linear-gradient(bottom, #f88 26%, #b00 82%);
background-image: -ms-linear-gradient(bottom, #f88 26%, #b00 82%);
background-image: -webkit-gradient(
linear,
left bottom,
left top,
color-stop(0.26, #f88),
color-stop(0.82, #b00)
);
}
/*
nav:hover {
background-image: linear-gradient(bottom, #f00 26%, #b00 82%);
background-image: -o-linear-gradient(bottom, #f00 26%, #b00 82%);
background-image: -moz-linear-gradient(bottom, #f00 26%, #b00 82%);
background-image: -webkit-linear-gradient(bottom, #f00 26%, #b00 82%);
background-image: -ms-linear-gradient(bottom, #f00 26%, #b00 82%);
background-image: -webkit-gradient(
linear,
left bottom,
left top,
color-stop(0.26, #f00),
color-stop(0.82, #b00)
);
}
*/
nav a, nav a,
nav a:active, nav a:active,
@ -3501,38 +3261,21 @@ border-bottom: 1px solid #ccc;
padding: 20px; padding: 20px;
} }
span.mail-list {
float: left;
width: 20%;
}
span.mail-delete { span.mail-delete {
float: left; float: left;
width: 30px; width: 30px;
} }
a.mail-list-sender-url {
float: left;
width: 35px;
}
img.mail-list-sender-photo { img.mail-list-sender-photo {
height: 16px; height: 24px;
width: 16px; width: 24px;
} }
span.mail-from {
float: left;
width: 200px;
}
span.mail-subject.unseen{
float: left;
width: 200px;
}
span.mail-date {
float:left;
width: 200px;
}
.tag1 { .tag1 {
font-size : 1.0em !important; font-size : 1.0em !important;
} }
@ -3608,4 +3351,4 @@ margin: 20px;
.pmenu li { .pmenu li {
margin-left: -20px; margin-left: -20px;
} }

8
view/tpl/mail_list.tpl
View File

@ -1,7 +1,7 @@
<div class="generic-content-wrapper" id="mail-list-wrapper"> <div class="generic-content-wrapper" id="mail-list-wrapper">
<span class="mail-delete"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="icon drophide mail-list-delete delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></span> <span class="mail-delete"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="icon drophide mail-list-delete delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></span>
<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a> <a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
<span class="mail-from">{{$from_name}}</span> <span class="mail-list">{{$from_name}}</span>
<span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span> <span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
<span class="mail-date" title="{{$date}}">{{$date}}</span> <span class="mail-list" title="{{$date}}">{{$date}}</span>
</div> </div>