forked from extern/egroupware
Pixelegg changes from Thursday
This commit is contained in:
Ralf Becker
parent
325c718201
commit
fadec23222
File diff suppressed because it is too large
Load Diff
@ -65,5 +65,4 @@
|
||||
|
||||
//
|
||||
//
|
||||
|
||||
//
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.7 KiB |
@ -8,6 +8,7 @@
|
||||
* @version $Id: class.pixelegg_framework.inc.php 2741 2013-11-14 13:53:24Z ralfbecker $
|
||||
*/
|
||||
|
||||
//open
|
||||
function show_pixelegg_header(_toggle, _delay)
|
||||
{
|
||||
$j("#egw_fw_header").slideToggle();
|
||||
@ -22,6 +23,7 @@ function show_pixelegg_header(_toggle, _delay)
|
||||
$j(_toggle).parent().addClass("slideup");
|
||||
}
|
||||
|
||||
//closed
|
||||
function hide_pixelegg_header(_toggle, _delay)
|
||||
{
|
||||
$j("#egw_fw_header").slideToggle();
|
||||
@ -29,7 +31,7 @@ function hide_pixelegg_header(_toggle, _delay)
|
||||
$j("#egw_fw_topmenu_info_items").show();
|
||||
$j("#egw_fw_logout").show();
|
||||
$j("#egw_fw_print").show();
|
||||
// $j("#egw_fw_tabs").animate({'margin-top':'-13px'},_delay);
|
||||
$j("#egw_fw_tabs").animate({'margin-top':'1px'},_delay);
|
||||
$j("#egw_fw_topmenu_info_items").animate({
|
||||
"bottom": "3px",
|
||||
"right": "5px",
|
||||
|
||||
Binary file not shown.
@ -10,6 +10,10 @@
|
||||
@import (reference) "./def_buttons.less";
|
||||
@import (less) "../../etemplate/templates/default/etemplate2.css";
|
||||
|
||||
|
||||
|
||||
@media all {
|
||||
|
||||
/**
|
||||
* Top level
|
||||
*/
|
||||
@ -928,55 +932,60 @@ div.message.floating {
|
||||
border: none !important;
|
||||
border-color: @gray-100;
|
||||
background-image: none !important;
|
||||
border-top-right-radius: 15px;
|
||||
border-bottom-right-radius: 15px;
|
||||
height: 37px;
|
||||
.border-radius (15px, 3px, 0px, 0px);
|
||||
|
||||
.et2_label {
|
||||
|
||||
font-size: 0.9em;
|
||||
padding: 0.2em;
|
||||
|
||||
|
||||
select {
|
||||
.Complete_Button_select;
|
||||
margin-left: 2px;
|
||||
margin-right: 1px;
|
||||
margin-top: 6px;
|
||||
|
||||
font-size: 1.2em;
|
||||
max-width: 14% !important;
|
||||
height: 25px;
|
||||
/*top: 8px;*/
|
||||
/*padding: 5px 0px 0px 3px;*/
|
||||
|
||||
|
||||
&:hover{
|
||||
.Complete_Button_select_hover;
|
||||
}
|
||||
|
||||
&:after {}
|
||||
|
||||
/*Dialog - Addressbook - View */
|
||||
#infolog-index_cat_id,
|
||||
#infolog-index_filter {width: 50% !important;}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.nextmatch_header > .filters {
|
||||
select,
|
||||
input,
|
||||
button {
|
||||
height: 25px;
|
||||
padding: 0px 0px 0px 3px;
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Select Field
|
||||
|
||||
.nextmatch_header > .filters select {
|
||||
margin-right: 2ex;
|
||||
max-width: 15% !important;
|
||||
.Complete_Button_select;
|
||||
margin-right: 2ex;
|
||||
|
||||
&:hover{
|
||||
.Complete_Button_select_hover;
|
||||
}
|
||||
|
||||
/*Dialog - Addressbook - View */
|
||||
#infolog-index_cat_id,
|
||||
#infolog-index_filter {width: 50% !important;}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
// Select -> Option
|
||||
|
||||
.nextmatch_header > .filters > select > option {font-size: 0.9em;}
|
||||
|
||||
|
||||
|
||||
|
||||
// Search Field
|
||||
|
||||
.nextmatch_header > .filters input[type=search] { .background-color-search;}
|
||||
.nextmatch_header > .filters input[type=search] {
|
||||
.background-color-search;
|
||||
color: black;
|
||||
/*height: 25px;*/
|
||||
float: left;
|
||||
}
|
||||
|
||||
.nextmatch_header > .filters button.et2_button {
|
||||
.Complete_Button_search_action;
|
||||
|
||||
|
||||
float: left;
|
||||
|
||||
&:hover{
|
||||
.box_shadow_standard_light_hover;
|
||||
/* .Complete_Button_search_action_hover;*/
|
||||
@ -1047,6 +1056,23 @@ div.message.floating {
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
|
||||
/*################################################################
|
||||
*
|
||||
* Kategorien
|
||||
*
|
||||
################################################################*/
|
||||
|
||||
/*ADD Button*/
|
||||
#admin-categories-index_add {
|
||||
|
||||
.Complete_Button_add;
|
||||
|
||||
&:hover {.Complete_Button_add_hover};
|
||||
|
||||
}
|
||||
|
||||
#admin-categories-index_filter {top: 8px;}
|
||||
|
||||
/*################################################################
|
||||
*
|
||||
* Favorites
|
||||
@ -1136,36 +1162,6 @@ div.message.floating {
|
||||
|
||||
} // dropdown
|
||||
|
||||
/* // Liste
|
||||
ul{
|
||||
|
||||
border-color: @gray-30;
|
||||
.background-color-0-gray;
|
||||
.color-100-gray;
|
||||
li{
|
||||
.background-color-0-gray;
|
||||
|
||||
&:hover {.background-color-10-gray;}
|
||||
a {
|
||||
|
||||
height: 40px;
|
||||
border: none;
|
||||
|
||||
img {height: 16px; width: 16px;}
|
||||
}
|
||||
|
||||
a:hover {
|
||||
background: none;
|
||||
text-indent: -22px;
|
||||
margin-left: 21px;
|
||||
height: 40px;
|
||||
|
||||
}
|
||||
}
|
||||
li#blank {}
|
||||
li#add { }
|
||||
|
||||
}*/
|
||||
|
||||
|
||||
/* Favorites */
|
||||
@ -1657,4 +1653,24 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button {
|
||||
.ms-res-ctn {
|
||||
overflow-x: hidden;
|
||||
}
|
||||
//
|
||||
|
||||
|
||||
} // Ende Media all
|
||||
|
||||
/*#################################### Media Queries #####################################################*/
|
||||
|
||||
@media only screen and (min-width: 980px) and (max-width: 1279px) {
|
||||
|
||||
.nextmatch_header > .filters select { margin: 0px;}
|
||||
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 760px) and (max-width: 979px) {
|
||||
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 320px) and (max-width: 759px) {
|
||||
|
||||
}
|
||||
|
||||
//
|
||||
Binary file not shown.
Binary file not shown.
@ -18,24 +18,6 @@
|
||||
*
|
||||
*
|
||||
*/
|
||||
#login-bg {
|
||||
background-image: url("../images/login/jp-mountain-blue-sun.jpg") !important;
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
height: 120%;
|
||||
position: fixed;
|
||||
width: 120%;
|
||||
z-index: -1;
|
||||
}
|
||||
#login-bg img {
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
margin: auto;
|
||||
min-height: 50%;
|
||||
min-width: 50%;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
#loginMainDiv {
|
||||
padding: 0px;
|
||||
min-height: 720px;
|
||||
@ -55,16 +37,43 @@
|
||||
top: 1px;
|
||||
}
|
||||
#loginMainDiv div#centerBox {
|
||||
margin: 0 auto;
|
||||
width: 444px;
|
||||
background-color: #ffc200;
|
||||
z-index: 100;
|
||||
padding-left: 40%;
|
||||
-webkit-border-top-right-radius: 5px;
|
||||
-webkit-border-bottom-right-radius: 5px;
|
||||
-webkit-border-bottom-left-radius: 5px;
|
||||
-webkit-border-top-left-radius: 25px;
|
||||
-moz-border-radius-topright: 5px;
|
||||
-moz-border-radius-bottomright: 5px;
|
||||
-moz-border-radius-bottomleft: 5px;
|
||||
-moz-border-radius-topleft: 25px;
|
||||
border-top-right-radius: 5px;
|
||||
border-bottom-right-radius: 5px;
|
||||
border-bottom-left-radius: 5px;
|
||||
border-top-left-radius: 25px;
|
||||
-moz-background-clip: padding-box;
|
||||
-webkit-background-clip: padding-box;
|
||||
background-clip: padding-box;
|
||||
border-top: solid 1px #0c5da5;
|
||||
border-left: solid 1px #0c5da5;
|
||||
border-right: solid 1px #0c5da5;
|
||||
border-bottom: solid 1px #0c5da5;
|
||||
}
|
||||
#loginMainDiv div#centerBox #loginScreenMessage {
|
||||
position: relative;
|
||||
top: 400px;
|
||||
margin: 1em;
|
||||
}
|
||||
#loginMainDiv div#centerBox #loginCdMessage {
|
||||
margin-bottom: 1em;
|
||||
margin-left: 40%;
|
||||
margin: 1em;
|
||||
-webkit-border-radius: 3px;
|
||||
-webkit-border-top-left-radius: 20px;
|
||||
-moz-border-radius: 3px;
|
||||
-moz-border-radius-topleft: 20px;
|
||||
border-radius: 3px;
|
||||
border-top-left-radius: 20px;
|
||||
color: red;
|
||||
text-align: center;
|
||||
}
|
||||
#loginMainDiv div#centerBox #loginCdMessage span {
|
||||
padding: 0.5em;
|
||||
@ -73,6 +82,9 @@
|
||||
text-shadow: -1px -1px 0px #101010, 1px 1px 0px #505050;
|
||||
width: 100%;
|
||||
}
|
||||
#loginMainDiv div#centerBox form {
|
||||
margin: 1em;
|
||||
}
|
||||
#loginMainDiv div#centerBox form table.divLoginbox {
|
||||
-webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
|
||||
-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
|
||||
|
||||
Binary file not shown.
@ -20,7 +20,7 @@
|
||||
border-width: 9px 0px 0px 9px;
|
||||
border-style: solid;
|
||||
border-color: @gray-30;
|
||||
.background-color-25-gray;
|
||||
.background-color-30-gray;
|
||||
|
||||
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
@import "def_buttons.less";
|
||||
@import (reference) "def_buttons.less";
|
||||
|
||||
//############## Layout ########################################################################################
|
||||
|
||||
@ -271,6 +271,7 @@
|
||||
white-space: nowrap;
|
||||
float: right;
|
||||
display: flex;
|
||||
height: 16px;
|
||||
.topmenu_info_item {
|
||||
|
||||
// Info Bell
|
||||
@ -563,7 +564,7 @@
|
||||
position: absolute;
|
||||
// background-color: RGB(200, 200, 255);
|
||||
.background-color-30-gray;
|
||||
width: 4px;
|
||||
width: 5px;
|
||||
top: 60px;
|
||||
bottom: 3px;
|
||||
right: 0px;
|
||||
@ -576,7 +577,7 @@
|
||||
background-repeat: no-repeat;
|
||||
.background-color-30-gray;
|
||||
position: absolute;
|
||||
/* width: 95px;*/
|
||||
width: 5px;
|
||||
height: 100%;
|
||||
cursor: col-resize;
|
||||
}
|
||||
@ -599,7 +600,6 @@
|
||||
border-top-width: 0;
|
||||
border-left: 0px solid;
|
||||
border-bottom: 0px solid;
|
||||
|
||||
margin-left: 4px;
|
||||
margin-top: 0px;
|
||||
padding-bottom: 5px;
|
||||
@ -607,13 +607,19 @@
|
||||
padding-top: 14px;
|
||||
margin-right: 5px;
|
||||
min-height: 50px;
|
||||
img { height: 16px; width: 16px}
|
||||
img { height: 16px; width: 16px;vertical-align: middle;}
|
||||
&:hover {
|
||||
.background-color-0-gray;
|
||||
border-color: @gray-50;
|
||||
}
|
||||
|
||||
|
||||
input#uical_select_owner_multiple{
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
select#calendar_filter{
|
||||
margin-top: 4px;
|
||||
}
|
||||
// Favoriten anlegen und löschen
|
||||
.sidebox-favorites{} // ist in etemplate2.less definiert
|
||||
|
||||
@ -923,31 +929,23 @@ div#calendar-container {
|
||||
// ############################################################
|
||||
// Tabnavigation
|
||||
// Statusmeldung
|
||||
// definiert in def_messages.less
|
||||
// definiert in layout_messages.less
|
||||
// .egw_fw_ui_app_header_container { }
|
||||
|
||||
|
||||
|
||||
// ############################################################
|
||||
// # # # # # # # # # ####
|
||||
// ######################tabs header ##########################
|
||||
// # # # # # # # # # ####
|
||||
// # # # # # # # # # ####
|
||||
// # tab header # # # # # # # ####
|
||||
// # # # # # # # # # ####
|
||||
// ############################################################
|
||||
// Div um Tabs
|
||||
|
||||
.egw_fw_ui_tabs_header {
|
||||
.border-radius(5px,0, 0, 5px);
|
||||
margin: 0;
|
||||
|
||||
-moz-border-radius-topright: 5px;
|
||||
-webkit-border-top-right-radius: 5px;
|
||||
-moz-border-radius-topleft: 5px;
|
||||
-webkit-border-top-left-radius: 5px;
|
||||
border-top-right-radius: 5px;
|
||||
border-top-left-radius: 5px;
|
||||
|
||||
|
||||
margin: -1px 0 0 0;
|
||||
|
||||
padding: 0px 5px 0px 5px;
|
||||
|
||||
background-position: bottom;
|
||||
@ -988,12 +986,14 @@ div#calendar-container {
|
||||
padding-right: 0;
|
||||
position: relative;
|
||||
|
||||
-moz-border-radius-topright:3px;
|
||||
.border-radius(5px,0, 0, 5px);
|
||||
|
||||
/* -moz-border-radius-topright:3px;
|
||||
-webkit-border-top-right-radius:3px;
|
||||
-moz-border-radius-topleft:3px;
|
||||
-webkit-border-top-left-radius:3px;
|
||||
border-top-right-radius:3px;
|
||||
border-top-left-radius:3px;
|
||||
border-top-left-radius:3px;*/
|
||||
|
||||
.background-color-5-gray;
|
||||
display: inline-block;
|
||||
@ -1089,11 +1089,9 @@ div#calendar-container {
|
||||
|
||||
|
||||
width: 100%;
|
||||
padding: 0;
|
||||
padding: 0px;
|
||||
margin: 0;
|
||||
/* border-width: 0px 5px 0px 1px;
|
||||
border-style: solid;
|
||||
border-color: @gray-30;*/
|
||||
overflow: auto;
|
||||
|
||||
|
||||
> div {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user