summaryrefslogtreecommitdiff
path: root/skins/larry
diff options
context:
space:
mode:
Diffstat (limited to 'skins/larry')
-rw-r--r--skins/larry/addressbook.css5
-rw-r--r--skins/larry/settings.css20
-rw-r--r--skins/larry/styles.css9
-rw-r--r--skins/larry/templates/compose.html12
-rw-r--r--skins/larry/templates/importcontacts.html2
-rw-r--r--skins/larry/templates/mail.html2
-rw-r--r--skins/larry/ui.js13
7 files changed, 51 insertions, 12 deletions
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index 6bf9426c4..39d0cce21 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -387,3 +387,8 @@ a.deletebutton {
overflow: auto;
padding: 10px;
}
+
+#import-box p,
+#import-box .propform {
+ max-width: 50em;
+}
diff --git a/skins/larry/settings.css b/skins/larry/settings.css
index 59037ac76..6afa48c40 100644
--- a/skins/larry/settings.css
+++ b/skins/larry/settings.css
@@ -48,6 +48,26 @@
border-radius: 4px 4px 0 0;
}
+#preferences-details fieldset.advanced legend {
+ position: relative;
+ display: block;
+ width: 100%;
+ cursor: pointer;
+}
+
+#preferences-details fieldset.advanced .propform {
+ display: none;
+}
+
+#preferences-details fieldset.advanced .advanced-toggle {
+ position: absolute;
+ top: 2px;
+ right: 6px;
+ text-decoration: none;
+ color: #666;
+ font-size: 11px;
+}
+
#sections-table tbody td.section,
#settings-sections span.listitem a,
#settings-sections span.tablink a {
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 09c7a60ed..4b238c163 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -930,7 +930,7 @@ a.iconlink.upload {
}
/* fix scrolling within iframes in webkit browsers on touch devices */
-@media screen and (-webkit-min-device-pixel-ratio:0) {
+@media screen and (-webkit-min-device-pixel-ratio:0) and (max-device-width:1024px) {
.iframebox {
overflow: auto;
-webkit-overflow-scrolling: touch;
@@ -2292,12 +2292,13 @@ ul.toolbarmenu li span.conversation {
display: block;
color: #333;
font-weight: bold;
- padding: 8px 15px 3px 30px;
+ padding: 3px 15px 3px 30px;
text-shadow: 0px 1px 1px #fff;
text-decoration: none;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+ line-height: 20px;
}
.attachmentslist li a.drop {
@@ -2326,9 +2327,9 @@ ul.toolbarmenu li span.conversation {
.attachmentslist li a.delete,
.attachmentslist li a.cancelupload {
position: absolute;
- top: 6px;
+ top: 4px;
right: 0;
- width: 24px;
+ width: 20px;
height: 18px;
padding: 0;
text-decoration: none;
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 09eafe73b..806939a42 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -85,25 +85,25 @@
</tr><tr id="compose-cc">
<td class="title top">
<label for="_cc"><roundcube:label name="cc" /></label>
- <a href="#cc" onclick="return UI.hide_header_row('cc');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
+ <a href="#cc" onclick="return UI.hide_header_row('cc');" class="iconbutton cancel" title="<roundcube:label name='delete' />">x</a>
</td>
<td class="editfield"><roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="1" tabindex="3" /></td>
</tr><tr id="compose-bcc">
<td class="title top">
<label for="_bcc"><roundcube:label name="bcc" /></label>
- <a href="#bcc" onclick="return UI.hide_header_row('bcc');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
+ <a href="#bcc" onclick="return UI.hide_header_row('bcc');" class="iconbutton cancel" title="<roundcube:label name='delete' />">x</a>
</td>
- <td colspan="2" class="editfield"><roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="1" tabindex="4" /></td>
+ <td class="editfield"><roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="1" tabindex="4" /></td>
</tr><tr id="compose-replyto">
<td class="title top">
<label for="_replyto"><roundcube:label name="replyto" /></label>
- <a href="#replyto" onclick="return UI.hide_header_row('replyto');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
+ <a href="#replyto" onclick="return UI.hide_header_row('replyto');" class="iconbutton cancel" title="<roundcube:label name='delete' />">x</a>
</td>
<td class="editfield"><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /></td>
</tr><tr id="compose-followupto">
<td class="title top">
<label for="_followupto"><roundcube:label name="followupto" /></label>
- <a href="#followupto" onclick="return UI.hide_header_row('followupto');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
+ <a href="#followupto" onclick="return UI.hide_header_row('followupto');" class="iconbutton cancel" title="<roundcube:label name='delete' />">x</a>
</td>
<td class="editfield"><roundcube:object name="composeHeaders" part="followupto" form="form" id="_followupto" size="70" tabindex="7" /></td>
</tr><tr>
@@ -185,7 +185,7 @@
</div><!-- end mainscreen -->
<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='addattachment' />">
- <roundcube:object name="composeAttachmentForm" id="uploadform" attachmentFieldSize="40" buttons="no" />
+ <roundcube:object name="composeAttachmentForm" id="uploadform" buttons="no" />
<div class="formbuttons">
<roundcube:button command="send-attachment" type="input" class="button mainaction" label="upload" />
<roundcube:button name="close" type="input" class="button" label="cancel" onclick="UI.show_uploadform()" />
diff --git a/skins/larry/templates/importcontacts.html b/skins/larry/templates/importcontacts.html
index d3d0f2b93..69b138b9a 100644
--- a/skins/larry/templates/importcontacts.html
+++ b/skins/larry/templates/importcontacts.html
@@ -18,7 +18,7 @@
<h2 class="boxtitle"><roundcube:label name="importcontacts" /></h2>
<div id="import-box" class="boxcontent">
-<roundcube:object name="importstep" />
+<roundcube:object name="importstep" class="propform" />
<br/>
<p class="formbuttons">
<roundcube:object name="importnav" class="button" />
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index 5f465d767..f2c52c820 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -228,7 +228,7 @@
</div>
<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='importmessages' />">
- <roundcube:object name="messageimportform" id="uploadform" attachmentFieldSize="40" buttons="no" />
+ <roundcube:object name="messageimportform" id="uploadform" buttons="no" />
<div class="formbuttons">
<roundcube:button command="import-messages" type="input" class="button mainaction" label="upload" />
<roundcube:button name="close" type="input" class="button" label="cancel" onclick="UI.show_uploadform()" />
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index ae14d81b2..d558f16a2 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -195,6 +195,19 @@ function rcube_mail_ui()
new rcube_splitter({ id:'prefviewsplitter', p1:'#sectionslist', p2:'#preferences-box',
orientation:'v', relative:true, start:266, min:180, size:12 }).init();
}
+ else if (rcmail.env.action == 'edit-prefs') {
+ $('<a href="#toggle">&#9660;</a>')
+ .addClass('advanced-toggle')
+ .appendTo('#preferences-details fieldset.advanced legend');
+
+ $('#preferences-details fieldset.advanced legend').click(function(e){
+ var collapsed = $(this).hasClass('collapsed'),
+ toggle = $('.advanced-toggle', this).html(collapsed ? '&#9650;' : '&#9660;');
+ $(this)
+ .toggleClass('collapsed')
+ .closest('fieldset').children('.propform').toggle()
+ }).addClass('collapsed')
+ }
}
/*** addressbook task ***/
else if (rcmail.env.task == 'addressbook') {