deleted: view/theme/smoothly/login.tpl

	deleted:    view/theme/smoothly/smarty3/login.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php

diff --git a/view/theme/smoothly/login.tpl b/view/theme/smoothly/login.tpl
deleted file mode 100644 (file)
index a2c143d..0000000
--- a/view/theme/smoothly/login.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<img style="float:left; margin:5px 20px 0 0" 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">
-               {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-               {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-       </div>
-
-       {{ if $openid }}
-               <div id="login_openid">
-                       {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-               </div>
-       {{ endif }}
-
-       <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 />
-                       <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-               {{ endif }}
-       </div>
-       
-       {{ for $hiddens as $k=>$v }}
-               <input type="hidden" name="$k" value="$v" />
-       {{ endfor }}
-       
-       
-</form>
-</div>
-<script type="text/javascript">window.loginName = "$lname.0";</script>

diff --git a/view/theme/smoothly/smarty3/login.tpl b/view/theme/smoothly/smarty3/login.tpl
deleted file mode 100644 (file)
index e8ade82..0000000
--- a/view/theme/smoothly/smarty3/login.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{{*
- *     AUTOMATICALLY GENERATED TEMPLATE
- *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<img style="float:left; margin:5px 20px 0 0" 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">
-               {{include file="field_input.tpl" field=$lname}}
-               {{include file="field_password.tpl" field=$lpassword}}
-       </div>
-
-       {{if $openid}}
-               <div id="login_openid">
-                       {{include file="field_openid.tpl" field=$lopenid}}
-               </div>
-       {{/if}}
-
-       <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 />
-                       <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
-               {{/if}}
-       </div>
-       
-       {{foreach $hiddens as $k=>$v}}
-               <input type="hidden" name="{{$k}}" value="{{$v}}" />
-       {{/foreach}}
-       
-       
-</form>
-</div>
-<script type="text/javascript">window.loginName = "{{$lname.0}}";</script>

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 285072d709f49cbe5b41bc1b68470f0f174ca4d1..1c6f86a201ac966dfc319aaf1c269b3441b0492c 100644 (file)
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -2,7 +2,7 @@
        style.css
        Smoothly
    
-       Created by alex@friendica.pixelbits.de on 2013-02-27
+       Created by alex@friendica.pixelbits.de on 2013-03-11
 
 ** Colors ** 
 Blue links - #1873a2
@@ -197,7 +197,7 @@ section {
 }
 
 #login-extra-links {
-       width: 90px;
+       width: auto;
        margin-top: 20px;
        clear: both;
 }
@@ -210,10 +210,9 @@ section {
 
 #login-extra-links a {
        display: block;
-       margin: 10px;
+       margin: 0px;
        padding: 5px 0px 5px 0px;
-       text-align: center;
-       margin-right: 20px;     
+       text-align: left;
 }
 
 #login-extra-filler {
@@ -233,12 +232,14 @@ section {
 
 #login_openid {
        width: 300px;
-       margin-left: 150px;
+       /*margin-left: 150px;*/
+
 }
 
 #login_standard input,
 #login_openid input {
-       width: 240px;
+       width: 250px;
+       height: 25px;
 }
 
 #register-link,
@@ -258,7 +259,7 @@ section {
 #login-submit-button,
 #login-submit-wrapper {
        margin-top: 10px;
-       margin-left: 75px;
+       margin-left: 0px;
 }
 
 #login-submit-button {
@@ -2967,7 +2968,7 @@ margin-left: 0px;
        background: url(images/login-bg.gif) no-repeat;
        background-position: 0 50%;
        padding-left: 18px;
-       width: 250px!important;
+       width: 260px!important;
 }
 
 .openid:hover {
@@ -3648,7 +3649,7 @@ margin-left: 0px;
 
 .field {
     margin-bottom: 10px;
-    overflow: auto;
+    /*overflow: auto;*/
     padding-bottom: 0px;
     width: 100%;
 }
@@ -3665,7 +3666,8 @@ margin-left: 0px;
 
 .field label {
     float: left;
-    width: 200px;
+    width: auto;
+       margin-right: 10px;
 }
 
 .field checkbox {
@@ -3675,7 +3677,7 @@ margin-left: 0px;
 
 .field input,
 .field textarea {
-       width: 400px;
+       width: auto;
        border: 1px solid #CDCDCD;
        border-radius: 5px;
                -moz-border-radius: 5px;

diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 849ad80a322893e30214d96a77b41717afba1e04..6886546d7184cf099e28bf72fc5c3bbac250302d 100644 (file)
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme optimized for iPad[2].
- * Version: Version 2013-02-27.1
+ * Version: Version 2013-03-11.1
  * Author: Alex <https://friendica.pixelbits.de/profile/alex>
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
  * Screenshot: <a href="screenshot.png">Screenshot</a>