From 4408e1cff8d45acdf0699f87070bd3498717fb66 Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 30 Apr 2016 07:09:59 +0000 Subject: [PATCH] Updated CSS files for new default themes git-svn-id: https://svn.libreccm.org/ccm/trunk@4034 8810af33-2d31-482b-a856-94f89814c4df --- .../themes/librecms-default/styles/aplaws.css | 58 +++++++++++++++---- .../styles/libre-blue-flex.css | 58 +++++++++++++++---- .../librecms-default/styles/libreccm.css | 58 +++++++++++++++---- .../librecms-default/styles/librecms.css | 58 +++++++++++++++---- .../themes/librecms-default/styles/scicms.css | 58 +++++++++++++++---- .../foundry/foundry/lib/template-parser.xsl | 2 +- .../themes/scicms-default/styles/scicms.css | 58 +++++++++++++++---- 7 files changed, 277 insertions(+), 73 deletions(-) diff --git a/ccm-cms-bundle/web/themes/librecms-default/styles/aplaws.css b/ccm-cms-bundle/web/themes/librecms-default/styles/aplaws.css index 66190ef3c..c1c7df359 100644 --- a/ccm-cms-bundle/web/themes/librecms-default/styles/aplaws.css +++ b/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 { - border: 1px solid #ff9840; - border-radius: 0.5em; - margin-left: 0.5em; - margin-right: 0.5em; + nav#main-navigation div#nav-wrapper ul li { + 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; + } + + &.active > a { + + &:link, &:visited { + color: @color-nav-active; + } + + }*/ } - nav#main-navigation div#nav-wrapper ul li.active > a:link, - nav#main-navigation div#nav-wrapper ul li.active > a:visited { + 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; - padding: 0.2em 0.25em; + /*margin-left: 0.2em;*/ + /*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"); diff --git a/ccm-cms-bundle/web/themes/librecms-default/styles/libre-blue-flex.css b/ccm-cms-bundle/web/themes/librecms-default/styles/libre-blue-flex.css index b71e37805..d52a3ecf3 100644 --- a/ccm-cms-bundle/web/themes/librecms-default/styles/libre-blue-flex.css +++ b/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 { - border: 1px solid #ff9840; - border-radius: 0.5em; - margin-left: 0.5em; - margin-right: 0.5em; + nav#main-navigation div#nav-wrapper ul li { + 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; + } + + &.active > a { + + &:link, &:visited { + color: @color-nav-active; + } + + }*/ } - nav#main-navigation div#nav-wrapper ul li.active > a:link, - nav#main-navigation div#nav-wrapper ul li.active > a:visited { + 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; - padding: 0.2em 0.25em; + /*margin-left: 0.2em;*/ + /*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"); diff --git a/ccm-cms-bundle/web/themes/librecms-default/styles/libreccm.css b/ccm-cms-bundle/web/themes/librecms-default/styles/libreccm.css index fc7f1d9ba..56b0adabe 100644 --- a/ccm-cms-bundle/web/themes/librecms-default/styles/libreccm.css +++ b/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 { - border: 1px solid #ff9840; - border-radius: 0.5em; - margin-left: 0.5em; - margin-right: 0.5em; + nav#main-navigation div#nav-wrapper ul li { + 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; + } + + &.active > a { + + &:link, &:visited { + color: @color-nav-active; + } + + }*/ } - nav#main-navigation div#nav-wrapper ul li.active > a:link, - nav#main-navigation div#nav-wrapper ul li.active > a:visited { + 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; - padding: 0.2em 0.25em; + /*margin-left: 0.2em;*/ + /*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"); diff --git a/ccm-cms-bundle/web/themes/librecms-default/styles/librecms.css b/ccm-cms-bundle/web/themes/librecms-default/styles/librecms.css index b56957157..42daaa479 100644 --- a/ccm-cms-bundle/web/themes/librecms-default/styles/librecms.css +++ b/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 { - border: 1px solid #ff9840; - border-radius: 0.5em; - margin-left: 0.5em; - margin-right: 0.5em; + nav#main-navigation div#nav-wrapper ul li { + 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; + } + + &.active > a { + + &:link, &:visited { + color: @color-nav-active; + } + + }*/ } - nav#main-navigation div#nav-wrapper ul li.active > a:link, - nav#main-navigation div#nav-wrapper ul li.active > a:visited { + 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; - padding: 0.2em 0.25em; + /*margin-left: 0.2em;*/ + /*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"); diff --git a/ccm-cms-bundle/web/themes/librecms-default/styles/scicms.css b/ccm-cms-bundle/web/themes/librecms-default/styles/scicms.css index d797be387..e4cf28619 100644 --- a/ccm-cms-bundle/web/themes/librecms-default/styles/scicms.css +++ b/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 { - border: 1px solid #ff9840; - border-radius: 0.5em; - margin-left: 0.5em; - margin-right: 0.5em; + nav#main-navigation div#nav-wrapper ul li { + 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; + } + + &.active > a { + + &:link, &:visited { + color: @color-nav-active; + } + + }*/ } - nav#main-navigation div#nav-wrapper ul li.active > a:link, - nav#main-navigation div#nav-wrapper ul li.active > a:visited { + 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; - padding: 0.2em 0.25em; + /*margin-left: 0.2em;*/ + /*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"); diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl index 74840aa71..6812e2739 100644 --- a/ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl +++ b/ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl @@ -864,7 +864,7 @@ - + diff --git a/ccm-sci-bundle/web/themes/scicms-default/styles/scicms.css b/ccm-sci-bundle/web/themes/scicms-default/styles/scicms.css index d797be387..e4cf28619 100644 --- a/ccm-sci-bundle/web/themes/scicms-default/styles/scicms.css +++ b/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 { - border: 1px solid #ff9840; - border-radius: 0.5em; - margin-left: 0.5em; - margin-right: 0.5em; + nav#main-navigation div#nav-wrapper ul li { + 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; + } + + &.active > a { + + &:link, &:visited { + color: @color-nav-active; + } + + }*/ } - nav#main-navigation div#nav-wrapper ul li.active > a:link, - nav#main-navigation div#nav-wrapper ul li.active > a:visited { + 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; - padding: 0.2em 0.25em; + /*margin-left: 0.2em;*/ + /*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");