holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pixelegg changes from yesterday

Browse Source
This commit is contained in:
Ralf Becker 2013-11-27 07:21:32 +00:00
parent 3f687236a5
commit 73b6521cbf
13 changed files with 113 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addressbook/templates/pixelegg/app.css
View File

@ -124,10 +124,6 @@ fieldset.emailGroup {
.image16 img { .image16 img {
height: 16px; height: 16px;
} }
div#addressbook-index {
min-height: 700px;
height: auto !important;
}
div#addressbook-index div.et2_hbox_left { div#addressbook-index div.et2_hbox_left {
padding: 1em; padding: 1em;
} }
@ -240,7 +236,7 @@ div#addressbook-index div.et2_hbox_right button#addressbook-index_add {
background-color: #0b5fa4 !important; background-color: #0b5fa4 !important;
color: #FFF; color: #FFF;
text-shadow: none; text-shadow: none;
height: 35px; /* height: auto;*/
background-image: none !important; background-image: none !important;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-webkit-border-top-left-radius: 20px; -webkit-border-top-left-radius: 20px;
@ -251,7 +247,7 @@ div#addressbook-index div.et2_hbox_right button#addressbook-index_add {
} }
div#addressbook-index div.et2_hbox_right button#addressbook-index_add:before { div#addressbook-index div.et2_hbox_right button#addressbook-index_add:before {
content: "+"; content: "+";
font-size: 2em; font-size: 1.5em;
color: #ffc200; color: #ffc200;
} }
div#addressbook-index div.et2_hbox_right button#addressbook-index_add:hover { div#addressbook-index div.et2_hbox_right button#addressbook-index_add:hover {
@ -303,7 +299,7 @@ div#addressbook-index table.egwGridView_outer {
background-color: #0b5fa4 !important; background-color: #0b5fa4 !important;
color: #FFF; color: #FFF;
text-shadow: none; text-shadow: none;
height: 35px; /* height: auto;*/
background-image: none !important; background-image: none !important;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-webkit-border-top-left-radius: 20px; -webkit-border-top-left-radius: 20px;
@ -317,7 +313,7 @@ div#addressbook-index table.egwGridView_outer {
} }
#infolog-index_infolog-index-header_right .et2_box_widget:before { #infolog-index_infolog-index-header_right .et2_box_widget:before {
content: "+"; content: "+";
font-size: 2em; font-size: 1.5em;
color: #ffc200; color: #ffc200;
} }
#infolog-index_infolog-index-header_right .et2_box_widget:hover { #infolog-index_infolog-index-header_right .et2_box_widget:hover {

5
addressbook/templates/pixelegg/app.less
View File

@ -17,8 +17,8 @@
// iframe // iframe
div#addressbook-index{ div#addressbook-index{
min-height: 700px; // min-height: 700px;
height: auto !important; // height: auto !important;
// ########################### // ###########################
// linke Box // linke Box
@ -520,6 +520,7 @@ div.addressbook.edit.general{
} }
// Dialog Upload photo // Dialog Upload photo
.uploadphoto { .uploadphoto {
background-color: @gray-20; background-color: @gray-20;
border: 2px solid black; border: 2px solid black;

4
admin/templates/default/config.tpl
View File

@ -355,8 +355,8 @@
</tr> </tr>
<tr> <tr>
<td colspan="2" align="center"> <td colspan="2" align="center">
<input type="submit" name="submit" value="{lang_submit}"> <input type="submit" name="submit" value="{lang_submit}" class="et2_button et2_button_text">
<input type="submit" name="cancel" value="{lang_cancel}"> <input type="submit" name="cancel" value="{lang_cancel}" class="et2_button et2_button_text">
<br> <br>
</td> </td>
</tr> </tr>

1
etemplate/templates/default/etemplate2.css
View File

@ -197,6 +197,7 @@ button.et2_button_with_image {
padding-left: 20px; padding-left: 20px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position-x: 3px; background-position-x: 3px;
background-size: 16px;
} }
/** /**

8
filemanager/templates/default/select.xet
View File

@ -28,7 +28,7 @@
<column/> <column/>
</columns> </columns>
<rows> <rows>
<row> <row class="dialog-header">
<hbox> <hbox>
<html id="js"/> <html id="js"/>
<button label="Up" id="button[up]" image="goup"/> <button label="Up" id="button[up]" image="goup"/>
@ -70,10 +70,10 @@
<file id="file_upload"/> <file id="file_upload"/>
</groupbox> </groupbox>
</row> </row>
<row> <row class="dialog-footer-toolbar">
<hbox align="right"> <hbox align="right">
<button label="@label" id="button[ok]"/> <button label="@label" id="button[ok]" image="save" background_image="1"/>
<buttononly label="Cancel" id="button[cancel]" onclick="window.close();"/> <buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
</hbox> </hbox>
</row> </row>
</rows> </rows>

19
filemanager/templates/pixelegg/app.css
View File

@ -19,7 +19,7 @@
background-color: #0b5fa4 !important; background-color: #0b5fa4 !important;
color: #FFF; color: #FFF;
text-shadow: none; text-shadow: none;
height: 35px; /* height: auto;*/
background-image: none !important; background-image: none !important;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-webkit-border-top-left-radius: 20px; -webkit-border-top-left-radius: 20px;
@ -32,7 +32,7 @@
} }
#filemanager-index .et2_file:before { #filemanager-index .et2_file:before {
content: "+"; content: "+";
font-size: 2em; font-size: 1.5em;
color: #ffc200; color: #ffc200;
} }
#filemanager-index .et2_file:before { #filemanager-index .et2_file:before {
@ -60,3 +60,18 @@
} }
/*// Dialog filemanager /*// Dialog filemanager
// #####################################################*/ // #####################################################*/
#filemanager-select .dialog-header .et2_button_icon {
height: auto;
width: 24px;
}
#filemanager-select #filemanager-select_apps {
background-color: #d9d9d9;
}
#filemanager-select #filemanager-select_apps .et2_button_icon {
height: auto;
width: 24px;
padding: 10px;
}
#filemanager-select #filemanager-select_dir {
border: 1px solid rgba(0, 0, 0, 0.15);
}

BIN
filemanager/templates/pixelegg/app.less
View File

Binary file not shown.

6
mail/templates/default/acl.xet
View File

@ -67,9 +67,9 @@
</row> </row>
<row> <row>
<hbox> <hbox>
<button statustext="Saves this ACL" label="Save" id="button[save]"/> <button statustext="Saves this ACL" label="Save" id="button[save]" image="save" background_image="1"/>
<button statustext="Applies the changes made" label="Apply" id="button[apply]"/> <button statustext="Applies the changes made" label="Apply" id="button[apply]" image="apply" background_image="1"/>
<button label="Cancel" id="button[cancel]"/> <button label="Cancel" id="button[cancel]" image="cancel" background_image="1"/>
</hbox> </hbox>
</row> </row>
</rows> </rows>

37
mail/templates/pixelegg/app.css
View File

@ -9,6 +9,12 @@
* @package mail * @package mail
* @version $Id$ * @version $Id$
*/ */
#popupMainDiv {
padding: 5px;
}
#popupMainDiv .et2_grid tr td {
padding: 5px 0;
}
/*############################################## /*##############################################
# # # # # #
# # # # # #
@ -17,7 +23,7 @@
# # # # # #
# # # # # #
# # # # # #
# # iframge # # # iframe #
# # # # # #
# # # # # #
# # # # # #
@ -26,27 +32,27 @@
# # # # # #
############################################## ##############################################
*/ */
div#mail-index div#mail-index_mail { div#mail-index {
margin: 0 1% 0 0 !important; margin: 0 1% 0 0 !important;
} }
div#mail-index div#mail-index_mail div#mail-index_nm tr.mail td img { div#mail-index div#mail-index_nm tr.mail td img {
height: 16px; height: 16px;
} }
div#mail-index div#mail-index_mail div#mail-index_mailPreview { div#mail-index div#mail-index_mailPreview {
padding: 3px; padding: 3px;
margin: 5px 0; margin: 0;
background-color: #bfbfbf; background-color: #bfbfbf;
} }
div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mailPreviewHeadersFrom { div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersFrom {
width: 50%; width: 50%;
} }
div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mailPreviewHeadersTo { div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersTo {
width: 50%; width: 50%;
} }
div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mailPreviewHeadersDate { div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersDate {
width: 50%; width: 50%;
} }
div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject { div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject {
width: 100%; width: 100%;
} }
.egw_fw_ui_category_content #mail-index_buttonmailcreate { .egw_fw_ui_category_content #mail-index_buttonmailcreate {
@ -57,7 +63,7 @@ div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mai
background-color: #0b5fa4 !important; background-color: #0b5fa4 !important;
color: #FFF; color: #FFF;
text-shadow: none; text-shadow: none;
height: 35px; /* height: auto;*/
background-image: none !important; background-image: none !important;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-webkit-border-top-left-radius: 20px; -webkit-border-top-left-radius: 20px;
@ -75,7 +81,7 @@ div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mai
.egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate]:before, .egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate]:before,
.egw_fw_ui_category_content #mail-index_buttonmailcreate button[id*="mailcreate"]:before { .egw_fw_ui_category_content #mail-index_buttonmailcreate button[id*="mailcreate"]:before {
content: "+"; content: "+";
font-size: 2em; font-size: 1.5em;
color: #ffc200; color: #ffc200;
} }
.egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate]:hover, .egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate]:hover,
@ -943,11 +949,15 @@ input[type=button] {
border: 1px solid rgba(0, 0, 0, 0.15); border: 1px solid rgba(0, 0, 0, 0.15);
opacity: 1; opacity: 1;
-moz-opacity: 1; -moz-opacity: 1;
z-index: 100;
} }
#mail-index_previewAttachmentArea img { #mail-index_previewAttachmentArea img {
width: 16px; width: 16px;
height: 16px; height: 16px;
} }
#mail-index_previewAttachmentArea td {
padding: 2px;
}
#mail-index_previewAttachmentArea.noContent { #mail-index_previewAttachmentArea.noContent {
border: 0px !important; border: 0px !important;
} }
@ -961,6 +971,7 @@ input[type=button] {
overflow-y: auto; overflow-y: auto;
left: 3px; left: 3px;
right: 3px; right: 3px;
z-index: 100;
} }
.mailDisplayContainer { .mailDisplayContainer {
position: fixed; position: fixed;
@ -1010,3 +1021,7 @@ div.mailComposeBody,
div.mailPreviewHeaders > * { div.mailPreviewHeaders > * {
margin-left: 3px; margin-left: 3px;
} }
#mail-importMessage .et2_button_icon {
height: auto;
width: 24px;
}

30
mail/templates/pixelegg/app.less
View File

@ -13,7 +13,16 @@
@import (reference) "../../../pixelegg/less/def_buttons.less"; @import (reference) "../../../pixelegg/less/def_buttons.less";
@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; @import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less";
#popupMainDiv{
padding: 5px;
.et2_grid{
tr{
td{
padding: 5px 0;
}
}
}
}
/*############################################## /*##############################################
# # # # # #
# # # # # #
@ -22,7 +31,7 @@
# # # # # #
# # # # # #
# # # # # #
# # iframge # # # iframe #
# # # # # #
# # # # # #
# # # # # #
@ -56,7 +65,7 @@ div#mail-index{
// alles // alles
div#mail-index_mail{
margin: 0 1% 0 0 !important; margin: 0 1% 0 0 !important;
@ -124,7 +133,7 @@ div#mail-index{
// Ansicht der Emails // Ansicht der Emails
div#mail-index_mailPreview{ div#mail-index_mailPreview{
padding: 3px; padding: 3px;
margin: 5px 0; margin: 0;
.background-color-25-gray; .background-color-25-gray;
// From // From
div#mail-index_mailPreviewHeadersFrom{ div#mail-index_mailPreviewHeadersFrom{
@ -170,7 +179,7 @@ div#mail-index{
} // Ende: Ansicht der Emails } // Ende: Ansicht der Emails
} // Ende alles
} // iframe } // iframe
@ -1119,9 +1128,11 @@ input[type=button] {
.border_normal; .border_normal;
opacity: 1; opacity: 1;
-moz-opacity:1; -moz-opacity:1;
z-index: 100;
// filter: Alpha(opacity=100); // filter: Alpha(opacity=100);
img {width: 16px; height: 16px;} img {width: 16px; height: 16px;}
td{padding: 2px;}
} }
#mail-index_previewAttachmentArea.noContent { #mail-index_previewAttachmentArea.noContent {
@ -1139,6 +1150,7 @@ input[type=button] {
overflow-y: auto; overflow-y: auto;
left: 3px; left: 3px;
right: 3px; right: 3px;
z-index: 100;
} }
.mailDisplayContainer { .mailDisplayContainer {
position: fixed; position: fixed;
@ -1194,4 +1206,12 @@ div.mailComposeHeaders > span:first-child {
} }
div.mailDisplayHeaders > span:first-child, div.mailComposeHeaders > span:first-child, div.mailComposeBody, div.mailPreviewHeaders > * { div.mailDisplayHeaders > span:first-child, div.mailComposeHeaders > span:first-child, div.mailComposeBody, div.mailPreviewHeaders > * {
margin-left: 3px;} margin-left: 3px;}
#mail-importMessage{
.et2_button_icon{
height: auto;
width: 24px;
}
}
// //

22
timesheet/templates/default/edit.xet
View File

@ -122,13 +122,13 @@
<description align="center" id="msg" no_lang="1" span="all" class="redItalic"/> <description align="center" id="msg" no_lang="1" span="all" class="redItalic"/>
<description/> <description/>
</row> </row>
<row class="th" height="28"> <row class="th dialog-header" height="28">
<description value="User" for="ts_owner"/> <description value="User" for="ts_owner"/>
<menulist span="all"> <menulist span="all">
<menupopup id="ts_owner" no_lang="1"/> <menupopup id="ts_owner" no_lang="1"/>
</menulist> </menulist>
</row> </row>
<row class="row"> <row class="row dialog-header">
<description value="Project" for="ts_project"/> <description value="Project" for="ts_project"/>
<grid spacing="1" padding="1"> <grid spacing="1" padding="1">
<columns> <columns>
@ -144,7 +144,7 @@
</rows> </rows>
</grid> </grid>
</row> </row>
<row class="row" disabled="@ts_viewtype"> <row class="row dialog-header" disabled="@ts_viewtype">
<description value="Unitprice" for="ts_unitprice"/> <description value="Unitprice" for="ts_unitprice"/>
<grid> <grid>
<columns> <columns>
@ -186,18 +186,18 @@
</menulist> </menulist>
</hbox> </hbox>
</row> </row>
<row> <row class="dialog-footer-toolbar">
<hbox orient="0" span="2"> <hbox orient="0" span="2">
<hbox> <hbox>
<button statustext="Edit this entry" label="Edit" id="button[edit]"/> <button statustext="Edit this entry" label="Edit" id="button[edit]" image="edit" background_image="1"/>
<button statustext="Saves this entry and add a new one" label="Save &amp; New" id="button[save_new]"/> <button statustext="Saves this entry and add a new one" label="Save &amp; New" id="button[save_new]" image="save_new" background_image="1"/>
<button statustext="Saves the changes made" label="Save" id="button[save]"/> <button statustext="Saves the changes made" label="Save" id="button[save]" image="save" background_image="1"/>
<button statustext="Applies the changes made" label="Apply" id="button[apply]"/> <button statustext="Applies the changes made" label="Apply" id="button[apply]" image="apply" background_image="1"/>
<button statustext="closes the window without saving the changes" label="Cancel" id="button[cancel]" onclick="window.close();"/> <button statustext="closes the window without saving the changes" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
<html id="js"/> <html id="js"/>
</hbox> </hbox>
<button align="right" statustext="Delete this entry" label="Delete" id="button[delete]" onclick="return confirm('Delete this entry');"/> <button align="right" statustext="Delete this entry" label="Delete" id="button[delete]" onclick="return confirm('Delete this entry');" image="delete" background_image="1"/>
<button align="right" statustext="Restore this entry" label="Undelete" id="button[undelete]"/> <button align="right" statustext="Restore this entry" label="Undelete" id="button[undelete]" image="undelete" background_image="1"/>
</hbox> </hbox>
</row> </row>
</rows> </rows>

6
timesheet/templates/pixelegg/app.css
View File

@ -51,3 +51,9 @@
height: 16px; height: 16px;
width: 16px; width: 16px;
} }
#timesheet-edit #timesheet-edit_tabs {
padding: 0 3px;
}
#timesheet-edit #timesheet-edit_tabs .et2_tabheader {
background: none;
}

11
timesheet/templates/pixelegg/app.less
View File

@ -91,4 +91,15 @@
} // iframe } // iframe
} }
// timesheet-edit
#timesheet-edit{
#timesheet-edit_tabs{
padding: 0 3px;
.et2_tabheader{
background: none;
}
}
}
// //