diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml index aabb4be558db43c0ff38c105570c76972764471a..6546f17cb441e6e0a65018bfc3bb8d1eff0abfaf 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml @@ -12,7 +12,7 @@ </item> <item> <key> <string>_EtagSupport__etag</string> </key> - <value> <string>ts00281126.99</string> </value> + <value> <string>ts00797726.15</string> </value> </item> <item> <key> <string>__name__</string> </key> @@ -150,6 +150,14 @@ h3.handle span.handle {\n border-bottom: 1px solid #FFFFFF;\n }\n \n +/* Gadget container at bottom */\n +div#km_left div#wrapper_bottom {\n + border:0 none;\n + clear:left;\n + margin:10px;\n +}\n +\n +\n /* disable cursor for anonymous users */\n .portal-column-undraggable .handle{\n cursor: default;\n @@ -164,13 +172,10 @@ div.block fieldset label{\n display: block;\n }\n \n -.front_pad { /* This class is used to display gadgets in front page */\n +/* This class is used to display gadgets in front page */\n +.front_pad { \n margin: 0;\n - padding-top: 0px;\n - padding-bottom: 0px;\n - padding-left: 7px;\n - padding-right: 7px;\n - width: 936px; /* XXX-JPS Related to front splash and page width - should become dynamic */\n + padding:0 7px;\n }\n \n /* column gadget in bottom */\n @@ -566,7 +571,7 @@ div.portal-column-undraggable h3.handle span{\n \n /* Decrease padding for gadgets\' text */\n fieldset.gadget div.text{\n - padding: 3px;\n + padding: 3px 0;\n }\n \n /* Gadget Browser */\n @@ -644,9 +649,6 @@ div.gadget_advertisement{\n div.gadget-relations .listbox-head-title span{\n color: #000;\n }\n -div.gadget-relations .listbox-body{\n - padding-left:5px;\n -}\n \n div.gadget-relations div.listbox-head-navigation,\n div.gadget-relations .listbox-label-line{\n @@ -705,7 +707,7 @@ div.block fieldset.gadget-profile div.field{\n </item> <item> <key> <string>size</string> </key> - <value> <int>12176</int> </value> + <value> <int>12075</int> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/km.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/km.css.xml index 0cbf911d8ba9761a60ac6bcd76dc15cdf0bfcf5a..72e0f05f448bce4f6953b9f00d0c9ea4f34ec9cc 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/km.css.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/km.css.xml @@ -109,6 +109,7 @@ button {\n \n table {\n border: 1px solid #ecebe2;\n + font-size:9pt;\n }\n \n a:link, \n @@ -140,9 +141,13 @@ fieldset.hidden_fieldset { \n display: none;\n }\n \n +#main_content{\n + width:auto;\n +}\n +\n #mainwrapper {\n min-height: 100%;\n - width:952px;\n + width:1000px;\n margin: 0 auto;\n }\n \n @@ -167,10 +172,6 @@ fieldset.hidden_fieldset { \n padding-top: 5px;\n }\n \n -#main_form {\n - height:100%;\n -}\n -\n #wrapper_right{\n float: left;\n width:22.5%;\n @@ -179,7 +180,6 @@ fieldset.hidden_fieldset { \n padding-top: 4px;\n }\n \n -\n #km_left {\n float: left;\n width: 75%;\n @@ -196,14 +196,6 @@ fieldset.hidden_fieldset { \n width: auto;\n }\n \n -/* Gadget container at bottom */\n -div#km_left div#wrapper_bottom {\n - border:0 none;\n - clear:left;\n - font-size:0.7em;\n - margin:10px;\n -}\n -\n div#main_content fieldset.bottom label {\n display:none;\n }\n @@ -217,31 +209,6 @@ div#wrapper_headline div.header_title {\n width: auto;\n }\n \n -.content .field label, \n -.content .field .input {\n - width: 100%;\n - padding-left:10px;\n -}\n -\n -\n -.content .field label {\n - width:30%;\n - float:left;\n -}\n -\n -.content .error .input {\n - border:2px solid #FF4400;\n -}\n -\n -.content .field .error {\n - background-color:inherit;\n - color:#FF4400;\n -}\n -\n -fieldset.left{\n - overflow: hidden;\n -}\n -\n /* Top navigation */\n #menu {\n width:100%;\n @@ -459,7 +426,7 @@ div#mainwrapper div.wrapper div.gadget fieldset.widget legend{\n }\n \n #footer {\n - width:952px;\n + width:1000px; \n margin: 0 auto;\n }\n \n @@ -475,6 +442,30 @@ div#mainwrapper div.wrapper div.gadget fieldset.widget legend{\n }\n \n /* Forms */\n +.content .field label, \n +.content .field .input {\n + width: 100%;\n + padding-left:10px;\n +}\n +\n +.content .field label {\n + width:30%;\n + float:left;\n +}\n +\n +.content .error .input {\n + border:2px solid #FF4400;\n +}\n +\n +.content .field .error {\n + background-color:inherit;\n + color:#FF4400;\n +}\n +\n +fieldset.left{\n + overflow: hidden;\n +}\n +\n form p,\n .bottom_actions{\n margin:5px 0;\n @@ -691,26 +682,13 @@ div.actions button {\n right: 0;\n }\n \n -/* Search Popup window */\n -/*div.search_popup {\n - background-color: #FFFFFF;\n - border: 1px solid black;\n - display: none;\n - left: 500px;\n - padding: 10px;\n - position: fixed;\n - top: 130px;\n - width: 150px;\n - z-index: 100;\n -}*/\n -\n /* Download Document in various format widget */\n div.download-document-format-list-container{\n color:#000000;\n left:525px;\n top:0px;\n position:absolute;\n - z-index:200; /* Collapse menu z-index is 100 */\n + z-index:3; /* Collapse menu z-index is 1 */\n width:200px;\n }\n div.download-document-format-list-container span{\n @@ -964,16 +942,6 @@ table tbody tr td {\n -webkit-transition-timing-function: linear;\n }\n \n -.section, \n -.owner {\n - border-bottom: 1px solid #e9e9e9;\n - margin-right:5px;\n -}\n -\n -\n -\n -/* ## link styling ################################### start # */\n -\n #header a:link, #header a:active, #header a:visited {\n color:#fff;\n font-weight:bold;\n @@ -1015,12 +983,12 @@ table tbody tr td {\n background-position: 0 100%;\n }\n \n -#menu #login-logout-link:link, #menu #login-logout-link:active, #menu #login-logout-link:visited {\n +#login-logout-link:link, #login-logout-link:active, #login-logout-link:visited {\n background: url(km_img/login.gif) no-repeat transparent;\n background-position: 0 -3px;\n }\n \n -#menu #login-logout-link:hover {\n +#login-logout-link:hover {\n background-position: 0 -23px;\n }\n \n @@ -1030,28 +998,6 @@ table tbody tr td {\n \tbackground-position: 0 100%;\n }\n \n -/* Search pop up styling */\n -div.popup_row .reference{\n - color: inherit;\n -}\n -\n -/* Search listbox styling */\n -span.search_result_title{\n - color: #1111CC;\n -}\n -\n -span.search_result_portal_type{\n - color: inherit;\n -}\n -\n -span.found{\n - color: #000000;\n -}\n -\n -span.found em{\n - font-weight: bold;\n -}\n -\n /* workflow states colors*/\n .draft-state { \n color:#4574cb; \n @@ -1070,7 +1016,7 @@ span.found em{\n \n /* Collapse down navigation */\n #menu ul.nav li{\n - z-index:110;\n + z-index:1;\n }\n \n #menu ul.nav li a, #menu ul.nav li a:visited {\n @@ -1163,13 +1109,7 @@ span.found em{\n \n div.collapse-menu-root{\n display:block;\n - z-index:111;\n -}\n -\n -table tr td, \n -table tr th, \n -table tr th button {\n - font-size:9pt;\n + z-index:2;\n }\n \n div#wrapper_headline span.header_title {\n @@ -1177,12 +1117,6 @@ div#wrapper_headline span.header_title {\n font-weight:bold;\n }\n \n -a.section-link,\n -a.owner-link,\n -a.history-link{\n - margin-left: 5px;\n -}\n -\n /* Bottom toolbar */\n li.toolboxSection > div{\n bottom:0px;\n @@ -1359,6 +1293,9 @@ button.formbt > span{\n -webkit-box-shadow:4px 4px 4px rgba(0, 0, 0, 0.5);\n box-shadow:4px 4px 4px rgba(0, 0, 0, 0.5);\n }\n +#jquery_erp5_dialog h1 a{\n + display:none;\n +}\n \n </tal:block> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/km_listbox.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/km_listbox.css.xml index 334a83aac86291fe4863ed43037cfdafd6444aa0..962c0cfca705721da9e40fa9ca60ac492ee50346 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/km_listbox.css.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/km_listbox.css.xml @@ -112,7 +112,6 @@ div.listbox-action-widget span.image{\n height:20px;\n width:20px;\n margin-top:3px;\n - z-index:2;\n left:-3px;\n }\n \n @@ -288,6 +287,27 @@ span.found{\n padding-top: 5px;\n }\n \n +/* Search listbox pop up styling */\n +span.search_result_title{\n + color: #1111CC;\n +}\n +\n +span.found{\n + color: #000000;\n +}\n +\n +.section, \n +.owner {\n + border-bottom: 1px solid #e9e9e9;\n + margin-right:5px;\n +}\n +\n +a.section-link,\n +a.owner-link,\n +a.history-link{\n + margin-left: 5px;\n +}\n +\n div.search-details .reference-link,\n div.search-details .version,\n div.search-details .language{\n @@ -320,7 +340,6 @@ div.listbox-search-mode div.maximal-width{\n -moz-box-shadow:4px 4px 4px rgba(0, 0, 0, 0.5);\n -webkit-box-shadow:4px 4px 4px rgba(0, 0, 0, 0.5);\n min-height:180px;\n - z-index:5;\n } ]]></unicode> </value> diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index a10e1ce096a268911971e288eb26a427d5d6cea3..3d2b7eb6dfb50536d9d370f2ffded684d5a4ca9e 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1785 \ No newline at end of file +1786 \ No newline at end of file