Merge https://github.com/friendica/friendica into pull
This commit is contained in:
friendica
commit
8497c6782e
4 changed files with 64 additions and 52 deletions
|
|
@ -1,16 +0,0 @@
|
|||
<h2>$title</h2>
|
||||
|
||||
|
||||
<div id="group-edit-wrapper" >
|
||||
<form action="group/$gid" id="group-edit-form" method="post" >
|
||||
<div id="group-edit-name-wrapper" >
|
||||
<label id="group-edit-name-label" for="group-edit-name" >$gname</label>
|
||||
<input type="text" id="group-edit-name" name="groupname" value="$name" />
|
||||
<input type="submit" name="submit" value="$submit">
|
||||
$drop
|
||||
</div>
|
||||
<div id="group-edit-name-end"></div>
|
||||
<div id="group-edit-desc">$desc</div>
|
||||
<div id="group-edit-select-end" ></div>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -58,9 +58,8 @@
|
|||
</div>
|
||||
</nav>
|
||||
|
||||
<div id="scrollup">
|
||||
<a href="#top"><img src="view/theme/smoothly/totop.png"
|
||||
alt="back to top" title="Back to top" /></a>
|
||||
<div id="scrollup" >
|
||||
<a href="#top"><img src="view/theme/smoothly/totop.png" alt="back to top" title="Back to top" /></a>
|
||||
</div>
|
||||
|
||||
<ul id="nav-notifications-template" style="display:none;" rel="template">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
Smoothly
|
||||
|
||||
Created by Anne Walk and Devlon Duthie on 2011-09-24
|
||||
Modified by alex@friendica.pixelbits.de on 2012-09-13
|
||||
Modified by alex@friendica.pixelbits.de on 2012-09-14
|
||||
|
||||
|
||||
** Colors **
|
||||
|
|
@ -213,8 +213,6 @@ section {
|
|||
.button:hover {
|
||||
border: 1px solid #7C7D7B;
|
||||
box-shadow: 0 0 8px #BDBDBD;
|
||||
/* -moz-box-shadow: 3px 3px 4px #959494;
|
||||
-webkit-box-shadow: 3px 3px 4px #959494;*/
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
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% );
|
||||
|
|
@ -371,7 +369,8 @@ nav #banner #logo-text a {
|
|||
|
||||
nav #user-menu {
|
||||
display: block;
|
||||
width: 190px;
|
||||
width: auto;
|
||||
min-width: 190px;
|
||||
float: right;
|
||||
margin-right: 5px;
|
||||
margin-top: 4px;
|
||||
|
|
@ -904,30 +903,51 @@ ul .sidebar-group-li .icon {
|
|||
background: #FFFFC8;
|
||||
}
|
||||
|
||||
#profile-jot-perms, #profile-jot-submit, #jot-preview-link {
|
||||
#profile-jot-perms, #profile-jot-submit {
|
||||
width: 60px;
|
||||
font-size: 12px;
|
||||
box-shadow: inset 0px 1px 0px 0px #cfcfcf;
|
||||
-moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
|
||||
-webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf;
|
||||
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
|
||||
background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
|
||||
background-color: #bdbdbd;
|
||||
border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
-webkit-border-radius: 5px;
|
||||
display: inline-block;
|
||||
color: #efefef;
|
||||
text-decoration: none;
|
||||
text-align: center;
|
||||
border: 1px solid #7C7D7B;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
}
|
||||
|
||||
#jot-preview-link {
|
||||
float: right;
|
||||
width: 60px;
|
||||
/*height: 10px;*/
|
||||
margin-right: 180px;
|
||||
/*margin-top: 0px;
|
||||
margin-left: 10px;*/
|
||||
font-size: 12px;
|
||||
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
|
||||
background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
|
||||
background-color: #bdbdbd;
|
||||
display: inline-block;
|
||||
color: #efefef;
|
||||
text-decoration: none;
|
||||
text-align: center;
|
||||
padding: 5px 5px;
|
||||
border: 1px solid #7C7D7B;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
}
|
||||
|
||||
#profile-jot-perms {
|
||||
width: 30px;
|
||||
width: 25px;
|
||||
float: right;
|
||||
overflow: hidden;
|
||||
border: 0px;
|
||||
margin-left:5px;
|
||||
margin-left: 10px;
|
||||
margin-right: 80px;
|
||||
margin-top: -28px;
|
||||
border: 1px solid #7C7D7B;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
}
|
||||
|
||||
#jot-perms-perms .icon {
|
||||
|
|
@ -935,11 +955,13 @@ ul .sidebar-group-li .icon {
|
|||
}
|
||||
|
||||
#profile-jot-submit {
|
||||
float: left;
|
||||
margin-right: 5px;
|
||||
border: 0px;
|
||||
margin-top: 0px;
|
||||
margin-left: -30px;
|
||||
width: 80px;
|
||||
float: right;
|
||||
margin-right: 90px;
|
||||
margin-top: -28px;
|
||||
margin-left: 10px;
|
||||
border: 1px solid #7C7D7B;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
}
|
||||
|
||||
#profile-jot-perms:hover,
|
||||
|
|
@ -949,6 +971,9 @@ ul .sidebar-group-li .icon {
|
|||
background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
|
||||
background-color: #1873a2;
|
||||
border: 1px solid #7C7D7B;
|
||||
box-shadow: 0 0 8px #BDBDBD;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
}
|
||||
|
||||
#profile-jot-perms:active,
|
||||
|
|
@ -959,9 +984,10 @@ ul .sidebar-group-li .icon {
|
|||
}
|
||||
|
||||
#character-counter {
|
||||
position: absolute:
|
||||
right: 100px;
|
||||
top:100px;
|
||||
position: relative;
|
||||
float: left;
|
||||
right: 0px;
|
||||
top: 0px;
|
||||
}
|
||||
#profile-rotator-wrapper {
|
||||
float: right;
|
||||
|
|
@ -1396,6 +1422,7 @@ profile-jot-banner-wrapper {
|
|||
|
||||
#item-delete-selected {
|
||||
overflow: auto;
|
||||
margin-top: 20px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
|
@ -1493,21 +1520,23 @@ profile-jot-banner-wrapper {
|
|||
.comment-edit-submit-wrapper {
|
||||
width: 80%;
|
||||
margin-left: 40px;
|
||||
text-align: right;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.comment-edit-submit {
|
||||
height: 22px;
|
||||
padding: 5px 5px;
|
||||
background-color: #a2a2a2;
|
||||
color: #eeeeec;
|
||||
border-radius: 5px;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border: 0px;
|
||||
border: 1px solid #CDCDCD;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
}
|
||||
|
||||
.comment-edit-submit:hover {
|
||||
background-color: #1873a2;
|
||||
border: 1px solid #CDCDCD;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
box-shadow: 0 0 8px #BDBDBD;
|
||||
}
|
||||
|
||||
.comment-edit-submit:active {
|
||||
|
|
@ -1516,7 +1545,7 @@ profile-jot-banner-wrapper {
|
|||
|
||||
#item-delete-selected-desc {
|
||||
color: #898989;
|
||||
float: left;
|
||||
float: right;
|
||||
}
|
||||
|
||||
.wall-item-body code {
|
||||
|
|
@ -3756,8 +3785,8 @@ hr.line-dots {
|
|||
----------------------------------------------------------- */
|
||||
#scrollup {
|
||||
position: fixed;
|
||||
right: 5px;
|
||||
bottom: 5px;
|
||||
right: 1px;
|
||||
bottom: 30px;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
/*
|
||||
* Name: Smoothly
|
||||
* Description: Theme optimized for iPad[2]
|
||||
* Description: Like coffee with milk. Theme works fine with iPad[2].
|
||||
* Version: 0.7
|
||||
* Author: Alex <https://friendica.pixelbits.de/profile/alex>
|
||||
* Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
|
||||
|
|
|
|||
Loading…
Reference in a new issue