extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

pixelegg changes from Tuesday

Browse Source
This commit is contained in:
Ralf Becker 2014-02-12 08:10:11 +00:00
parent 55a7d7352e
commit f99ae4af0d
9 changed files with 123 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,7 +196,7 @@ fieldset.emailGroup {
-moz-appearance: none;
appearance: none;
cursor: pointer;
height: 32px;
height: 24px;
margin-top: 0;
}
div#addressbook-index div.et2_hbox_left select#addressbook-index_org_view:hover {
@ -221,7 +221,7 @@ fieldset.emailGroup {
-moz-appearance: none;
appearance: none;
cursor: pointer;
height: 32px;
height: 24px;
margin-left: 5px;
}
div#addressbook-index div.et2_hbox_right select.et2_selectbox:hover {
@ -258,13 +258,13 @@ fieldset.emailGroup {
-moz-transition-timing-function: linear;
-o-transition-timing-function: linear;
transition-timing-function: linear;
background-color: #e6e6e6;
background-color: #b4b4b4;
padding-left: 30px !important;
background-position: 6px center !important;
background-repeat: no-repeat !important;
background-size: 20px auto !important;
width: auto;
height: 32px;
/*.Button_size_h32_auto;*/
height: 24px;
background-image: url('../../../pixelegg/images/advanced-search.png') !important;
padding-left: 0px;
}
@ -288,16 +288,16 @@ fieldset.emailGroup {
-moz-transition-timing-function: linear;
-o-transition-timing-function: linear;
transition-timing-function: linear;
background-color: #e6e6e6;
background-color: #b4b4b4;
padding-left: 30px !important;
background-position: 6px center !important;
background-repeat: no-repeat !important;
background-size: 20px auto !important;
width: auto;
height: 32px;
/*.Button_size_h32_auto;*/
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
height: 24px;
}
div#addressbook-index div.et2_hbox_right button#addressbook-index_search:focus {
background-image: url('../../../pixelegg/images/advanced-search.png');
@ -319,16 +319,16 @@ fieldset.emailGroup {
-moz-transition-timing-function: linear;
-o-transition-timing-function: linear;
transition-timing-function: linear;
background-color: #e6e6e6;
background-color: #b4b4b4;
padding-left: 30px !important;
background-position: 6px center !important;
background-repeat: no-repeat !important;
background-size: 20px auto !important;
width: auto;
height: 32px;
/*.Button_size_h32_auto;*/
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
height: 24px;
}
div#addressbook-index div.et2_hbox_right button#addressbook-index_add {
width: 32px;
@ -337,6 +337,7 @@ fieldset.emailGroup {
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
padding: -0.5em;
background-color: #679fd2 !important;
height: 24px;
}
div#addressbook-index div.et2_hbox_right button#addressbook-index_add:before {
content: "";
@ -600,7 +601,7 @@ fieldset.emailGroup {
-moz-transition-timing-function: linear;
-o-transition-timing-function: linear;
transition-timing-function: linear;
background-color: #e6e6e6;
background-color: #b4b4b4;
}
div.addressbook_edit_general_picture img.photo:hover {
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@ -998,6 +999,7 @@ fieldset.emailGroup {
-moz-transition-timing-function: linear;
-o-transition-timing-function: linear;
transition-timing-function: linear;
background-color: #b4b4b4;
height: 3.1ex;
background-color: #e6e6e6;
}
@ -1144,13 +1146,12 @@ fieldset.emailGroup {
-moz-transition-timing-function: linear;
-o-transition-timing-function: linear;
transition-timing-function: linear;
background-color: #e6e6e6;
background-color: #b4b4b4;
padding-left: 30px !important;
background-position: 6px center !important;
background-repeat: no-repeat !important;
background-size: 20px auto !important;
width: auto;
height: 32px;
/*.Button_size_h32_auto;*/
height: 24px;
background-image: url('../images/edit.png');
}

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

@ -72,7 +72,7 @@ div#addressbook-index{
// Org View
select#addressbook-index_org_view{
.Complete_Button_select;
.dimension_height_l;
.dimension_height_m;
margin-top: 0;
&:hover{
.Complete_Button_select_hover;
@ -95,7 +95,7 @@ div#addressbook-index{
// Typ
select.et2_selectbox{
.Complete_Button_select;
.dimension_height_l;
.dimension_height_m;
margin-left: 5px;
&:hover{.Complete_Button_select_hover;}
@ -109,10 +109,11 @@ div#addressbook-index{
.color_100_gray;
.Complete_Button_text_icon_before;
.dimension_height_m;
background-image:url('../../../pixelegg/images/advanced-search.png') !important;
padding-left: 0px;
&:hover{ background-image:url('../../../pixelegg/images/advanced-search.png'); .Complete_Button_text_icon_before_hover;}
&:focus{ background-image:url('../../../pixelegg/images/advanced-search.png'); .Complete_Button_text_icon_before_active;}
&:hover{ background-image:url('../../../pixelegg/images/advanced-search.png'); .Complete_Button_text_icon_before_hover;.dimension_height_m;}
&:focus{ background-image:url('../../../pixelegg/images/advanced-search.png'); .Complete_Button_text_icon_before_active;.dimension_height_m;}
}
@ -120,7 +121,7 @@ div#addressbook-index{
button#addressbook-index_add{
.Complete_Button_add_only_plus;
.dimension_height_m;
&:hover {.Complete_Button_add_only_plus_hover;}
&:active {background-color: @color_positive_action_active !important;}

6
calendar/templates/default/edit.xet
View File

@ -63,10 +63,12 @@
</menulist>
<link-entry id="resource" options="@cal_resources"/>
</vbox>
<vbox options="0,0" span="2" valign="middle">
<textbox type="integer" align="center" id="quantity" min="1" size="3"/>
<menulist>
<menupopup class="selectRole" id="role"/>
</menulist>
</vbox>
<button align="center" label="Add" id="add" image="add" background_image="1"/>
<description/>
</row>
@ -294,7 +296,7 @@
<textbox id="title" needed="1" size="75" maxlength="255" tabindex="1" span="all"/>
</row>
<row class="dialog-header2" height="28">
<description for="start" value="Start" width="95"/>
<description for="start" value="Start" width="88"/>
<date-time id="start" needed="1" class="required"/>
<checkbox statustext="Event will occupy the whole day" label="whole day" id="whole_day" options=",, ,disable" span="all"/>
</row>
@ -309,7 +311,7 @@
<buttononly statustext="Find free timeslots where the selected participants are availible for the given timespan" label="Freetime search" id="freetime" onclick="app.calendar.freetime_search" image="add" background_image="1" span="all"/>
</row>
<row>
<tabbox id="tabs" height="300" span="all">
<tabbox id="tabs" height="246" span="all">
<tabs>
<tab id="description" label="Description" statustext="Full description"/>
<tab id="participants" label="Participants" statustext="Participants, Resources, ..."/>

32
calendar/templates/pixelegg/app.css
View File

@ -11,7 +11,7 @@
* @package calendar
* @version $Id$
*/
/* $Id: app.css 45602 2014-02-06 17:36:03Z ralfbecker $ */
/* $Id: app.css 45624 2014-02-10 08:53:42Z hnategh $ */
.calendar_inputFullWidth input {
width: 100%;
}
@ -940,7 +940,7 @@ div#calendar-edit .et2_tabheader {
background-color: transparent;
}
div#calendar-edit .et2_tabs {
min-height: 325px;
min-height: 246px;
}
div#calendar-edit .et2_tabcntr {
overflow-y: auto;
@ -954,7 +954,7 @@ div#calendar-edit #calendar-edit_whole_day {
}
div#calendar-edit label.et2_label#calendar-edit_calendar_edit_duration {
/*margin-left: 20px;*/
margin-right: 49px;
/*margin-right: 49px;*/
}
div#calendar-edit select#calendar-edit_duration {
width: 133px;
@ -1018,7 +1018,7 @@ div#calendar-edit #calendar-edit_calendar-edit-description .et2_hbox_right {
overflow-y: auto;
}
div#calendar-edit #calendar-edit_calendar-edit-description .et2_selectbox .ui-multiselect-checkboxes {
min-height: 290px;
min-height: 218px;
}
div#calendar-edit #calendar-edit_calendar-edit-description .et2_selectbox .ui-multiselect-checkboxes li {
text-indent: -20px;
@ -1047,13 +1047,13 @@ div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_
padding: 0.2em 0.5em;
}
div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_account {
width: 160px;
width: 143px;
}
div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_resource select {
width: 160px !important;
width: 143px !important;
}
div#calendar-edit #calendar-edit_calendar-edit-participants table#calendar-edit_participants #calendar-edit_resource input {
width: 160px !important;
width: 103px !important;
}
div#calendar-edit #calendar-edit_calendar-edit-participants tr.optional {
background-color: rgba(255, 221, 115, 0.1);
@ -1105,9 +1105,10 @@ div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-s
}
div#calendar-edit #calendar-edit_calendar-edit-participants tbody input#calendar-edit_quantity {
width: 30px;
position: relative;
top: 34px;
left: 40px;
/* position: relative;
top: 34px;
left: 40px;*/
margin: 6px 0px;
}
div#calendar-edit #calendar-edit_calendar-edit-participants tbody div#calendar-edit_resource {
margin: 5px 0 10px 0;
@ -1117,14 +1118,15 @@ div#calendar-edit #calendar-edit_calendar-edit-participants tbody div#calendar-e
}
div#calendar-edit #calendar-edit_calendar-edit-participants tbody select#calendar-edit_role {
/*width: 30px;*/
position: relative;
top: 6px;
left: -177px;
width: 135px;
/* position: relative;
top: 6px;
left: -168px;*/
width: 120px;
margin-top: 2px;
}
div#calendar-edit #calendar-edit_calendar-edit-participants tbody #calendar-edit_add {
position: relative;
left: -145px;
/*left: -145px;*/
top: 31px;
}
div#calendar-edit #calendar-edit_calendar-edit-recurrence tbody {

26
calendar/templates/pixelegg/app.less
View File

@ -415,7 +415,7 @@ div#calendar-edit{
background-color: transparent;
}
// Size for tabs
.et2_tabs {min-height: 325px;}
.et2_tabs {min-height: 246px;}
.et2_tabcntr {
@ -434,7 +434,7 @@ div#calendar-edit{
//duration
label.et2_label#calendar-edit_calendar_edit_duration{
/*margin-left: 20px;*/
margin-right: 49px;
/*margin-right: 49px;*/
}
select#calendar-edit_duration{width: 133px;}
@ -507,7 +507,7 @@ div#calendar-edit{
#calendar-edit_details_category{margin: 0 1em; width: 20em;}
.et2_hbox_right {overflow-y: auto;}
.et2_selectbox .ui-multiselect-checkboxes {min-height: 290px;}
.et2_selectbox .ui-multiselect-checkboxes {min-height: 218px;}
.et2_selectbox .ui-multiselect-checkboxes li {text-indent: -20px;}
//selectbox
@ -539,16 +539,16 @@ div#calendar-edit{
td {padding: 0.2em 0.5em;}
// User and Group
#calendar-edit_account{ width: 160px;}
#calendar-edit_account{ width: 143px;}
//Adress
#calendar-edit_resource {
select{
width: 160px !important;
width: 143px !important;
}
// Search
input{
width: 160px !important;
width: 103px !important;
}
}
@ -584,9 +584,10 @@ div#calendar-edit{
// Quantity
input#calendar-edit_quantity {
width: 30px;
position: relative;
/* position: relative;
top: 34px;
left: 40px;
left: 40px;*/
margin: 6px 0px;
}
@ -603,10 +604,11 @@ div#calendar-edit{
select#calendar-edit_role {
/*width: 30px;*/
position: relative;
/* position: relative;
top: 6px;
left: -177px;
width: 135px;
left: -168px;*/
width: 120px;
margin-top: 2px;
}
// hinzufügen button
@ -614,7 +616,7 @@ div#calendar-edit{
#calendar-edit_add {
position: relative;
left: -145px;
/*left: -145px;*/
top: 31px;
}

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

@ -730,6 +730,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
.egw_fw_ui_category_content #mail-index_buttonmailcreate button[id*="mailcreate"] {
color: #FFF;
text-shadow: none;
height: 24px;
/* height: auto;*/
background-image: none !important;
/*.border_radius_button_lefttop;*/
@ -1022,8 +1023,8 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
background-position: 6px center !important;
background-repeat: no-repeat !important;
background-size: 20px auto !important;
width: auto;
height: 32px;
/*.Button_size_h32_auto;*/
height: 24px;
background-image: url(images/attach.png) !important;
background-color: #fafafa;
height: 16px;

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

@ -1516,7 +1516,6 @@ div#toolbar-menulist{
button {
height: 24px !important;
img[src$="svg"]{
.gradient_vertical (@gray_60, @gray_60);
@ -1641,4 +1640,4 @@ div.mailDisplayHeaders div.mail_extraEmails.visible {
//
//
//

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

@ -3,6 +3,8 @@
*
* Please do NOT change app.css directly, instead change app.less and compile it!
*
* TIMESHEET
*
* @link http://www.egroupware.org
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
@ -16,9 +18,9 @@
}
#timesheet-index .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget,
#timesheet-index .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget {
/*background-color: @egw_color_blue_lighter !important;*/
color: #FFF;
text-shadow: none;
height: 24px;
/* height: auto;*/
background-image: none !important;
/*.border_radius_button_lefttop;*/
@ -51,16 +53,16 @@
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
}
#timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add {
width: 32px;
height: 32px;
width: 24px;
border: 1px solid rgba(0, 0, 0, 0.15);
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
padding: 0.5em;
background-color: #0c5da5 !important;
padding: -0.5em;
background-color: #679fd2 !important;
background-color: #0c5da5;
height: 24px;
}
#timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add:before {
content: "+";
content: "";
font-size: 2em;
color: #ffc200;
line-height: 0.6em;
@ -90,6 +92,27 @@
height: 16px;
width: 16px;
}
#timesheet-index table.egwGridView_outer tbody td .et2_link {
font-weight: bold;
}
/*###########################################
# #
# dialog-header #
#############################################
# #
# #
# #
# #
# #
# dialog #
# #
# #
#############################################
# #
# buttons #
# #
# #
##############################################*/
#timesheet-edit #timesheet-edit_tabs {
padding: 0 3px;
}

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

@ -3,6 +3,8 @@
*
* Please do NOT change app.css directly, instead change app.less and compile it!
*
* TIMESHEET
*
* @link http://www.egroupware.org
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
@ -56,6 +58,7 @@
button#timesheet-index_add{
.Complete_Button_add_only_plus;
background-color: @egw_color_2_a;
.dimension_height_m;
&:hover {.Complete_Button_add_only_plus_hover;}
&:active {background-color: @color_positive_action_active !important;}
@ -98,9 +101,38 @@
}
} //nextmatch_header
} // iframe
}
// Titel: in Bold
table.egwGridView_outer tbody td .et2_link {font-weight: bold;}
// iframe
}
/*###########################################
# #
# dialog-header #
#############################################
# #
# #
# #
# #
# #
# dialog #
# #
# #
#############################################
# #
# buttons #
# #
# #
##############################################*/
// timesheet-edit
#timesheet-edit{