Updated CSS files for new default themes

git-svn-id: https://svn.libreccm.org/ccm/trunk@4034 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms-bundle/web/themes/librecms-default/styles/aplaws.css

@@ -281,7 +281,7 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
     padding-top: 0;
     padding-bottom: 0;
     width: 100%;
-    height: 2.8em;
+    /*height: 2.8em;*/
   }
   nav#main-navigation div#nav-wrapper {
     margin-left: auto;
@@ -302,6 +302,12 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
   nav#main-navigation div#nav-wrapper button span.fa {
     margin-right: 0.4em;
   }
+  nav#main-navigation div#nav-wrapper ul.home-link li {
+    border-left: none !important;
+    border-right: none;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+  }
   nav#main-navigation div#nav-wrapper ul {
     display: none;
     list-style: none;
@@ -310,24 +316,47 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
     padding-left: 0;
     text-align: center;
   }
-  nav#main-navigation div#nav-wrapper ul li.active {
+  nav#main-navigation div#nav-wrapper ul li {
-    border: 1px solid #ff9840;
+    border-right: 1px solid #213175;
+    /*padding: 0.4em 0.9em;*/
+    /*&.active {
+                        border: 1px solid @color-nav-active;
                         border-radius: 0.5em;
+
                         margin-left: 0.5em;
                         margin-right: 0.5em;
                     }
-  nav#main-navigation div#nav-wrapper ul li.active > a:link,
+
-  nav#main-navigation div#nav-wrapper ul li.active > a:visited {
+                    &.active > a {
+
+                        &:link, &:visited {
+                            color: @color-nav-active;
+                        }
+
+                    }*/
+  }
+  nav#main-navigation div#nav-wrapper ul li:first-child {
+    border-left: 1px solid #213175;
+  }
+  nav#main-navigation div#nav-wrapper ul li:active,
+  nav#main-navigation div#nav-wrapper ul li:focus,
+  nav#main-navigation div#nav-wrapper ul li:hover {
+    /*background-color: transparent;*/
+    background-color: #213175;
     color: #ff9840;
   }
   nav#main-navigation div#nav-wrapper ul li a {
+    display: block;
     font-family: 'TextCond', sans-serif;
-    font-size: 1.4em;
+    font-size: 1.2em;
     font-variant: small-caps;
     font-weight: bold;
-    margin-left: 0.2em;
+    /*margin-left: 0.2em;*/
-    padding: 0.2em 0.25em;
+    /*padding: 0.4em 0.25em;*/
+    /*padding: 0.4em 0.9em;*/
     text-decoration: none;
+    width: 100%;
+    height: 100%;
   }
   nav#main-navigation div#nav-wrapper ul li a:link,
   nav#main-navigation div#nav-wrapper ul li a:visited {
@@ -336,9 +365,14 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
   nav#main-navigation div#nav-wrapper ul li a:active,
   nav#main-navigation div#nav-wrapper ul li a:focus,
   nav#main-navigation div#nav-wrapper ul li a:hover {
-    background-color: transparent;
+    /*background-color: transparent;*/
+    background-color: #213175;
     color: #ff9840;
   }
+  nav#main-navigation div#nav-wrapper ul li a span {
+    display: block;
+    padding: 0.4em 0.9em;
+  }
   div#breadcrumbs-top {
     background-color: #f2f2f2;
     background-image: url("../images/foil.png");

ccm-cms-bundle/web/themes/librecms-default/styles/libre-blue-flex.css

@@ -279,7 +279,7 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
     padding-top: 0;
     padding-bottom: 0;
     width: 100%;
-    height: 2.8em;
+    /*height: 2.8em;*/
   }
   nav#main-navigation div#nav-wrapper {
     margin-left: auto;
@@ -300,6 +300,12 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
   nav#main-navigation div#nav-wrapper button span.fa {
     margin-right: 0.4em;
   }
+  nav#main-navigation div#nav-wrapper ul.home-link li {
+    border-left: none !important;
+    border-right: none;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+  }
   nav#main-navigation div#nav-wrapper ul {
     display: none;
     list-style: none;
@@ -308,24 +314,47 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
     padding-left: 0;
     text-align: center;
   }
-  nav#main-navigation div#nav-wrapper ul li.active {
+  nav#main-navigation div#nav-wrapper ul li {
-    border: 1px solid #ff9840;
+    border-right: 1px solid #0976a0;
+    /*padding: 0.4em 0.9em;*/
+    /*&.active {
+                        border: 1px solid @color-nav-active;
                         border-radius: 0.5em;
+
                         margin-left: 0.5em;
                         margin-right: 0.5em;
                     }
-  nav#main-navigation div#nav-wrapper ul li.active > a:link,
+
-  nav#main-navigation div#nav-wrapper ul li.active > a:visited {
+                    &.active > a {
+
+                        &:link, &:visited {
+                            color: @color-nav-active;
+                        }
+
+                    }*/
+  }
+  nav#main-navigation div#nav-wrapper ul li:first-child {
+    border-left: 1px solid #0976a0;
+  }
+  nav#main-navigation div#nav-wrapper ul li:active,
+  nav#main-navigation div#nav-wrapper ul li:focus,
+  nav#main-navigation div#nav-wrapper ul li:hover {
+    /*background-color: transparent;*/
+    background-color: #0976a0;
     color: #ff9840;
   }
   nav#main-navigation div#nav-wrapper ul li a {
+    display: block;
     font-family: 'TextCond', sans-serif;
-    font-size: 1.4em;
+    font-size: 1.2em;
     font-variant: small-caps;
     font-weight: bold;
-    margin-left: 0.2em;
+    /*margin-left: 0.2em;*/
-    padding: 0.2em 0.25em;
+    /*padding: 0.4em 0.25em;*/
+    /*padding: 0.4em 0.9em;*/
     text-decoration: none;
+    width: 100%;
+    height: 100%;
   }
   nav#main-navigation div#nav-wrapper ul li a:link,
   nav#main-navigation div#nav-wrapper ul li a:visited {
@@ -334,9 +363,14 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
   nav#main-navigation div#nav-wrapper ul li a:active,
   nav#main-navigation div#nav-wrapper ul li a:focus,
   nav#main-navigation div#nav-wrapper ul li a:hover {
-    background-color: transparent;
+    /*background-color: transparent;*/
+    background-color: #0976a0;
     color: #ff9840;
   }
+  nav#main-navigation div#nav-wrapper ul li a span {
+    display: block;
+    padding: 0.4em 0.9em;
+  }
   div#breadcrumbs-top {
     background-color: #f2f2f2;
     background-image: url("../images/foil.png");

ccm-cms-bundle/web/themes/librecms-default/styles/libreccm.css

@@ -283,7 +283,7 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
     padding-top: 0;
     padding-bottom: 0;
     width: 100%;
-    height: 2.8em;
+    /*height: 2.8em;*/
   }
   nav#main-navigation div#nav-wrapper {
     margin-left: auto;
@@ -304,6 +304,12 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
   nav#main-navigation div#nav-wrapper button span.fa {
     margin-right: 0.4em;
   }
+  nav#main-navigation div#nav-wrapper ul.home-link li {
+    border-left: none !important;
+    border-right: none;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+  }
   nav#main-navigation div#nav-wrapper ul {
     display: none;
     list-style: none;
@@ -312,24 +318,47 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
     padding-left: 0;
     text-align: center;
   }
-  nav#main-navigation div#nav-wrapper ul li.active {
+  nav#main-navigation div#nav-wrapper ul li {
-    border: 1px solid #ff9840;
+    border-right: 1px solid #89a000;
+    /*padding: 0.4em 0.9em;*/
+    /*&.active {
+                        border: 1px solid @color-nav-active;
                         border-radius: 0.5em;
+
                         margin-left: 0.5em;
                         margin-right: 0.5em;
                     }
-  nav#main-navigation div#nav-wrapper ul li.active > a:link,
+
-  nav#main-navigation div#nav-wrapper ul li.active > a:visited {
+                    &.active > a {
+
+                        &:link, &:visited {
+                            color: @color-nav-active;
+                        }
+
+                    }*/
+  }
+  nav#main-navigation div#nav-wrapper ul li:first-child {
+    border-left: 1px solid #89a000;
+  }
+  nav#main-navigation div#nav-wrapper ul li:active,
+  nav#main-navigation div#nav-wrapper ul li:focus,
+  nav#main-navigation div#nav-wrapper ul li:hover {
+    /*background-color: transparent;*/
+    background-color: #89a000;
     color: #ff9840;
   }
   nav#main-navigation div#nav-wrapper ul li a {
+    display: block;
     font-family: 'TextCond', sans-serif;
-    font-size: 1.4em;
+    font-size: 1.2em;
     font-variant: small-caps;
     font-weight: bold;
-    margin-left: 0.2em;
+    /*margin-left: 0.2em;*/
-    padding: 0.2em 0.25em;
+    /*padding: 0.4em 0.25em;*/
+    /*padding: 0.4em 0.9em;*/
     text-decoration: none;
+    width: 100%;
+    height: 100%;
   }
   nav#main-navigation div#nav-wrapper ul li a:link,
   nav#main-navigation div#nav-wrapper ul li a:visited {
@@ -338,9 +367,14 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
   nav#main-navigation div#nav-wrapper ul li a:active,
   nav#main-navigation div#nav-wrapper ul li a:focus,
   nav#main-navigation div#nav-wrapper ul li a:hover {
-    background-color: transparent;
+    /*background-color: transparent;*/
+    background-color: #89a000;
     color: #ff9840;
   }
+  nav#main-navigation div#nav-wrapper ul li a span {
+    display: block;
+    padding: 0.4em 0.9em;
+  }
   div#breadcrumbs-top {
     background-color: #f2f2f2;
     background-image: url("../images/foil.png");

ccm-cms-bundle/web/themes/librecms-default/styles/librecms.css

@@ -279,7 +279,7 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
     padding-top: 0;
     padding-bottom: 0;
     width: 100%;
-    height: 2.8em;
+    /*height: 2.8em;*/
   }
   nav#main-navigation div#nav-wrapper {
     margin-left: auto;
@@ -300,6 +300,12 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
   nav#main-navigation div#nav-wrapper button span.fa {
     margin-right: 0.4em;
   }
+  nav#main-navigation div#nav-wrapper ul.home-link li {
+    border-left: none !important;
+    border-right: none;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+  }
   nav#main-navigation div#nav-wrapper ul {
     display: none;
     list-style: none;
@@ -308,24 +314,47 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
     padding-left: 0;
     text-align: center;
   }
-  nav#main-navigation div#nav-wrapper ul li.active {
+  nav#main-navigation div#nav-wrapper ul li {
-    border: 1px solid #ff9840;
+    border-right: 1px solid #0a9793;
+    /*padding: 0.4em 0.9em;*/
+    /*&.active {
+                        border: 1px solid @color-nav-active;
                         border-radius: 0.5em;
+
                         margin-left: 0.5em;
                         margin-right: 0.5em;
                     }
-  nav#main-navigation div#nav-wrapper ul li.active > a:link,
+
-  nav#main-navigation div#nav-wrapper ul li.active > a:visited {
+                    &.active > a {
+
+                        &:link, &:visited {
+                            color: @color-nav-active;
+                        }
+
+                    }*/
+  }
+  nav#main-navigation div#nav-wrapper ul li:first-child {
+    border-left: 1px solid #0a9793;
+  }
+  nav#main-navigation div#nav-wrapper ul li:active,
+  nav#main-navigation div#nav-wrapper ul li:focus,
+  nav#main-navigation div#nav-wrapper ul li:hover {
+    /*background-color: transparent;*/
+    background-color: #0a9793;
     color: #ff9840;
   }
   nav#main-navigation div#nav-wrapper ul li a {
+    display: block;
     font-family: 'TextCond', sans-serif;
-    font-size: 1.4em;
+    font-size: 1.2em;
     font-variant: small-caps;
     font-weight: bold;
-    margin-left: 0.2em;
+    /*margin-left: 0.2em;*/
-    padding: 0.2em 0.25em;
+    /*padding: 0.4em 0.25em;*/
+    /*padding: 0.4em 0.9em;*/
     text-decoration: none;
+    width: 100%;
+    height: 100%;
   }
   nav#main-navigation div#nav-wrapper ul li a:link,
   nav#main-navigation div#nav-wrapper ul li a:visited {
@@ -334,9 +363,14 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
   nav#main-navigation div#nav-wrapper ul li a:active,
   nav#main-navigation div#nav-wrapper ul li a:focus,
   nav#main-navigation div#nav-wrapper ul li a:hover {
-    background-color: transparent;
+    /*background-color: transparent;*/
+    background-color: #0a9793;
     color: #ff9840;
   }
+  nav#main-navigation div#nav-wrapper ul li a span {
+    display: block;
+    padding: 0.4em 0.9em;
+  }
   div#breadcrumbs-top {
     background-color: #f2f2f2;
     background-image: url("../images/foil.png");

ccm-cms-bundle/web/themes/librecms-default/styles/scicms.css

@@ -279,7 +279,7 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
     padding-top: 0;
     padding-bottom: 0;
     width: 100%;
-    height: 2.8em;
+    /*height: 2.8em;*/
   }
   nav#main-navigation div#nav-wrapper {
     margin-left: auto;
@@ -300,6 +300,12 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
   nav#main-navigation div#nav-wrapper button span.fa {
     margin-right: 0.4em;
   }
+  nav#main-navigation div#nav-wrapper ul.home-link li {
+    border-left: none !important;
+    border-right: none;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+  }
   nav#main-navigation div#nav-wrapper ul {
     display: none;
     list-style: none;
@@ -308,24 +314,47 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
     padding-left: 0;
     text-align: center;
   }
-  nav#main-navigation div#nav-wrapper ul li.active {
+  nav#main-navigation div#nav-wrapper ul li {
-    border: 1px solid #ff9840;
+    border-right: 1px solid #0072bb;
+    /*padding: 0.4em 0.9em;*/
+    /*&.active {
+                        border: 1px solid @color-nav-active;
                         border-radius: 0.5em;
+
                         margin-left: 0.5em;
                         margin-right: 0.5em;
                     }
-  nav#main-navigation div#nav-wrapper ul li.active > a:link,
+
-  nav#main-navigation div#nav-wrapper ul li.active > a:visited {
+                    &.active > a {
+
+                        &:link, &:visited {
+                            color: @color-nav-active;
+                        }
+
+                    }*/
+  }
+  nav#main-navigation div#nav-wrapper ul li:first-child {
+    border-left: 1px solid #0072bb;
+  }
+  nav#main-navigation div#nav-wrapper ul li:active,
+  nav#main-navigation div#nav-wrapper ul li:focus,
+  nav#main-navigation div#nav-wrapper ul li:hover {
+    /*background-color: transparent;*/
+    background-color: #0072bb;
     color: #ff9840;
   }
   nav#main-navigation div#nav-wrapper ul li a {
+    display: block;
     font-family: 'TextCond', sans-serif;
-    font-size: 1.4em;
+    font-size: 1.2em;
     font-variant: small-caps;
     font-weight: bold;
-    margin-left: 0.2em;
+    /*margin-left: 0.2em;*/
-    padding: 0.2em 0.25em;
+    /*padding: 0.4em 0.25em;*/
+    /*padding: 0.4em 0.9em;*/
     text-decoration: none;
+    width: 100%;
+    height: 100%;
   }
   nav#main-navigation div#nav-wrapper ul li a:link,
   nav#main-navigation div#nav-wrapper ul li a:visited {
@@ -334,9 +363,14 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
   nav#main-navigation div#nav-wrapper ul li a:active,
   nav#main-navigation div#nav-wrapper ul li a:focus,
   nav#main-navigation div#nav-wrapper ul li a:hover {
-    background-color: transparent;
+    /*background-color: transparent;*/
+    background-color: #0072bb;
     color: #ff9840;
   }
+  nav#main-navigation div#nav-wrapper ul li a span {
+    display: block;
+    padding: 0.4em 0.9em;
+  }
   div#breadcrumbs-top {
     background-color: #f2f2f2;
     background-image: url("../images/foil.png");

ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl

@@ -864,7 +864,7 @@
                 
                 <xsl:variable name="suffix">
                     <xsl:choose>
-                        <xsl:when test="hour-value &gt; 11">
+                        <xsl:when test="$hour24-value &gt; 11">
                             <xsl:value-of select="foundry:get-static-text('', 'time/pm')"/>
                         </xsl:when>
                         <xsl:otherwise>

ccm-sci-bundle/web/themes/scicms-default/styles/scicms.css

@@ -279,7 +279,7 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
     padding-top: 0;
     padding-bottom: 0;
     width: 100%;
-    height: 2.8em;
+    /*height: 2.8em;*/
   }
   nav#main-navigation div#nav-wrapper {
     margin-left: auto;
@@ -300,6 +300,12 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
   nav#main-navigation div#nav-wrapper button span.fa {
     margin-right: 0.4em;
   }
+  nav#main-navigation div#nav-wrapper ul.home-link li {
+    border-left: none !important;
+    border-right: none;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+  }
   nav#main-navigation div#nav-wrapper ul {
     display: none;
     list-style: none;
@@ -308,24 +314,47 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
     padding-left: 0;
     text-align: center;
   }
-  nav#main-navigation div#nav-wrapper ul li.active {
+  nav#main-navigation div#nav-wrapper ul li {
-    border: 1px solid #ff9840;
+    border-right: 1px solid #0072bb;
+    /*padding: 0.4em 0.9em;*/
+    /*&.active {
+                        border: 1px solid @color-nav-active;
                         border-radius: 0.5em;
+
                         margin-left: 0.5em;
                         margin-right: 0.5em;
                     }
-  nav#main-navigation div#nav-wrapper ul li.active > a:link,
+
-  nav#main-navigation div#nav-wrapper ul li.active > a:visited {
+                    &.active > a {
+
+                        &:link, &:visited {
+                            color: @color-nav-active;
+                        }
+
+                    }*/
+  }
+  nav#main-navigation div#nav-wrapper ul li:first-child {
+    border-left: 1px solid #0072bb;
+  }
+  nav#main-navigation div#nav-wrapper ul li:active,
+  nav#main-navigation div#nav-wrapper ul li:focus,
+  nav#main-navigation div#nav-wrapper ul li:hover {
+    /*background-color: transparent;*/
+    background-color: #0072bb;
     color: #ff9840;
   }
   nav#main-navigation div#nav-wrapper ul li a {
+    display: block;
     font-family: 'TextCond', sans-serif;
-    font-size: 1.4em;
+    font-size: 1.2em;
     font-variant: small-caps;
     font-weight: bold;
-    margin-left: 0.2em;
+    /*margin-left: 0.2em;*/
-    padding: 0.2em 0.25em;
+    /*padding: 0.4em 0.25em;*/
+    /*padding: 0.4em 0.9em;*/
     text-decoration: none;
+    width: 100%;
+    height: 100%;
   }
   nav#main-navigation div#nav-wrapper ul li a:link,
   nav#main-navigation div#nav-wrapper ul li a:visited {
@@ -334,9 +363,14 @@ We are using some Webfonts. The fonts are from the Fontsquirrel
   nav#main-navigation div#nav-wrapper ul li a:active,
   nav#main-navigation div#nav-wrapper ul li a:focus,
   nav#main-navigation div#nav-wrapper ul li a:hover {
-    background-color: transparent;
+    /*background-color: transparent;*/
+    background-color: #0072bb;
     color: #ff9840;
   }
+  nav#main-navigation div#nav-wrapper ul li a span {
+    display: block;
+    padding: 0.4em 0.9em;
+  }
   div#breadcrumbs-top {
     background-color: #f2f2f2;
     background-image: url("../images/foil.png");