You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2010/11/22 08:45:45 UTC
svn commit: r1037622 - in /myfaces/tobago/trunk: src/site/apt/
tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/
tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago...
Author: lofwyr
Date: Mon Nov 22 07:45:44 2010
New Revision: 1037622
URL: http://svn.apache.org/viewvc?rev=1037622&view=rev
Log:
clean up style files:
- put ie specifics into its own files
- rename tobago-popup-iframe to tobago-popup-ie6bugfix
- remove -moz-opacity (opacity seems to be supported since Firefox 1.0)
- remove box-sizeing and -moz-box-sizing, becase the browser support is too less in the moment (we are using the default: content-box).
Added:
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
Modified:
myfaces/tobago/trunk/src/site/apt/migration-1.5.apt
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
Modified: myfaces/tobago/trunk/src/site/apt/migration-1.5.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/migration-1.5.apt?rev=1037622&r1=1037621&r2=1037622&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/migration-1.5.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/migration-1.5.apt Mon Nov 22 07:45:44 2010
@@ -154,5 +154,7 @@ Themes and CSS
*--+--+--+--+
| renamed | <<<tobago-input-picker>>> | <<<tobago-datePicker-icon>>> |
*--+--+--+--+
+| renamed | <<<tobago-popup-iframe>>> | <<<tobago-popup-ie6bugfix>>> |
+*--+--+--+--+
| renamed | <<<tobago-textArea->>>* | <<<tobago-textarea->>>* |
*--+--+--+--+
Added: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/style.css?rev=1037622&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/style.css (added)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/style.css Mon Nov 22 07:45:44 2010
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * theme: richmond
+ * agent: msie
+ */
+
+/* page --------------------------------------------------------------------- */
+
+.tobago-page {
+ scrollbar-base-color: #3366CC;
+ scrollbar-3dlight-color: #3366cc;
+ scrollbar-darkshadow-color: #E6E6E6;
+ scrollbar-arrow-color: #3366cc;
+ scrollbar-face-color: #FFFFFF;
+ scrollbar-highlight-color: #FFFFFF;
+ scrollbar-shadow-color: #3366CC;
+ scrollbar-track-color: #E6E6E6;
+}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css?rev=1037622&r1=1037621&r2=1037622&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css Mon Nov 22 07:45:44 2010
@@ -198,14 +198,6 @@ li.tobago-menu-markup-selected {
font: 11px arial, helvetica, sans-serif;
color: #3366CC;
margin-bottom: 0px;
- scrollbar-base-color: #3366CC;
- scrollbar-3dlight-color: #3366cc;
- scrollbar-darkshadow-color: #E6E6E6;
- scrollbar-arrow-color: #3366cc;
- scrollbar-face-color: #FFFFFF;
- scrollbar-highlight-color: #FFFFFF;
- scrollbar-shadow-color: #3366CC;
- scrollbar-track-color: #E6E6E6;
}
/* progress --------------------------------------------------------- */
@@ -276,7 +268,6 @@ img.tobago-progress-color2 {
div.tobago-tab-outer {
border-color: #3366CC;
background: #6699FF repeat-x top;
- box-sizing: border-box;
}
div.tobago-tab-outer-markup-selected {
@@ -301,7 +292,6 @@ div.tobago-tabGroup-fulfill {
border-top: 0px solid transparent;
padding: 14px 10px 12px 13px;
background: #FFFFFF;
- box-sizing: border-box;
}
.tobago-tab-shadow {
@@ -309,7 +299,6 @@ div.tobago-tabGroup-fulfill {
border: 0px solid #FFFFFF;
border-top: 0px solid transparent;
border-left: 0px solid transparent;
- box-sizing: border-box;
}
/* toolBar ----------------------------------------------------------------- */
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css?rev=1037622&r1=1037621&r2=1037622&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css Mon Nov 22 07:45:44 2010
@@ -55,3 +55,32 @@ textarea.tobago-richTextEditor-body {
.tobago-file {
height: 23px;
}
+
+/* menu ---------------------------------------------------------------- */
+
+/* workaround for IE6 */
+.tobago-menu-ie6bugfix {
+ position: absolute;
+ display: block;
+ z-index: -1;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ filter: mask();
+}
+
+/* popup -------------------------------------------------------------- */
+
+.tobago-popup-shield {
+ filter: alpha( opacity = 40 );
+}
+
+.tobago-popup-ie6bugfix {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ filter: progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0);
+}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css?rev=1037622&r1=1037621&r2=1037622&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css Mon Nov 22 07:45:44 2010
@@ -70,8 +70,6 @@ fieldset.tobago-box {
border: 2px groove #f6faff;
background: #bbccdd; /* font-size: 22px; */
white-space: nowrap;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
}
/* toolBar ----------------------------------------------------------------- */
@@ -322,8 +320,6 @@ div.tobago-gridLayout-first-column {
margin: 0;
padding: 0;
z-index: 5;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
}
.tobago-in-suggestPopup a {
@@ -486,18 +482,6 @@ li.tobago-menu-markup-selected {
visibility: hidden;
}
-/* workaround for IE6 */
-iframe.tobago-menu-ie6bugfix {
- position: absolute;
- display: block;
- z-index: -1;
- width: 100%;
- height: 100%;
- top: 0;
- left: 0;
- filter: mask();
-}
-
/* messages --------------------------------------------------- */
.tobago-messages {
@@ -601,22 +585,12 @@ iframe.tobago-menu-ie6bugfix {
z-index: -1;
opacity: .40;
background: url( ../image/popupBg.png );
- filter: alpha( opacity = 40 );
}
.tobago-popup-blink {
background: red;
}
-.tobago-popup-iframe {
- position: absolute;
- width: 100%;
- height: 100%;
- top: 0;
- left: 0;
- filter: progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0);
-}
-
/* progress -------------------------------------------------------------- */
img.tobago-progress-color1 {
@@ -978,11 +952,6 @@ a:active.tobago-sheet-pagingLink {
/* richTextEditor ---------------------------------------------------------- */
-.tobago-richTextEditor {
- box-sizing: border-box;
- -moz-box-sizing: border-box;
-}
-
.tobago-richTextEditor-container {
}
Added: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css?rev=1037622&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css (added)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css Mon Nov 22 07:45:44 2010
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * theme: speyside
+ * agent: msie
+ */
+
+/* page -------------------------------------------------------------------- */
+
+.tobago-page {
+ scrollbar-base-color: #000000;
+ scrollbar-3dlight-color: #000000;
+ scrollbar-darkshadow-color: #CCCCCC;
+ scrollbar-arrow-color: #000000;
+ scrollbar-face-color: #E2E2E2;
+ scrollbar-highlight-color: #E2E2E2;
+ scrollbar-shadow-color: #000000;
+ scrollbar-track-color: #CCCCCC;
+}
+
+/* popup ------------------------------------------------------------------ */
+
+.tobago-popup-blink {
+ -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; /* IE8 */
+ filter:alpha(opacity=50); /* IE6+IE7 */
+}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css?rev=1037622&r1=1037621&r2=1037622&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css Mon Nov 22 07:45:44 2010
@@ -316,14 +316,6 @@ li.tobago-menu-markup-selected {
background: #E2E2E2;
font: 12px arial, helvetica, sans-serif;
margin-bottom: 0px;
- scrollbar-base-color: #000000;
- scrollbar-3dlight-color: #000000;
- scrollbar-darkshadow-color: #CCCCCC;
- scrollbar-arrow-color: #000000;
- scrollbar-face-color: #E2E2E2;
- scrollbar-highlight-color: #E2E2E2;
- scrollbar-shadow-color: #000000;
- scrollbar-track-color: #CCCCCC;
}
/* popup ------------------------------------------------------------------ */
@@ -334,9 +326,7 @@ li.tobago-menu-markup-selected {
.tobago-popup-blink {
background: #333333;
- -moz-opacity: .5;
opacity: .5;
- filter:alpha(opacity=50);
}
/* progress --------------------------------------------------------- */
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=1037622&r1=1037621&r2=1037622&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js Mon Nov 22 07:45:44 2010
@@ -909,8 +909,8 @@ var Tobago = {
});
// IE6 needs an iframe to protect the other controls and protect against select-tag shining through.
- maxModalPopup.prepend("<iframe class='tobago-popup-iframe'/>");
- var iframe = maxModalPopup.children('.tobago-popup-iframe');
+ maxModalPopup.prepend("<iframe class='tobago-popup-ie6bugfix'/>");
+ var iframe = maxModalPopup.children('.tobago-popup-ie6bugfix');
iframe.css({
position: 'absolute',
left: -maxModalPopup.offset().left,