rooty/OwncloudBookmarksOfficial
1
0
Fork 0
mirror of https://github.com/owncloud/bookmarks.git synced 2024-12-03 07:24:10 +01:00
Code Issues Releases Activity

Merge branch 'owncloud6-fixes'

Browse Source
This commit is contained in:
Brice Maron 2013-10-12 16:30:38 +02:00
commit 11b96db153
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
css/bookmarks.css
View File

@ -58,7 +58,7 @@ input.disabled, input.disabled:hover, input.disabled:focus {
/* width: 100%; */ /* width: 100%; */
height: 100%; height: 100%;
position: fixed; position: fixed;
left: 25em; left: 336px;
right:0; right:0;
} }
@ -345,8 +345,11 @@ li:hover em { display : none; }
margin-top:-3.4em; margin-top:-3.4em;
} }
.bookmark_form_title input, .bookmark_form_url input, .bookmark_form_desc textarea { .bookmark_form_title input, .bookmark_form_url input {
width: 80%; width: 89%;
}
.bookmark_form_desc textarea {
width: 94.5%;
} }
.bookmark_single .bookmark_edit_btn { .bookmark_single .bookmark_edit_btn {
@ -364,9 +367,8 @@ li:hover em { display : none; }
} }
.bookmark_single_form { .bookmark_single_form {
padding-top: 1em; padding: 20px 8px;
border-bottom: 1px solid #DDD; border-bottom: 1px solid #DDD;
padding-left: 2em;
} }
.bookmark_single_form .tagit{ .bookmark_single_form .tagit{
@ -375,6 +377,13 @@ li:hover em { display : none; }
margin: 3px; margin: 3px;
height:6.4em; height:6.4em;
} }
.bookmark_form_submit {
margin-left: 4px;
}
.bookmark_form_submit .reset {
float: right;
}
.bm_view_img .bookmark_actions { .bm_view_img .bookmark_actions {
bottom: 0.7em; bottom: 0.7em;
display: block; display: block;

5
templates/js_tpl.php
View File

@ -40,8 +40,9 @@
<textarea name="description" placeholder="<?php p($l->t('Description of the page'));?>" <textarea name="description" placeholder="<?php p($l->t('Description of the page'));?>"
><&= escapeHTML(description) &></textarea> ><&= escapeHTML(description) &></textarea>
</p> </p>
<p class="bookmark_form_submit"><button class="reset" ><?php p($l->t('Cancel'));?></button> <p class="bookmark_form_submit">
<input type="submit" value="<?php p($l->t('Save'));?>"> <button class="reset" ><?php p($l->t('Cancel'));?></button>
<input type="submit" class="primary" value="<?php p($l->t('Save'));?>">
</p> </p>
</form> </form>
</div> </div>

4
templates/list.php
View File

@ -36,7 +36,7 @@ function bookmarklet(){
<div id="bookmark_settings" class=""> <div id="bookmark_settings" class="">
<ul class="controls"> <ul class="controls">
<li id="settingsbtn" title="<?php p($l->t('Settings')); ?>"> <li id="settingsbtn" title="<?php p($l->t('Settings')); ?>">
<img class="svg" src="<?php print_unescaped(OCP\Util::imagePath('core', 'actions/settings.png')); ?>" <img class="svg" src="<?php print_unescaped(OCP\Util::imagePath('core', 'actions/settings.svg')); ?>"
alt="<?php p($l->t('Settings')); ?>" /> alt="<?php p($l->t('Settings')); ?>" />
</li> </li>
</ul> </ul>
@ -63,4 +63,4 @@ function bookmarklet(){
</div> </div>
<script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('bookmarks/js', 'full_tags.php'));?>"></script> <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('bookmarks/js', 'full_tags.php'));?>"></script>
<?php require 'js_tpl.php';?> <?php require 'js_tpl.php';?>