From 6688723a77795420c3cde537e7c8095171e989b6 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 18 Jan 2014 08:12:05 +0000 Subject: [PATCH] pixelegg changes from yesterday --- calendar/templates/pixelegg/app.css | 13 +++++++++---- calendar/templates/pixelegg/app.less | 16 +++++++++------- filemanager/templates/pixelegg/app.css | 16 ++++++++++------ filemanager/templates/pixelegg/app.less | 16 ++++++++++------ 4 files changed, 38 insertions(+), 23 deletions(-) diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index a91a2cb15c..cfa358217f 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -687,12 +687,17 @@ div.calendar { background_color: #408dd2; /*padding: 2px 0px 0px 2px;*/ } +.calendar tbody tr, +.calendar tbody td { + border: 1px; +} .calendar tbody .day { /* Cells containing month days dates */ - width: 2em; + /*width: 2em;*/ color: #456; text-align: right; padding: 2px 4px 2px 2px; + /*border: 1px;*/ } .calendar tbody .day.othermonth { font-size: 80%; @@ -721,7 +726,7 @@ div.calendar { .calendar tbody td.selected { /* Cell showing today date */ font-weight: bold; - border: 0px solid #000; + border: 1px solid #000; padding: 1px 3px 1px 1px; background: #fff; color: #000; @@ -735,7 +740,7 @@ div.calendar { } .calendar tbody td.today { /* Cell showing selected date */ - font-weight: bold; + font-weight: normal; color: #00f; } .calendar tbody .disabled { @@ -1714,7 +1719,7 @@ tr.prefRow > td { right: 55%; display: none; width: 33%; - background-color: rgba(103, 159, 210, 0.1); + background-color: #ffffff; } tr.prefRow:hover .prefHelp { display: block; diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index 7f5aadb760..e2b6b7b687 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -110,8 +110,6 @@ div.calendar { position: relative; } .calendar{ - - .button { /* "<<", "<", ">", ">>" buttons have this class */ text-align: center; /* They are the navigation buttons */ padding: 2px; /* Make the buttons seem like they're pressing */ @@ -121,7 +119,7 @@ div.calendar { position: relative; } .background_table_cal_head; } - + thead { .title { /* This holds the current "month, year" */ @@ -173,11 +171,15 @@ div.calendar { position: relative; } /* The body part -- contains all the days in month. */ tbody { + + tr, td {border: 1px;} + .day { /* Cells containing month days dates */ - width: 2em; + /*width: 2em;*/ color: #456; text-align: right; padding: 2px 4px 2px 2px; + /*border: 1px;*/ } .day.othermonth { @@ -210,7 +212,7 @@ div.calendar { position: relative; } td.selected { /* Cell showing today date */ font-weight: bold; - border: 0px solid #000; + border: 1px solid #000; padding: 1px 3px 1px 1px; background: #fff; color: #000; @@ -222,7 +224,7 @@ div.calendar { position: relative; } } td.today { /* Cell showing selected date */ - font-weight: bold; + font-weight: normal; color: #00f; } @@ -1226,7 +1228,7 @@ tr.prefRow > td { right: 55%; display: none; width: 33%; - background-color: @color_hint; + background-color: @color_tooltip; } tr.prefRow:hover .prefHelp { diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css index 487aba80ed..ed5020c5b2 100755 --- a/filemanager/templates/pixelegg/app.css +++ b/filemanager/templates/pixelegg/app.css @@ -190,7 +190,7 @@ div.filemanager_navigation > label { left: 0px; right: 30%; position: relative;*/ - top: -5px; + top: -15px; float: left; position: absolute; right: 0; @@ -205,15 +205,16 @@ div.filemanager_navigation > label > input { } #filemanager-index .et2_file { /*background-color: @egw_color_2_a;*/ + height: 24px; } #filemanager-index .et2_file:before { content: "+"; - font-size: 2em; + font-size: 25px; color: #ffc200; - line-height: 0.6em; + line-height: 40px; padding-right: 0em; position: relative; - top: 15px; + top: -8px; background-color: #0c5da5; -webkit-border-radius: 3px; -webkit-border-top-left-radius: 10px; @@ -240,9 +241,10 @@ div.filemanager_navigation > label > input { } #filemanager-index .et2_file input#filemanager-index_upload { margin-left: 2em; + margin-right: -2em; position: relative; - top: -8px; - width: 250px; + top: -39px; + width: 217px; } #filemanager-index .et2_file div.progress { width: 0px; @@ -250,6 +252,8 @@ div.filemanager_navigation > label > input { #filemanager-index #filemanager-index_tarp { width: 32px !important; height: 32px !important; + position: relative; + top: 13px; } #filemanager-index .filters { vertical-align: center; diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less index c5626b33cd..1af8e1e7bd 100644 --- a/filemanager/templates/pixelegg/app.less +++ b/filemanager/templates/pixelegg/app.less @@ -87,7 +87,7 @@ div.filemanager_navigation > label { left: 0px; right: 30%; position: relative;*/ - top: -5px; + top: -15px; float: left; position: absolute; @@ -111,15 +111,16 @@ div.filemanager_navigation > label > input { .et2_file{ /*background-color: @egw_color_2_a;*/ + .dimension_height_m; &:before { content: "+"; - font-size: 2em; + font-size: 25px; color: #ffc200; - line-height: 0.6em; + line-height: 40px; padding-right: 0em; position: relative; - top: 15px; + top: -8px; background-color: @egw_color_2_a; .border_radius_button_lefttop; } @@ -130,9 +131,10 @@ div.filemanager_navigation > label > input { input#filemanager-index_upload { margin-left: 2em; + margin-right: -2em; position: relative; - top: -8px; - width: 250px; + top: -39px; + width: 217px; } @@ -146,6 +148,8 @@ div.filemanager_navigation > label > input { #filemanager-index_tarp { width: 32px !important; height: 32px !important; + position: relative; + top: 13px; }