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 2d9e53b78242c082f991ecd47d30302934434cf1..aabb4be558db43c0ff38c105570c76972764471a 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>ts00187260.45</string> </value> + <value> <string>ts00281126.99</string> </value> </item> <item> <key> <string>__name__</string> </key> @@ -373,12 +373,40 @@ a.block-edit-form{\n margin-top: 4px;\n }\n \n +a.block-refresh { \n + background-position: 0 0;\n +}\n +\n +a.block-minimize { \n + background-position: -17px 0;\n +}\n +\n +a.block-remove { \n + background-position: -34px 0;\n +}\n +\n +a.block-edit-form { \n + background-position: -51px 0;\n +}\n +\n +a.block-minimize:hover { \n + background-position: -17px 100%;\n +}\n +\n +a.block-remove:hover { \n + background-position: -34px 100%;\n +}\n +\n +a.block-edit-form:hover { \n + background-position: -51px 100%;\n +}\n +\n +\n /* Style for showing movement between gadget columns */\n div.block-hover {\n border: 2px dashed #f00;\n }\n \n -\n /* Gadget layout */\n .block h3.handle{\n margin:0;\n @@ -410,15 +438,11 @@ div.block-hover {\n }\n \n .gadget {\n -\tmargin:0;\n -\tpadding:0;\n -\tborder:none;\n + margin:0;\n + padding:0;\n + border:none;\n }\n \n -\n -/* Gadget content */\n -\n -\n /* Gadget edit form */\n div.edit-form {\n border: 1px solid #000;\n @@ -681,7 +705,7 @@ div.block fieldset.gadget-profile div.field{\n </item> <item> <key> <string>size</string> </key> - <value> <int>11792</int> </value> + <value> <int>12176</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 3cd169c258134ca0b359b66ed83011de6ed2654e..5957a7d7f83f7daadbb65a26fc5b94e148e78001 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 @@ -552,136 +552,6 @@ fieldset.right .field {\n float: left;\n }\n \n -\n -/* Buttons */\n -\n -a.bt-edit:link, \n -a.bt-edit:active, \n -a.bt-edit:visited {\n - height:24px;\n - width:auto;\n - display:block;\n - padding-left:10px;\n - margin: 0 0 5px 0;\n -}\n -\n -a.bt-edit:link strong, \n -a.bt-edit:active strong, \n -a.bt-edit:visited strong {\n - height:100%;\n - width:auto;\n - display:block;\n - line-height:24px;\n - white-space: nowrap;\n -}\n -\n -a.bt-edit strong img {\n - position: relative;\n - top:2px;\n -}\n -\n -button#bt-clone {\n - margin-top: 1em;\n -}\n -\n -button.formbt {\n - width: auto;\n - height:35px;\n - cursor: pointer;\n - border:none;\n - padding: 0 20px 0 0;\n - margin: 0 5px 0 0;\n - position: relative;\n - overflow: visible;\n -}\n -\n -button::-moz-focus-inner{\n - border:none;\n -}\n -\n -button.formbt > span {\n - display:block;\n - width:100%;\n - height:35px;\n - margin:0;\n - padding:0 0 0 5px;\n - line-height:35px;\n - position: relative;\n - left:-2px;\n - white-space: nowrap;\n -}\n -\n -a.bt-download:link, \n -a.bt-download:active, \n -a.bt-download:visited,\n -a.bt-rss:link, \n -a.bt-rss:active, \n -a.bt-rss:visited {\n - padding-right:15px;\n - position: absolute;\n - right:10px;\n - top:10px;\n -}\n -\n -button.bt-med {\n - width: auto;\n - height:24px;\n - cursor: pointer;\n - border:none;\n - padding: 0 20px 0 0;\n - margin: 0 5px 0 0;\n - position: relative;\n - overflow: visible;\n -}\n -\n -button.bt-med span {\n - display:block;\n - width:100%;\n - height:24px;\n - margin:0;\n - padding:0 0 0 10px;\n - line-height:24px;\n - position: relative;\n - left:-2px;\n - white-space: nowrap;\n -}\n -\n -button.bt-med span img {\n - display:inline;\n - position: relative;\n - top:3px;\n - margin-right:5px;\n -}\n -\n -.bt-small {\n - display:block;\n - width: auto;\n - height:18px;\n - cursor: pointer;\n - border:none;\n - padding: 0 15px 0 0;\n - margin: -2px 2px 0 2px;\n - position: relative;\n - overflow: visible;\n -}\n -\n -.bt-small span {\n - display:block;\n - width:100%;\n - height:18px;\n - margin:0;\n - padding:0 0 0 10px;\n - line-height:18px;\n - position: relative;\n - left:-2px;\n - white-space: nowrap;\n -}\n -\n -.bt-small span img {\n - display:inline;\n - margin-right:2px;\n -}\n -\n .input input[type=image] {\n width: auto !important;\n }\n @@ -1163,89 +1033,6 @@ table tbody tr td {\n background-position: 0 -23px;\n }\n \n -\n -/* Buttons */\n -a.bt-download:link, a.bt-download:active, a.bt-download:visited {\n - background: url(km_img/icon-save.png) no-repeat transparent;\n -}\n -\n -a.bt-rss:link, a.bt-rss:active, a.bt-rss:visited {\n - background: url(km_img/icon-rss.png) no-repeat transparent;\n -}\n -\n -a.bt-download:link, a.bt-download:active, a.bt-download:visited,\n -a.bt-rss:link, a.bt-rss:active, a.bt-rss:visited {\n - background-position: 100% 50%;\n - color:#000;\n -}\n -\n -a.block-refresh { background-position: 0 0; }\n -\n -a.block-minimize { background-position: -17px 0 !important; }\n -\n -a.block-remove { background-position: -34px 0 !important; }\n -\n -a.block-edit-form { background-position: -51px 0 !important; }\n -\n -a.block-refresh:hover { background-position: 0 100% !important; }\n -\n -a.block-minimize:hover { background-position: -17px 100% !important; }\n -\n -a.block-remove:hover { background-position: -34px 100% !important; }\n -\n -a.block-edit-form:hover { background-position: -51px 100% !important; }\n -\n -a.bt-edit:link, a.bt-edit:active, a.bt-edit:visited {\n - background: url(km_img/bt-edit.png) no-repeat transparent;\n -}\n -\n -a.bt-edit:link strong, a.bt-edit:active strong,\n -a.bt-edit:visited strong {\n - background: url(km_img/bt-edit.png) no-repeat transparent;\n - background-position: 100% 0;\n - color:#828282;\n -}\n -\n -a.bt-edit:hover {\n - background-position: 0 100%;\n -}\n -\n -a.bt-edit:hover strong {\n - color:#4f4f4f;\n - background-position: 100% 100%;\n -}\n -\n -button.formbt, button.bt-med span, .bt-small span { color:#828282; }\n -button.formbt:hover span, button.bt-med:hover span, .bt-small:hover span { color:#4f4f4f; }\n -\n -button.formbt, button.formbt > span { background: url(km_img/formbt.png) no-repeat transparent; }\n -\n -button.bt-med, button.bt-med span { \n - background: url(km_img/button-med.png) no-repeat transparent; \n - background-color: #E9E9E9;\n -}\n -\n -.bt-small, .bt-small span { background: url(km_img/button-small.png) no-repeat transparent; }\n -\n -button.formbt, button.bt-med, .bt-small { background-position: 100% 0; }\n -\n -button.formbt:hover, button.bt-med:hover, .bt-small:hover { background-position: 100% 100%; }\n -\n -button.formbt:hover span, button.bt-med:hover span, .bt-small:hover span { background-position: 0 100%; }\n -\n -button#input-save-view span.image {background: url(km_img/bt-save2.png) no-repeat transparent;}\n -button#input-save-edit span.image {background: url(km_img/bt-save.png) no-repeat transparent;}\n -\n -button#input-save-edit span.image,\n -button#input-save-view span.image {\n - position: relative;\n - margin:8px;\n - float: left;\n - width: 19px;\n - height: 18px;\n -}\n -\n -\n /* Form styling */\n .meta input.search_button:hover,\n .search_button:hover {\n @@ -1394,20 +1181,6 @@ table tr th button {\n font-size:9pt;\n }\n \n -.saveView, .saveEdit { text-indent:15px; font-size:10pt; }\n -\n -/* ## link styling ################################### start # */\n -\n -a.bt-edit strong { font-size:8pt; }\n -\n -a.status:link, a.status:active, a.status:visited, .status { font-weight:normal; }\n -\n -a.bt-download:link, a.bt-download:active, a.bt-download:visited,\n -a.bt-rss:link, a.bt-rss:active, a.bt-rss:visited { font-weight: normal; font-size:9pt; }\n -\n -.bt-small { font-weight:normal; font-size:7pt; }\n -\n -\n div#wrapper_headline span.header_title {\n font-size:1.2em;\n font-weight:bold;\n @@ -1425,6 +1198,109 @@ li.toolboxSection > div{\n }\n \n /* Buttons */\n +button#bt-clone {\n + margin-top: 1em;\n +}\n +\n +button.formbt {\n + width: auto;\n + height:35px;\n + cursor: pointer;\n + border:none;\n + padding: 0 20px 0 0;\n + margin: 0 5px 0 0;\n + position: relative;\n + overflow: visible;\n +}\n +\n +button.formbt > span {\n + display:block;\n + width:100%;\n + height:35px;\n + margin:0;\n + padding:0 0 0 5px;\n + line-height:35px;\n + position: relative;\n + left:-2px;\n + white-space: nowrap;\n +}\n +\n +button.bt-med {\n + width: auto;\n + height:26px;\n + cursor: pointer;\n + border:none;\n + padding: 0 20px 0 0;\n + margin: 0 5px 0 0;\n + position: relative;\n + overflow: visible;\n +}\n +\n +button.bt-med span {\n + display:block;\n + width:100%;\n + height:24px;\n + margin:0;\n + padding:0 0 0 10px;\n + line-height:24px;\n + position: relative;\n + left:-2px;\n + white-space: nowrap;\n +}\n +\n +button.bt-med span img {\n + display:inline;\n + position: relative;\n + top:3px;\n + margin-right:5px;\n +}\n +\n +.bt-small {\n + display:block;\n + width: auto;\n + height:18px;\n + cursor: pointer;\n + border:none;\n + padding: 0 15px 0 0;\n + margin: -2px 2px 0 2px;\n + position: relative;\n + overflow: visible;\n +}\n +\n +.bt-small span {\n + display:block;\n + width:100%;\n + height:18px;\n + margin:0;\n + padding:0 0 0 10px;\n + line-height:18px;\n + position: relative;\n + left:-2px;\n + white-space: nowrap;\n +}\n +\n +.bt-small span img {\n + display:inline;\n + margin-right:2px;\n +}\n +\n +button#input-save-edit span.image,\n +button#input-save-view span.image {\n + position: relative;\n + margin:8px;\n + float: left;\n + width: 19px;\n + height: 18px;\n +}\n +\n +button#input-save-view span.image {\n + background: url(km_img/button-save-view.png) no-repeat transparent;\n +}\n +\n +button#input-save-edit span.image {\n + background: url(km_img/button-save-edit.png) no-repeat transparent;\n +}\n +\n div.listbox-action-widget button, \n div.listbox-action-widget a.button,\n div.listbox-action-widget button > span, \n @@ -1448,7 +1324,9 @@ button.bt-med span,\n \n #stick-gadgets:hover,\n #unstick-gadgets:hover,\n -#add-gadgets:hover{\n +#add-gadgets:hover,\n +button.formbt:hover span,\n +button.bt-med:hover span{\n color: #828282;\n }\n \n diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/bt-save.png.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/button-save-edit.png.xml similarity index 97% rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/bt-save.png.xml rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/button-save-edit.png.xml index abe9dc1f123a00951d86e537d1a4c4156698ead2..31d83f56542b255deb95e7844bfb159aebb1a3a5 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/bt-save.png.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/button-save-edit.png.xml @@ -16,7 +16,7 @@ </item> <item> <key> <string>__name__</string> </key> - <value> <string>bt-save.png</string> </value> + <value> <string>button-save-edit.png</string> </value> </item> <item> <key> <string>content_type</string> </key> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/bt-save2.png.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/button-save-view.png.xml similarity index 97% rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/bt-save2.png.xml rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/button-save-view.png.xml index a84a2b15cf7a962dca29e68565b0f751b3286706..e1b3501f703897f62aa7dc8770ecb116c77d75f7 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/bt-save2.png.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/button-save-view.png.xml @@ -16,7 +16,7 @@ </item> <item> <key> <string>__name__</string> </key> - <value> <string>bt-save2.png</string> </value> + <value> <string>button-save-view.png</string> </value> </item> <item> <key> <string>content_type</string> </key> diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index b4aaa3914c568c5bfbf272ec54ec20aec9e7938c..8542cbbf0492cfeb2207404318ebdfb13cbbd92a 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1778 \ No newline at end of file +1779 \ No newline at end of file