aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-03 14:39:03 -0800
committerfriendica <info@friendica.com>2015-03-03 14:39:03 -0800
commit52f42e7d8131f4b68fb6277e1ae286e7e76ad75d (patch)
tree5a1191513b0b5236cc571a05f20393ecb0af968a /view
parent44b714d0eb13263d5900bd8d51bf3995388f4bd0 (diff)
parente3a559128dc9565474b7db9068f6414f7ae6d4e2 (diff)
downloadvolse-hubzilla-52f42e7d8131f4b68fb6277e1ae286e7e76ad75d.tar.gz
volse-hubzilla-52f42e7d8131f4b68fb6277e1ae286e7e76ad75d.tar.bz2
volse-hubzilla-52f42e7d8131f4b68fb6277e1ae286e7e76ad75d.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css12
-rwxr-xr-xview/tpl/login.tpl22
-rwxr-xr-xview/tpl/settings.tpl2
3 files changed, 15 insertions, 21 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a27de499f..787deb6ea 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -81,7 +81,11 @@ a.btn-default {
color: #333;
}
-a.btn-success {
+a.btn-success,
+a.btn-danger,
+a.btn-info,
+a.btn-warning,
+a.btn-primary {
color: #fff;
}
@@ -111,8 +115,8 @@ input[type="submit"] {
padding: 6px 12px;
}
-button, input, optgroup, select, textarea {
- color: #000;
+input, optgroup, select, textarea {
+ color: #333;
}
pre code {
@@ -2331,5 +2335,5 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
.field.checkbox > div > input:checked + label .onoffswitch-switch {
right: 0px;
- background-color: $link_colour;
+ background-color: #337AB7;
}
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
index 7bde90c23..9472bd961 100755
--- a/view/tpl/login.tpl
+++ b/view/tpl/login.tpl
@@ -1,29 +1,19 @@
<form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
<input type="hidden" name="auth-params" value="login" />
<div id="login-main">
- <div id="login_standard">
- {{include file="field_input.tpl" field=$lname}}
- {{include file="field_password.tpl" field=$lpassword}}
+ <div id="login-input" class="form-group">
+ {{include file="field_input.tpl" field=$lname}}
+ {{include file="field_password.tpl" field=$lpassword}}
+ {{include file="field_checkbox.tpl" field=$remember}}
+ <button type="submit" name="submit" class="btn btn-block btn-primary">{{$login}}</button>
</div>
-
<div id="login-extra-links">
- {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>&nbsp;|{{/if}}
+ {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link" class="pull-right">{{$register.desc}}</a>{{/if}}
<a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
</div>
- <div class="clear"></div>
-
- {{include file="field_checkbox.tpl" field=$remember}}
-
- <div class="clear"></div>
-
- <div id="login-submit-wrapper" >
- <input type="submit" name="submit" id="login-submit-button" class="btn btn-default" value="{{$login}}" />
- </div>
</div>
-
{{foreach $hiddens as $k=>$v}}
<input type="hidden" name="{{$k}}" value="{{$v}}" />
{{/foreach}}
</form>
-
<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 02937e4b2..6ad23b007 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,6 +1,6 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
- <button title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" type="submit" formaction="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</button>
+ <a title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
<h2>{{$ptitle}}</h2>
<div class="clear"></div>
</div>