This commit is contained in:
friendica 2012-09-24 20:54:55 -07:00
commit c8960fe3db
3 changed files with 310 additions and 49 deletions

View File

@ -1,35 +1,30 @@
<img style="float:left; margin-right:20px" src="/images/friendica-128.png" title="friendica">
<div class="login-form">
<form action="$dest_url" method="post" >
<input type="hidden" name="auth-params" value="login" />
<div id="login_standard">
<img style="float:left; margin-right:20px" src="/images/friendica-128.png" title="friendica">
{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
</div>
{{ if $openid }}
<br />
<div id="login_openid">
<div id="login_openid">
{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
</div>
</div>
{{ endif }}
<!-- <br />
<div class="login-extra-links">
By signing in you agree to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
</div>
-->
<br />
<div id="login-submit-wrapper" >
<input type="submit" name="submit" id="login-submit-button" value="$login" />
</div>
<br /><br />
<div class="login-extra-links">
{{ if $register }} <a href="register" title="$register.title" id="register-link">$register.desc</a><br />
{{ endif }} <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
{{ if $register }}
<a href="register" title="$register.title" id="register-link">$register.desc</a><br />
<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
{{ endif }}
</div>
{{ for $hiddens as $k=>$v }}

View File

@ -2,9 +2,7 @@
style.css
Smoothly
Created by Anne Walk and Devlon Duthie on 2011-09-24
Modified by alex@friendica.pixelbits.de on 2012-09-20
Created by alex@friendica.pixelbits.de on 2012-09-24
** Colors **
Blue links - #1873a2
@ -14,7 +12,6 @@ Grey/body text - #626262
Grey Gradients (buttons and other gradients) - #bdbdbd and #a2a2a2
Dark Grey Gradients - #7c7d7b and #555753
Orange - #fec01d
*/
body {
@ -89,7 +86,7 @@ li.widget-list {
color: #1873a2;
}
.fakelink {
.fakelink, .fakelink:visited, .fakelink:link {
color: #1873a2;
cursor: pointer;
margin-bottom: 10px;
@ -97,10 +94,14 @@ li.widget-list {
/*background: url("down.png") no-repeat scroll left center transparent;*/
}
.fakelink :hover {
.fakelink:hover {
color: #6da6c4;
}
.lockview {
cursor: pointer;
}
.heart {
color: #FF0000;
font-size: 100%;
@ -249,12 +250,13 @@ section {
#login-password-wrapper {
vertical-align: middle;
margin: auto;
margin: auto;
}
#login-extra-links {
width: 90px;
margin-top: 20px;
clear: both;
}
#login-extra-links a {
@ -269,6 +271,40 @@ section {
display: none;
}
#login_standard {
width: 210px;
float: left;
}
#login_openid {
width: 210px;
margin-left: 150px;
}
#login_standard input,
#login_openid input {
width: 210px;
}
#register-link,
#lost-password-link {
/*float: left;*/
font-size: 80%;
width: 210px;
margin-left: 5px;
}
#login-name-end,
#login-password-end,
#login-extra-end,
#login-submit-end {
height: 50px;
}
#login-submit-button {
margin-top: 20px;
margin-left: 0px;
}
/* ========= */
/* = Panel = */
/* ========= */
@ -352,6 +388,12 @@ nav a:hover {
border: 0px;
}
nav #site-location {
color: #888a85;
font-size: 0.8em;
position: absolute;
}
nav #banner {
display: block;
position: absolute;
@ -402,6 +444,57 @@ nav #user-menu-label {
text-align: center;
}
.nav-ajax-left {
font-size: 0.8em;
float: left;
margin-top: 62px;
}
nav #nav-link-wrapper .nav-link {
border-right: 1px solid #babdb6;
}
/* menu problems
.nav-commlink, .nav-login-link {
display: block;
height: 15px;
margin-top: 67px;
margin-right: 2px;
padding: 6px 3px;
float: left;
bottom: 140px;
border: 1px solid #babdb6;
border-bottom: 0px;
background-color: #aec0d3;
color: #565854;
border-radius: 3px 3px 0px 0px;
-moz-border-radius: 3px 3px 0px 0px;
}
.nav-commlink.selected {
background-color: #ffffff;
border-bottom: 1px solid #ffffff;
color: #000000 !important;
margin-top: 64px;
padding-top: 6px;
padding-bottom: 8px;
}
*/
.error-message {
color: #FF0000;
font-size: 1.1em;
border: 1px solid #FF8888;
background-color: #FFEEEE;
padding: 10px;
}
.info-message {
color: #204a87;
font-size: 1.1em;
border: 1px solid #3465a4;
background-color: #d7e3f1;
padding: 10px;
}
ul#user-menu-popup {
display: none;
position: absolute;
@ -626,6 +719,17 @@ aside h4 {
text-shadow: 1px 1px 0px #b36f6f;
}
#wallmessage-link {
display: block;
color: #FFFFFF;
-webkit-border-radius: 5px ;
-moz-border-radius: 5px;
border-radius: 5px;
padding: 5px;
font-weight: bold;
background-color: #3465a4;
}
#dfrn-request-link:hover {
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
@ -680,10 +784,25 @@ h3#search:before {
margin-right: 30px;
}
#sidebar-group-list > a{
#sidebar-group-list a {
padding-bottom: 10px;
}
/*#sidebar-group-list ul {
list-style-type: none;
}
#sidebar-group-list li {
margin-top: 10px;
}*/
#sidebar-group-list .icon,
#sidebar-group-list .iconspacer {
display: inline-block;
height: 12px;
width: 12px;
}
.widget {
margin-top: 20px;
box-shadow: 1px 2px 6px 0px #959494;
@ -733,7 +852,7 @@ h3#search:before {
top: 1px;
}
.group-selected, .nets-selected {
.group-selected, .nets-selected, .fileas-selected, .categories-selected {
padding-bottom: 0px;
padding-left: 2px;
padding-right: 2px;
@ -752,6 +871,10 @@ h3#search:before {
text-decoration: none;
}
.settings-widget .selected {
font-weight: bold;
}
#sidebar-new-group a {
color: #efefef;
font-size: 14px;
@ -880,7 +1003,7 @@ ul .sidebar-group-li .icon {
margin-top: 30px;
}
#jot-title {
#jot-title, #jot-category {
margin: 0px;
height: 20px;
width: 575px;
@ -888,23 +1011,37 @@ ul .sidebar-group-li .icon {
border: 1px solid #cccccc;
}
#jot-title::-webkit-input-placeholder {
#jot-perms-icon {
float: left;
}
#jot-title::-webkit-input-placeholder,
#jot-category::-webkit-input-placeholder {
font-weight: normal;
}
#jot-title:-moz-placeholder {
#jot-title:-moz-placeholder,
#jot-category:-moz-placeholder {
font-weight: normal;
}
#jot-title:hover,
#jot-title:focus {
#jot-title:focus,
#jot-category:hover,
#jot-category:focus {
border: 1px solid #cccccc;
}
.jothidden { display:none; }
.preview {
background: #FFFFC8;
}
#theme-preview {
margin: 15px 0 15px 150px;
}
#profile-jot-perms, #profile-jot-submit {
width: 60px;
font-size: 12px;
@ -1447,6 +1584,24 @@ profile-jot-banner-wrapper {
width: 250px;
}
code {
font-family: Courier, monospace;
white-space: pre;
display: block;
overflow: auto;
border: 1px solid #444;
background: #EEE;
color: #444;
padding: 10px;
margin-top: 20px;
}
blockquote {
background-color: #F4F8F9;
border-left: 4px solid #DAE4EE;
padding: 0.4em;
}
/* ============ */
/* = Comments = */
/* ============ */
@ -1465,6 +1620,7 @@ profile-jot-banner-wrapper {
}
.collapsed-comments,
.hide-comments,
.hide-comments-outer,
.wall-item-outside-wrapper.comment {
margin-left: 30px;
@ -1678,6 +1834,11 @@ div[id$="wrapper"] br {
background-color: #1873a2;
}
#profile-edit-links-end {
clear: both;
margin-bottom: 15px;
}
.profile-edit-side-div {
margin-top: 10px;
margin-right: 0px;
@ -1943,7 +2104,7 @@ select[size],
select[multiple],
select[size][multiple] {
-webkit-appearance: listbox;
margin: 5px 0px 10px 30px;
margin: 5px 0px 10px 0px;
}
select {
@ -1953,10 +2114,6 @@ select {
cursor: default;
}
keygen, select {
/*-webkit-border-radius: ;*/
}
textarea, keygen {
margin-top: 3px;
font-size: 0.9em;
@ -2318,6 +2475,13 @@ margin-left: 0px;
margin-bottom: 10px;
}
.contact-wrapper {
float: left;
width: 150px;
height: 150px;
overflow: auto;
}
.view-contact-wrapper,
.contact-entry-wrapper {
float: left;
@ -2328,6 +2492,14 @@ margin-left: 0px;
position: relative;
}
#view-contact-end {
clear: both;
}
#viewcontacts {
margin-top: 15px;
}
.contact-entry-direction-wrapper {
position: absolute;
top: 20px;
@ -2683,13 +2855,16 @@ margin-left: 0px;
/* = Register, Settings, Profile Forms = */
/* ===================================== */
.openid input{
#id_openid_url, .openid input{
background: url(login-bg.gif) no-repeat;
background-position: 0 50%;
padding-left: 18px;
width: 220px!important;
}
.openid:hover {
}
#profile-tabs-wrapper {
padding-top: 10px;
}
@ -2808,8 +2983,9 @@ margin-left: 0px;
#register-form label,
#profile-edit-form label {
width: 300px;
float: left;
width: 575px;
float: right;
margin-right: 155px;
}
/* #register-form span,
@ -2831,17 +3007,47 @@ margin-left: 0px;
margin: 20px 20px 0px 0px;
}
#profile-edit-links ul {
margin: 20px 0px;
padding: 0px;
list-style: none;
}
#register-sitename {
display: inline;
font-weight: bold;
}
#register-submit-button {
margin-top: 10px;
}
#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid {
float: left;
width: 350px;
margin-top: 10px;
}
#register-name, #register-email, #register-nickname {
float: left;
margin-top: 10px;
width: 150px;
}
#register-openid {
float: left;
margin-top: 10px;
width: 130px;
}
#register-fill-ext {
margin-bottom: 25px;
}
#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end {
clear: both;
}
#register-nickname-desc {
margin-top: 30px;
width: 650px;
}
/* ===================== */
/* = Contacts Selector = */
/* ===================== */
@ -3319,7 +3525,6 @@ tr {
.field {
/*margin-bottom: 10px;
margin-top: 10px;*/
padding-bottom: 0px;
width: 90%;
}
@ -3334,10 +3539,16 @@ tr {
border: 1px solid #CDCDCD;
border-radius: 5px 5px 5px 5px;
}
.field textarea {
height: 100px;
}
.field password {
height: 100px;
margin-left: 150px;
}
.field_help {
display: block;
margin-left: 100px;
@ -3820,13 +4031,45 @@ ul.menu-popup {
/* Pages profile widget
----------------------------------------------------------- */
#page-profile div#profile-page-list{
#page-profile
#profile-page-list {
margin-left: 45px;
}
hr.line-dots {
background: url("dot.png") repeat-x scroll left center transparent;
border: medium none;
#page-profile .title {
font-weight: bold;
}
#profile-vcard-break {
clear: both;
}
#profile-extra-links {
clear: both;
margin-top: 10px;
}
#profile-extra-links ul {
list-style-type: none;
padding: 0px;
}
#profile-extra-links li {
margin-top: 5px;
}
.profile-edit-side-div {
float: right;
}
.profile-edit-side-link {
opacity: 0.3;
filter:alpha(opacity=30);
}
.profile-edit-side-link:hover {
opacity: 1.0;
filter:alpha(opacity=100);
}
/* SCROLL TO TOP
@ -3853,3 +4096,26 @@ div.wall-item-content-wrapper.shiny {
background-image: url("shiny.png");
background-repeat: repeat-x;
}
/* from default */
#jot-perms-icon,
#profile-location,
#profile-nolocation,
#profile-youtube,
#profile-video,
#profile-audio,
#profile-link,
#profile-title,
#wall-image-upload,
#wall-file-upload,
#profile-upload-wrapper,
#wall-image-upload-div,
#wall-file-upload-div,
.hover, .focus {
cursor: pointer;
}
hr.line-dots {
background: url("dot.png") repeat-x scroll left center transparent;
border: medium none;
}

View File

@ -3,7 +3,7 @@
/*
* Name: Smoothly
* Description: Like coffee with milk. Theme works fine with iPad[2].
* Version: Version 0.9.24-1
* Version: Version 0.9.24-2
* Author: Alex <https://friendica.pixelbits.de/profile/alex>
* Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
* Screenshot: <a href="screenshot.png">Screenshot</a>