cvs commit: jahia/core/src/webapp/jsp/jahia/css colorsAndStyles.css jahia/core/src/webapp/jsp/jahia/engines/css styles.css

[Xavier Lawrence]

xlawrence    2005/10/07 17:27:39 CEST

  Modified files:
    core/src/webapp/jsp/jahia/css colorsAndStyles.css 
    core/src/webapp/jsp/jahia/engines/css styles.css 
  Log:
  fixed css conflict with jsCalendar
  
  Revision  Changes    Path
  1.7       +3 -3      jahia/core/src/webapp/jsp/jahia/css/colorsAndStyles.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/colorsAndStyles.css.diff?r1=1.6&r2=1.7&f=h
  1.7       +5 -4      jahia/core/src/webapp/jsp/jahia/engines/css/styles.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/css/styles.css.diff?r1=1.6&r2=1.7&f=h
  
  
  
  Index: colorsAndStyles.css
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/css/colorsAndStyles.css,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- colorsAndStyles.css       7 Oct 2005 14:14:30 -0000       1.6
  +++ colorsAndStyles.css       7 Oct 2005 15:27:38 -0000       1.7
  @@ -116,18 +116,18 @@
   /*                 BUTTON STRUCT                    */
   /* ------------------------------------------------ */
   
  -.button {
  +#wrapper .button {
       border: 2px solid #ccc;
       font-weight: bold;
       background: url("images/buttonShadow.gif") no-repeat right bottom;
   }
  -.button a {
  +#wrapper .button a {
       background-color: #398EC3;
       text-decoration: none;
       font-style: normal;
   }
   
  -.button span.buttonlabel {
  +#wrapper .button span.buttonlabel {
       color: #fff;
   }
   
  
  
  
  Index: styles.css
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/css/styles.css,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- styles.css        7 Oct 2005 12:54:27 -0000       1.6
  +++ styles.css        7 Oct 2005 15:27:39 -0000       1.7
  @@ -184,7 +184,7 @@
       padding-top: 12px;
   }
   
  -p {
  +#wrapper p {
       margin-bottom: 12px;
       text-align: justify;
       margin-top: 24px;
  @@ -284,7 +284,7 @@
   /*                 BUTTON STRUCT                    */
   /* ------------------------------------------------ */
   
  -.button {
  +#wrapper .button {
       margin-left: 4px;
       margin-top: 12px;
       margin-bottom: 5px;
  @@ -292,11 +292,12 @@
       float:left;
       display: inline;
   }
  -.button a {
  +
  +#wrapper .button a {
       padding: 1px 1px 1px 1px;
   }
   
  -.button span.buttonlabel {
  +#wrapper .button span.buttonlabel {
       padding: 0 0.4em;
   }