friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

New layout for connector settings. New global CSS for things that seems to be identical in most themes.

Browse source
This commit is contained in:
Michael Vogel 2014-04-24 10:17:19 +02:00
parent 30efb0c1e6
commit b005423ebf
3 changed files with 7 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
view/templates/head.tpl
View file

@ -6,6 +6,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<base href="{{$baseurl}}/" />
<meta name="generator" content="{{$generator}}" />
<link rel="stylesheet" href="{{$baseurl}}/view/global.css" type="text/css" media="all" />
{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox.css" type="text/css" media="screen" />-->*}}
<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />

4
view/templates/settings_connectors.tpl
View file

@ -17,11 +17,11 @@
{{else}}
<span id="settings_mail_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
<h3 class="settings-heading">{{$h_imap}}</h3>
<img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
</span>
<div id="settings_mail_expanded" class="settings-block" style="display: none;">
<span class="fakelink" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
<h3 class="settings-heading">{{$h_imap}}</h3>
<img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
</span>
<p>{{$imap_desc}}</p>
{{include file="field_custom.tpl" field=$imap_lastcheck}}

61
view/theme/vier/style.css
View file

@ -1208,60 +1208,7 @@ section.minimal {
width: 350px;
float: left;
font-size: 12px;
}
.type-link, .type-video {
border-top: 1px solid #D2D2D2;
border-bottom: 1px solid #D2D2D2;
display: block;
padding-top: 5px;
padding-bottom: 5px;
margin-top: 10px;
/*
padding-left: 170px;
min-height: 90px;
position: relative;
*/
}
.type-link:after, .type-video:after {
content: ".";
display: block;
height: 0;
clear: both;
visibility: hidden;
}
.wall-item-container .wall-item-content .type-link img,
.type-link img, .type-video img {
max-width: 160px;
max-height: 160px;
float: left;
margin-right: 10px;
}
.type-link blockquote, .type-video blockquote {
/* margin-left: 160px; */
margin-left: 0px;
max-height: 160px;
overflow: hidden;
border-left: 0px;
padding-left: 0px;
font-size: 13px;
line-height: normal;
}
.type-link .oembed, .type-video .oembed {
font-size: 18px;
font-weight: 300;
line-height: normal;
}
.type-link img, .type-video img {
/* position: absolute;
left: 0;
top: 0; */
}
.type-link span.oembed + br, .type-video span.oembed + br,
.type-link a + br, .type-video a + br,
.type-link img + br, .type-video img + br{
display: none;
}
}}
h2 {
line-height: normal;
@ -2429,9 +2376,9 @@ a.mail-list-link {
}
.settings-block {
border: 1px solid #AAA;
margin: 10px;
padding: 10px;
/* border: 1px solid #AAA; */
padding-left: 5px;
padding-right: 5px;
}
.app-title {