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

pixelegg changes from today/Thursday

Browse Source
This commit is contained in:
Ralf Becker 2014-01-30 18:55:35 +00:00
parent 530e9d13e3
commit 90b00597b9
10 changed files with 189 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -975,10 +975,71 @@ fieldset.emailGroup {
height: 150px;
}
div#addressbook-edit_addressbook-edit-links div#addressbook-edit_link_to {
width: 100% !important;
width: 550px;
}
div#addressbook-edit_addressbook-edit-links div#addressbook-edit_link_to input {
width: 86%;
}
div#addressbook-edit_addressbook-edit-links div#addressbook-edit_link_to button {
border: 1px solid rgba(0, 0, 0, 0.15);
/*.box_shadow_standard_light;*/
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
color: #000000;
-webkit-transition-property: background-color;
-moz-transition-property: background-color;
-o-transition-property: background-color;
transition-property: background-color;
-webkit-transition-duration: 0.5s;
-moz-transition-duration: 0.5s;
-o-transition-duration: 0.5s;
transition-duration: 0.5s;
-webkit-transition-timing-function: linear;
-moz-transition-timing-function: linear;
-o-transition-timing-function: linear;
transition-timing-function: linear;
height: 3.1ex;
background-color: #e6e6e6;
}
div#addressbook-edit_addressbook-edit-links div#addressbook-edit_link_to button background-image[src$="svg"] {
background-color: #b4b4b4;
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4);
background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4));
background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4);
background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4);
background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
background-repeat: repeat-x;
}
div#addressbook-edit_addressbook-edit-links div#addressbook-edit_link_to button:hover {
/*background-color: @gray_30;*/
text-shadow: 0px 0px;
color: #ffffff;
-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);
background-color: #1aa200;
background-size: 20px 20px;
}
div#addressbook-edit_addressbook-edit-links div#addressbook-edit_link_to button:active {
-webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
-moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
}
div#addressbook-edit_addressbook-edit-links div#addressbook-edit_link_to div#addressbook-edit_link_to_link_entry {
margin: 1em;
margin-top: 11px;
width: 100%;
/*div.et2_link_entry {*/
/*}*/
}
div#addressbook-edit_addressbook-edit-links div#addressbook-edit_link_to div#addressbook-edit_link_to_link_entry select {
width: 39%;
}
div#addressbook-edit_addressbook-edit-links div#addressbook-edit_link_to div#addressbook-edit_link_to_link_entry input.ui-autocomplete-input {
width: 56%;
padding-bottom: 1px;
}
div#addressbook-edit_addressbook-edit-links div#addressbook-edit_link_to img.et2_button_icon {
/*.background_color_10_gray;*/

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

@ -781,12 +781,53 @@ div#addressbook-edit_addressbook-edit-links {
/*neue verknüpfung erstellen - div*/
div#addressbook-edit_link_to {
width: 100% !important;
width: 550px;
// Comment
input {width: 86%;}
// Button
button {
.Complete_Button_normal;
height: 3.1ex;
background-color: @gray_10;
background-image[src$="svg"]{.gradient_vertical (@gray_30, @gray_30);}
&:hover{
/*background-color: @gray_30;*/
text-shadow: 0px 0px;
color: @gray_0;
.box_shadow_standard_light_hover;
background-color: @color_positive_action_active;
background-size: 20px 20px;
}
&:active {.box_shadow_standard_light_active !important;}
}
div#addressbook-edit_link_to_link_entry{
margin-top: 11px;
width: 100%;
// 1. with Addressbook
div#addressbook-edit_link_to_link_entry{ margin: 1em;}
// APP Selector
/*div.et2_link_entry {*/
select {width: 39%;}
// Input Field
input.ui-autocomplete-input {
width: 56%;
padding-bottom: 1px;
}
/*}*/
}
// 2. Icon
img.et2_button_icon {

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

@ -11,7 +11,7 @@
* @package calendar
* @version $Id$
*/
/* $Id: app.css 44987 2014-01-07 10:34:11Z hnategh $ */
/* $Id: app.css 45378 2014-01-24 16:04:11Z hnategh $ */
.calendar_inputFullWidth input {
width: 100%;
}
@ -543,6 +543,21 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
margin: -2px -1px 0px -2px;
width: 410px;
}
/**
* Calendar Drag and Drop
*
*/
.calendar_d-n-d_forbiden {
background-color: red;
height: 100%;
width: 100%;
text-align: center;
}
.calendar_d-n-d_timeCounter {
font-size: 1.1em;
font-weight: bold;
text-align: center;
}
.egw_fw_ui_category_content {
padding-left: 0px !important;
}
@ -888,15 +903,19 @@ div#calendar-edit .chzn-container {
div#calendar-edit .et2_tabheader {
background-color: transparent;
}
div#calendar-edit .et2_tabs {
min-height: 325px;
}
div#calendar-edit .et2_tabcntr {
height: 299px;
overflow: auto;
overflow-y: auto;
}
div#calendar-edit .et2_tabcntr table.et2_grid tr:nth-child(even) {
background: #ffffff;
/*background: @color_even;*/
line-height: 20px;
}
div#calendar-edit .et2_tabcntr table.et2_grid tr:nth-child(odd) {
background: #fafafa;
/*background: @color_odd;*/
line-height: 44px;
}
div#calendar-edit #calendar-edit_calendar-edit-general {
display: block;
@ -904,7 +923,7 @@ div#calendar-edit #calendar-edit_calendar-edit-general {
width: 100%;
}
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid {
width: 72% !important;
width: 60% !important;
/* button#calendar-edit_freetime {background-image: url('images/add.png') !important;}*/
}
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid td {
@ -921,7 +940,17 @@ div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid input#cale
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid .et2_date {
float: left;
}
div#calendar-edit #calendar-edit_calendar-edit-general .et2_hbox_right {
overflow-y: auto;
}
div#calendar-edit #calendar-edit_calendar-edit-general .et2_selectbox .ui-multiselect-checkboxes {
min-height: 290px;
}
div#calendar-edit #calendar-edit_calendar-edit-general .et2_selectbox .ui-multiselect-checkboxes li {
text-indent: -20px;
}
div#calendar-edit #calendar-edit_calendar-edit-general #calendar-edit_category {
min-height: 310px;
border: 1px solid;
border-color: #b4b4b4;
-webkit-border-radius: 3px;

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

@ -408,16 +408,23 @@ div#calendar-edit{
.et2_tabheader{
background-color: transparent;
}
// Size for tabs
.et2_tabs {min-height: 325px;}
// Size for tabs
.et2_tabcntr {
height: 299px;
overflow: auto;
overflow-y: auto;
table.et2_grid {
// Listendarstellung
tr:nth-child(even) {background: @color_even;}
tr:nth-child(odd) {background: @color_odd;}
tr:nth-child(even) {
/*background: @color_even;*/
line-height: 20px;
}
tr:nth-child(odd) {
/*background: @color_odd;*/
line-height: 44px;
}
}
}
@ -433,7 +440,7 @@ div#calendar-edit{
width: 100%;
table.et2_grid{
width: 72% !important;
width: 60% !important;
td {
padding: 4px;
@ -453,18 +460,38 @@ div#calendar-edit{
}
}
// Kategorien
.et2_hbox_right {overflow-y: auto;}
.et2_selectbox .ui-multiselect-checkboxes {min-height: 290px;}
.et2_selectbox .ui-multiselect-checkboxes li {text-indent: -20px;}
//selectbox
#calendar-edit_category{
min-height: 310px;
border: 1px solid;
border-color: @gray_30;
.border_radius_button_normal;
li{
.ui-state-hover{
font-weight: normal !important;
.box_shadow_standard_light_hover;
}
}
}
}

4
importexport/templates/default/definition_index.xet
View File

@ -90,8 +90,8 @@
<checkbox label="%s All users" id="all_users"/>
<listbox type="select-account" id="allowed" rows="5" options="groups"/>
<hbox>
<button label="Save" onclick="nm_submit_popup(this); return false;"/>
<buttononly label="Cancel" onclick="nm_hide_popup(this,'allowed_popup');"/>
<button label="Save" onclick="nm_submit_popup(this); return false;" image="save" background_image="1"/>
<buttononly label="Cancel" onclick="nm_hide_popup(this,'allowed_popup');" image="cancel" background_image="1"/>
</hbox>
</vbox>
</box>

2
importexport/templates/default/export_dialog.xet
View File

@ -11,7 +11,7 @@
<row>
<description span="all"/>
</row>
<row class="select_appname">
<row class="select_appname ">
<description value="Select application"/>
<menulist>
<menupopup id="appname" no_lang="1" onchange="1"/>

4
importexport/templates/default/import_definition.xet
View File

@ -15,8 +15,8 @@
</row>
<row>
<hbox>
<button label="Import" id="import"/>
<button label="Update default-definitions" id="update"/>
<button label="Import" id="import" image="import" background_image="1"/>
<button label="Update default-definitions" id="update" image="update" background_image="1"/>
</hbox>
</row>
</rows>

6
importexport/templates/default/import_dialog.xet
View File

@ -48,9 +48,9 @@
</row>
<row>
<hbox span="all">
<button label="Import" id="import" onclick="app.importexport.import_preview"/>
<button label="Cancel" id="cancel" onclick="window.close();"/>
<checkbox align="right" label="No notifications" id="no_notifications"/>
<button label="Import" id="import" onclick="app.importexport.import_preview" image="import" background_image="1"/>
<button label="Cancel" id="cancel" onclick="window.close();" image="cancel" background_image="1"/>
<checkbox align="right" label="No notifications" id="no_notifications" />
<checkbox align="right" label="Test only" id="dry-run"/>
</hbox>
</row>

2
importexport/templates/default/wizard_chooseapp.xet
View File

@ -7,7 +7,7 @@
<column/>
</columns>
<rows>
<row>
<row class="dialog-header">
<description id="msg" no_lang="1"/>
</row>
<row>

10
importexport/templates/default/wizardbox.xet
View File

@ -17,14 +17,14 @@
</vbox>
</hbox>
</row>
<row valign="bottom">
<row valign="bottom" class="dialog-footer-toolbar">
<hbox span="all">
<hbox>
<button label="previous" id="button[previous]"/>
<button label="next" id="button[next]"/>
<button label="finish" id="button[finish]"/>
<button label="previous" id="button[previous]" image="previous" background_image="1"/>
<button label="next" id="button[next]" image="next" background_image="1"/>
<button label="finish" id="button[finish]" image="finish" background_image="1"/>
</hbox>
<button align="right" label="cancel" id="button[cancel]" onclick="window.close(); return false;"/>
<button align="right" label="cancel" id="button[cancel]" onclick="window.close(); return false;" image="cancel" background_image="1"/>
</hbox>
</row>
</rows>