Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: fix editor * master:
This commit is contained in:
commit
2b9ea33e8b
|
@ -44,13 +44,13 @@
|
||||||
<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
|
<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
|
||||||
|
|
||||||
|
<button onclick="preview_post();" id="jot-preview-link" class="button creation1">$preview</button>
|
||||||
|
|
||||||
<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
|
<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
|
||||||
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
|
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button onclick="preview_post();" id="jot-preview-link" class="button creation1">$preview</button>
|
|
||||||
<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
|
|
||||||
|
|
||||||
<div id="profile-jot-perms-end"></div>
|
<div id="profile-jot-perms-end"></div>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1290,7 +1290,7 @@ section {
|
||||||
width: 785px;
|
width: 785px;
|
||||||
margin: 0px 2em 20px 0px;
|
margin: 0px 2em 20px 0px;
|
||||||
}
|
}
|
||||||
#jot .profile-jot-text {
|
#profile-jot-form #profile-jot-text {
|
||||||
height: 1.2em;
|
height: 1.2em;
|
||||||
width: 99%;
|
width: 99%;
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
|
@ -1378,7 +1378,7 @@ section {
|
||||||
#jot #jot-tools li.loading img {
|
#jot #jot-tools li.loading img {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
#jot #jot-title {
|
#profile-jot-form #jot-title {
|
||||||
border: 0px;
|
border: 0px;
|
||||||
margin: 0px;
|
margin: 0px;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
|
@ -1386,12 +1386,16 @@ section {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
border: 1px solid #ffffff;
|
border: 1px solid #ffffff;
|
||||||
}
|
}
|
||||||
#jot #jot-title:-webkit-input-placeholder {
|
#profile-jot-form #jot-title:-webkit-input-placeholder {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
#jot #jot-title:-moz-placeholder {
|
#profile-jot-form #jot-title:-moz-placeholder {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
|
#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
|
||||||
|
width: 785px;
|
||||||
|
height: 100px;
|
||||||
|
}
|
||||||
#jot #jot-title:hover {
|
#jot #jot-title:hover {
|
||||||
border: 1px solid #999999;
|
border: 1px solid #999999;
|
||||||
}
|
}
|
||||||
|
@ -1424,59 +1428,75 @@ section {
|
||||||
}
|
}
|
||||||
#profile-jot-wrapper{
|
#profile-jot-wrapper{
|
||||||
margin: 0 2em 20px 0;
|
margin: 0 2em 20px 0;
|
||||||
width: 685px;
|
width: 785px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#profile-jot-submit-wrapper {
|
#profile-jot-submit-wrapper {
|
||||||
margin-bottom: 50px;
|
margin-bottom: 50px;
|
||||||
width: 675px;
|
width: 785px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#profile-jot-submit {
|
#profile-jot-submit {
|
||||||
float: left;
|
float: right;
|
||||||
|
margin-top: 2px;
|
||||||
|
|
||||||
}
|
}
|
||||||
#profile-upload-wrapper {
|
#profile-upload-wrapper {
|
||||||
float: left;
|
float: left;
|
||||||
|
margin-top: 2px;
|
||||||
|
margin-left: 10px;
|
||||||
|
|
||||||
}
|
}
|
||||||
#profile-attach-wrapper {
|
#profile-attach-wrapper {
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: 15px;
|
margin-left: 15px;
|
||||||
|
margin-top: 2px;
|
||||||
}
|
}
|
||||||
#profile-rotator {
|
#profile-rotator {
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: 30px;
|
margin-left: 30px;
|
||||||
|
margin-top: 2px;
|
||||||
}
|
}
|
||||||
#profile-link-wrapper {
|
#profile-link-wrapper {
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: 15px;
|
margin-left: 15px;
|
||||||
|
margin-top: 2px;
|
||||||
}
|
}
|
||||||
#profile-youtube-wrapper {
|
#profile-youtube-wrapper {
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: 15px;
|
margin-left: 15px;
|
||||||
|
margin-top: 2px;
|
||||||
}
|
}
|
||||||
#profile-video-wrapper {
|
#profile-video-wrapper {
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: 15px;
|
margin-left: 15px;
|
||||||
|
margin-top: 2px;
|
||||||
}
|
}
|
||||||
#profile-audio-wrapper {
|
#profile-audio-wrapper {
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: 15px;
|
margin-left: 15px;
|
||||||
|
margin-top: 2px;
|
||||||
}
|
}
|
||||||
#profile-location-wrapper {
|
#profile-location-wrapper {
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: 15px;
|
margin-left: 15px;
|
||||||
|
margin-top: 2px;
|
||||||
}
|
}
|
||||||
#profile-jot-perms {
|
#profile-jot-perms {
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: 45px;
|
margin-left: 45px;
|
||||||
|
margin-top: 2px;
|
||||||
}
|
}
|
||||||
#jot-preview-link {
|
#jot-preview-link {
|
||||||
float: left;
|
float: right;
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
margin-top: 0px !important;
|
margin-top: 2px;
|
||||||
}
|
}
|
||||||
|
#profile-jot-perms{
|
||||||
|
float: right;
|
||||||
|
margin-left: 10px;
|
||||||
|
margin-top: 2px;
|
||||||
|
}
|
||||||
/** buttons **/
|
/** buttons **/
|
||||||
.button.creation1 {
|
.button.creation1 {
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
|
|
Loading…
Reference in New Issue