You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2012/05/22 21:04:16 UTC
svn commit: r1341591 - in
/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside: ./ src/main/less/
src/main/less/org/ src/main/less/org/apache/
src/main/less/org/apache/myfaces/ src/main/less/org/apache/myfaces/tobago/
src/main/less/org/apache/myfac...
Author: bommel
Date: Tue May 22 19:04:15 2012
New Revision: 1341591
URL: http://svn.apache.org/viewvc?rev=1341591&view=rev
Log:
(TOBAGO-1141) Integration of lesscss in Tobago
Added:
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.less
- copied, changed from r1341553, myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
Modified:
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml?rev=1341591&r1=1341590&r2=1341591&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml Tue May 22 19:04:15 2012
@@ -204,6 +204,21 @@
</plugin>
-->
<plugin>
+ <groupId>org.lesscss</groupId>
+ <artifactId>lesscss-maven-plugin</artifactId>
+ <version>1.3.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<version>1.1</version>
@@ -216,8 +231,10 @@
</executions>
<configuration>
<suffix>.min</suffix>
+ <sourceDirectory>${project.build.directory}/classes</sourceDirectory>
<excludes>
<exclude>**/*.js</exclude>
+ <exclude>**/*.min.css</exclude>
</excludes>
</configuration>
</plugin>
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.less (from r1341553, 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/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.less?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.less&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css&r1=1341553&r2=1341591&rev=1341591&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/less/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.less Tue May 22 19:04:15 2012
@@ -20,6 +20,12 @@
* agent: standard
*/
+@errorColor: #FF0000;
+@darkBorderColor: #000000;
+@textColor: #000000;
+@disabledTextColor: #808080;
+@boldFont: bold 12px arial, helvetica, sans-serif;
+@font: 12px arial, helvetica, sans-serif;
/* box ----------------------------------------------------------------- */
.tobago-box {
@@ -34,7 +40,7 @@
}
.tobago-box-border {
- border: 1px solid #000000;
+ border: 1px solid @darkBorderColor;
position: absolute;
overflow: hidden;
top: -1px;
@@ -46,7 +52,7 @@
background: #E8E8E8 url(../image/box-header-bg.gif) repeat-x top;
height: 16px;
border-bottom: 1px dotted black;
- font: bold 12px arial, helvetica, sans-serif;
+ font: @boldFont;
color: #660000;
padding: 3px 0 0 5px;
overflow: hidden;
@@ -67,7 +73,7 @@
*/
.tobago-boxToolBar {
- border: 1px solid #000000;
+ border: 1px solid @darkBorderColor;
background-color: #FFFFFF;
}
.tobago-boxToolBar-item {
@@ -87,12 +93,12 @@
.tobago-boxToolBar-item-markup-hover {
border-width: 0 1px;
- border-color: #000000;
+ border-color: @darkBorderColor;
margin: 0;
}
.tobago-boxToolBar-item-markup-disabled {
- color: #808080;
+ color: @disabledTextColor;
}
.tobago-boxToolBar-button-markup-selected {
@@ -110,9 +116,9 @@
/* button ------------------------------------------------------------------ */
.tobago-button {
- border: 1px #000000 solid;
+ border: 1px @darkBorderColor solid;
background: #ffffff;
- font: bold 12px arial, helvetica, sans-serif;
+ font: @boldFont;
color: #660000;
height: 14px;
}
@@ -124,7 +130,7 @@
/* calendar --------------------------------------------------------------- */
.tobago-calendar-day {
- font: 12px arial, helvetica, sans-serif;
+ font: @font;
}
.tobago-calendar-day-markup-selected {
@@ -158,9 +164,9 @@
/* date ---------------------------------------------------------------------- */
.tobago-date {
- border: 1px #000000 solid;
+ border: 1px solid @darkBorderColor;
height: 14px;
- font: 12px arial, helvetica, sans-serif;
+ font: @font;
padding-left: 2px;
padding-right: 2px;
}
@@ -170,12 +176,12 @@
}
.tobago-date-markup-disabled {
- color: #808080;
+ color: @disabledTextColor;
background-color: #E8E8E8;
}
.tobago-date-markup-error, .tobago-date-markup-fatal {
- border: 1px solid #FF0000;
+ border: 1px solid @errorColor;
}
/* file ------------------------------------------------------------------- */
@@ -187,9 +193,9 @@
/* in ---------------------------------------------------------------------- */
.tobago-in {
- border: 1px #000000 solid;
+ border: 1px solid @darkBorderColor;
height: 14px;
- font: 12px arial, helvetica, sans-serif;
+ font: @font;
}
.tobago-in-markup-readonly {
@@ -197,12 +203,12 @@
}
.tobago-in-markup-disabled {
- color: #808080;
+ color: @disabledTextColor;
background-color: #E8E8E8;
}
.tobago-in-markup-error, .tobago-in-markup-fatal {
- border: 1px solid #FF0000;
+ border: 1px solid @errorColor;
}
/* label ------------------------------------------------------------------- */
@@ -210,11 +216,11 @@
.tobago-label {
background-color: #E8E8E8;
height: 14px;
- font: bold 12px arial, helvetica, sans-serif;
+ font: @boldFont;
}
.tobago-label-markup-disabled {
- color: #808080;
+ color: @disabledTextColor;
}
.tobago-label-markup-fatal {
@@ -228,7 +234,7 @@
background-image: url(../image/dialog-error.png);
background-repeat: no-repeat;
background-position: right 2px;
- color: #FF0000;
+ color: @errorColor;
}
.tobago-label-markup-warn {
@@ -242,14 +248,14 @@
background-image: url(../image/dialog-information.png);
background-repeat: no-repeat;
background-position: right 2px;
- color: #000000;
+ color: @textColor;
}
/* link -------------------------------------------------------- */
.tobago-link {
- font: bold 12px arial, helvetica, sans-serif;
- color: #000000;
+ font: @boldFont;
+ color: @textColor;
text-decoration: none;
line-height: 14px;
}
@@ -290,7 +296,7 @@ li.tobago-menu-markup-selected {
/* messages --------------------------------------------------------------- */
.tobago-messages {
- font: bold 12px arial, helvetica, sans-serif;
+ font: @boldFont;
}
/* out -------------------------------------------------------------------- */
@@ -304,7 +310,7 @@ li.tobago-menu-markup-selected {
.tobago-page {
background: #E2E2E2;
- font: 12px arial, helvetica, sans-serif;
+ font: @font;
margin-bottom: 0px;
}
@@ -327,15 +333,15 @@ li.tobago-menu-markup-selected {
.tobago-progress {
background-color: #ffffff;
- border: 1px solid #000000;
+ border: 1px solid @darkBorderColor;
}
/* richTextEditor ---------------------------------------------------------- */
.tobago-richTextEditor-body {
- border: 1px solid #000000;
+ border: 1px solid @darkBorderColor;
background: #ffffff;
- font: 12px arial, helvetica, sans-serif;
+ font: @font;
}
/* selectBooleanCheckbox --------------------------------------------------- */
@@ -346,29 +352,29 @@ li.tobago-menu-markup-selected {
}
.tobago-selectBooleanCheckbox-markup-disabled {
- color: #808080;
+ color: @disabledTextColor;
}
/* selectManyCheckbox ---------------------------------------------------------- */
.tobago-selectManyCheckbox-markup-disabled {
- color: #808080;
+ color: @disabledTextColor;
}
/* selectManyListbox ------------------------------------------------------- */
.tobago-selectManyListbox {
- border: 1px solid #000000;
- font: 12px arial, helvetica, sans-serif;
+ border: 1px solid @darkBorderColor;
+ font: @font;
padding-top: -1px;
- color: #000000;
+ color: @textColor;
height: 21px;
}
.tobago-selectManyListbox-markup-disabled {
background-color: #E8E8E8;
- color: #808080;
+ color: @disabledTextColor;
}
.tobago-selectManyListbox-markup-readonly {
@@ -378,13 +384,13 @@ li.tobago-menu-markup-selected {
/* selectManyShuttle ------------------------------------------------------- */
.tobago-selectManyShuttle {
- font: 12px arial, helvetica, sans-serif;
- color: #000000;
+ font: @font;
+ color: @textColor;
}
.tobago-selectManyShuttle-markup-disabled {
background-color: #E8E8E8;
- color: #808080;
+ color: @disabledTextColor;
}
.tobago-selectManyShuttle-markup-readonly {
@@ -395,9 +401,9 @@ li.tobago-menu-markup-selected {
/* selectOneChoice --------------------------------------------------------- */
.tobago-selectOneChoice {
- border: 1px solid #000000;
- font: 12px arial, helvetica, sans-serif;
- color: #000000;
+ border: 1px solid @darkBorderColor;
+ font: @font;
+ color: @textColor;
}
tobago-selectOneChoice-markup-readonly {
@@ -407,7 +413,7 @@ tobago-selectOneChoice-markup-readonly {
/* selectOneListbox -------------------------------------------------------- */
.tobago-selectOneListbox {
- border-color: #000000;
+ border-color: @darkBorderColor;
border-width: 1px;
border-style: solid;
font-size: 12px;
@@ -415,7 +421,7 @@ tobago-selectOneChoice-markup-readonly {
.tobago-selectOneListbox-markup-disabled {
background-color: #E8E8E8;
- color: #808080;
+ color: @disabledTextColor;
}
.tobago-selectOneListbox-markup-readonly {
@@ -423,20 +429,20 @@ tobago-selectOneChoice-markup-readonly {
}
.tobago-selectOneListbox-markup-error {
- border-color: #ff0000;
+ border-color: @errorColor;
}
/* selectOneRadio --------------------------------------------------------- */
.tobago-selectOneRadio-markup-disabled {
- color: #808080;
+ color: @disabledTextColor;
}
/* separator ------------------------------------------------------------------- */
hr.tobago-separator, .tobago-separator-start hr, .tobago-separator-end hr {
- border-top: 1px solid #000000;
- border-bottom: 0 solid #000000;
+ border-top: 1px solid @darkBorderColor;
+ border-bottom: 0 solid @darkBorderColor;
}
/* sheet -------------------------------------------------------- */
@@ -450,7 +456,7 @@ hr.tobago-separator, .tobago-separator-s
.tobago-sheet-header {
border-color: #b8b6b6 #ffffff #d7d7d7 #b8b6b6;
background-color: #d7d7d7;
- font: bold 12px arial, helvetica, sans-serif;
+ font: @boldFont;
color: #333333;
text-align: left;
}
@@ -466,18 +472,18 @@ hr.tobago-separator, .tobago-separator-s
}
.tobago-sheet-row-markup-odd {
- font: 12px arial, helvetica, sans-serif;
+ font: @font;
background: #ffffff;
}
.tobago-sheet-row-markup-even {
- font: 12px arial, helvetica, sans-serif;
+ font: @font;
background: #ffffff;
}
.tobago-sheet-row-markup-selected, .tobago-sheet-row-markup-selected td {
- background: #EBEAEA;
- color: #000000;
+ background: #EBEAEA;
+ color: @textColor;
}
.tobago-sheet-cell {
@@ -523,7 +529,7 @@ hr.tobago-separator, .tobago-separator-s
.tobago-tab {
background-color: #E2E2E2;
- border-color: #000000;
+ border-color: @darkBorderColor;
}
.tobago-tab-markup-selected {
@@ -532,7 +538,7 @@ hr.tobago-separator, .tobago-separator-s
}
.tobago-tab-content {
- border: 1px solid #000000;
+ border: 1px solid @darkBorderColor;
border-top: 0 solid transparent;
background: #FAFAFA;
}
@@ -541,7 +547,7 @@ hr.tobago-separator, .tobago-separator-s
.tobago-tab-markup-disabled a:link,
.tobago-tab-markup-disabled a:visited,
.tobago-tab-markup-disabled a:active {
- color: #808080;
+ color: @disabledTextColor;
}
.tobago-tab-markup-selected a:link,
@@ -551,11 +557,11 @@ hr.tobago-separator, .tobago-separator-s
}
.tobago-tabGroup-headerInner {
- border-bottom-color: #000000;
+ border-bottom-color: @darkBorderColor;
}
.tobago-tabGroup-toolBar {
- border-bottom-color: #000000;
+ border-bottom-color: @darkBorderColor;
}
/*
@@ -565,7 +571,7 @@ hr.tobago-separator, .tobago-separator-s
}
.tobago-tab-link-markup-disabled {
- color: #808080;
+ color: @disabledTextColor;
}
.tobago-tab {
@@ -579,7 +585,7 @@ hr.tobago-separator, .tobago-separator-s
.tobago-tab-outer {
display: inline-block;
- border-color: #000000;
+ border-color: @darkBorderColor;
background: url(../image/tab-header-unselected-bg.gif) repeat-x top;
}
@@ -590,7 +596,7 @@ hr.tobago-separator, .tobago-separator-s
}
.tobago-tab-inner {
- font: 12px arial, helvetica, sans-serif;
+ font: @font;
color: #660000;
}
@@ -599,7 +605,7 @@ hr.tobago-separator, .tobago-separator-s
}
span.tobago-tabGroup-fulfill {
- border-color: #000000;
+ border-color: @darkBorderColor;
display: inline-block;
border-bottom: 1px solid;
vertical-align: bottom;
@@ -613,14 +619,14 @@ span.tobago-tabGroup-fulfill {
}
div.tobago-tabGroup-toolBar {
- border-color: #000000;
+ border-color: @darkBorderColor;
}
*/
/* tabGroupToolBar ----------------------------------------------------------------- */
/*.tobago-tabGroupToolBar {
- border: 1px solid #000000;
+ border: 1px solid @darkBorderColor;
background-color: #FFFFFF;
}
.tobago-tabGroupToolBar-item {
@@ -639,15 +645,13 @@ div.tobago-tabGroup-toolBar {
}
.tobago-tabGroupToolBar-item-markup-hover {
-*//*
border-width: 0 1px;
- border-color: #000000;
+ border-color: @darkBorderColor;
margin: 0;
-*//*
}
.tobago-tabGroupToolBar-item-markup-disabled {
- color: #808080;
+ color: @disabledTextColor;
}
.tobago-tabGroupToolBar-button-markup-selected {
@@ -665,11 +669,11 @@ div.tobago-tabGroup-toolBar {
/* textarea ---------------------------------------------------------------- */
.tobago-textarea {
- font: 12px arial, helvetica, sans-serif;
+ font: @font;
background: #ffffff;
- color: #000000;
+ color: @textColor;
overflow: auto;
- border: 1px solid #000000;
+ border: 1px solid @darkBorderColor;
padding: 0 0 0 2px;
}
@@ -683,7 +687,7 @@ div.tobago-tabGroup-toolBar {
}
.tobago-textarea-markup-error, .tobago-textarea-markup-fatal {
- border: 1px solid #FF0000;
+ border: 1px solid @errorColor;
}
/* time -------------------------------------------------------------------- */
@@ -735,7 +739,7 @@ div.tobago-tabGroup-toolBar {
*/
.tobago-toolBar {
- border: 1px solid #000000;
+ border: 1px solid @darkBorderColor;
background-color: #FFFFFF;
}
.tobago-toolBar-item {
@@ -755,7 +759,7 @@ div.tobago-tabGroup-toolBar {
.tobago-toolBar-item-markup-hover {
border-width: 0 1px;
- border-color: #000000;
+ border-color: @darkBorderColor;
margin: 0;
}
@@ -778,8 +782,8 @@ div.tobago-tabGroup-toolBar {
/* tree ------------------------------------------------------------------- */
.tobago-treeNode-icon {
- width: 16px;
- height: 16px;
+ width: 16px;
+ height: 16px;
float: right;
}
@@ -789,7 +793,7 @@ div.tobago-tabGroup-toolBar {
}
.tobago-treeNode a:hover {
- color: #000000;
+ color: @textColor;
text-decoration: underline;
}
@@ -800,12 +804,12 @@ div.tobago-tabGroup-toolBar {
.tobago-treeNode a:focus {
background: transparent;
- color: #000000;
+ color: @textColor;
}
.tobago-treeNode-markup-marked a, .tobago-treeNode-markup-marked:focus a,
.tobago-treeNode-markup-marked label, .tobago-treeNode-markup-marked:focus label {
- background-color: #eeeeee;
+ background-color: #eeeeee;
}
/* treeMenu ------------------------------------------------------------------- */