keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
Friendika 2011-05-02 15:46:11 -07:00
commit 4332e39d4d
2 changed files with 47 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
view/theme/dispy/nav.tpl
View file

@ -1,6 +1,6 @@
$langselector
<span id="banner">$banner</span>
<span id="banner">$banner</span>
{{ if $nav.login }}<a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a> {{ endif }}
<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>

54
view/theme/dispy/style.css
View file

@ -11,6 +11,8 @@ a:hover { color: #729fcf; padding-bottom: 0px; border-bottom: 1px dotted #729fcf
.required { display: inline; color: #ff0000;}
.fakelink { color: #3465a4; cursor: pointer; }
.fakelink :hover{ color: #729fcf; }
input[type=submit] {
margin-top: 20px;
@ -23,7 +25,19 @@ input[type=submit] {
border: 0px;
}
.smalltext { font-size: 0.7em }
#panel {
position: absolute;
font-size:0.8em;
-webkit-border-radius: 5px ;
-moz-border-radius: 5px;
border-radius: 5px;
border: 1px solid #ffffff;
background-color: #2e3436;
color: #eeeeec;
padding:1em;
}
/**
* login
@ -148,11 +162,21 @@ nav .nav-link {
/** sysmsg **/
#sysmsg {
position:absolute; top: 20px; left:40%;
position:fixed;
bottom: 0px; right:10%;
-moz-box-shadow: 0px 0px 5px #888;
-webkit-box-shadow: 0px 0px 5px #888;
box-shadow: 0px 0px 5px #888;
padding: 10px; background-color: #fff;
padding: 10px;
background-color: #fcaf3e; border:2px solid #f8911b;
border-bottom:0px;
padding-bottom: 50px;
z-index: 1000;
}
#sysmsg br {
display:block;
margin:2px 0px;
border-top: 1px solid #ccccce;
}
/**
@ -174,6 +198,17 @@ aside h4 { font-size: 1.2em; }
aside #viewcontacts { text-align: right;}
#profile-extra-links ul { margin-left: 0px; padding-left: 0px; list-style: none; }
#dfrn-request-link {
background: #3465A4 url('connect.png') no-repeat right center;
border-radius: 5px 5px 5px 5px;
color: #FFFFFF;
display: block;
font-size: 1.2em;
padding: 0.2em 0.5em;
}
/**
* contacts block
*/
@ -223,7 +258,7 @@ aside #viewcontacts { text-align: right;}
#profile-jot-banner-end { clear: both; }
#profile-jot-email-wrapper {
margin: 10px 20% 0px 20%;
margin: 10px 10% 0px 10%;
border: 1px solid #555753;
border-bottom: 0px;
}
@ -231,14 +266,14 @@ aside #viewcontacts { text-align: right;}
#profile-jot-email { margin: 5px; width: 90%; }
#profile-jot-networks {
margin: 0px 20%;
margin: 0px 10%;
border: 1px solid #555753;
border-top: 0px;
border-bottom: 0px;
padding: 5px;
}
#profile-jot-acl-wrapper {
margin: 0px 20%;
margin: 0px 10%;
border: 1px solid #555753;
border-top: 0px;
}
@ -356,7 +391,9 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
-o-text-overflow: ellipsis;
}
.wall-item-location .icon { float: left; }
.wall-item-location a { margin-left: 25px; display: block; font-size: 0.7em; }
.wall-item-location > a { margin-left: 25px; font-size: 0.7em; display: block;}
.wall-item-location .smalltext { margin-left: 25px; font-size: 0.7em; display: block;}
.wall-item-location > br { display: none; }
.wallwall .wwto {
left: -10px;
@ -395,11 +432,12 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
.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; }
/**
* comment
*/
.ccollapse-wrapper { font-size: 0.9em; margin-left: 80px; }
.wall-item-outside-wrapper.comment { margin-left: 80px; }
.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px; height: 40px;}
.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; }