From b56da9f3af47203608c2728d6bca83f2a151a6c5 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 13 Apr 2016 11:55:22 +0000 Subject: [PATCH] Updated default themes with latest changes from libre-blue-flex theme git-svn-id: https://svn.libreccm.org/ccm/trunk@3987 8810af33-2d31-482b-a856-94f89814c4df --- .../librecms-default/styles/styles.less | 67 +++++++++++++++---- .../librecms-default/templates/layout.xml | 6 +- .../themes/scicms-default/styles/styles.less | 67 +++++++++++++++---- .../scicms-default/templates/layout.xml | 6 +- 4 files changed, 112 insertions(+), 34 deletions(-) diff --git a/ccm-cms-bundle/web/themes/librecms-default/styles/styles.less b/ccm-cms-bundle/web/themes/librecms-default/styles/styles.less index d06eefd4f..59ab6e0cd 100644 --- a/ccm-cms-bundle/web/themes/librecms-default/styles/styles.less +++ b/ccm-cms-bundle/web/themes/librecms-default/styles/styles.less @@ -406,7 +406,7 @@ We are using some Webfonts. The fonts are from the Fontsquirrel padding-bottom: 0; width: 100%; - height: 2.8em; + /*height: 2.8em;*/ div#nav-wrapper { margin-left: auto; @@ -436,6 +436,16 @@ We are using some Webfonts. The fonts are from the Fontsquirrel } } + ul.home-link { + li { + border-left: none !important; + border-right: none; + + padding-left: 0.5em; + padding-right: 0.5em; + } + } + ul { display: none; @@ -449,7 +459,15 @@ We are using some Webfonts. The fonts are from the Fontsquirrel text-align: center; li { - &.active { + border-right: 1px solid @color-gradient2; + + &:first-child { + border-left: 1px solid @color-gradient2; + } + + /*padding: 0.4em 0.9em;*/ + + /*&.active { border: 1px solid @color-nav-active; border-radius: 0.5em; @@ -463,28 +481,49 @@ We are using some Webfonts. The fonts are from the Fontsquirrel color: @color-nav-active; } + }*/ + + &:active, &:focus, &:hover { + /*background-color: transparent;*/ + background-color: @color-gradient2; + + color: @color-nav-active; } 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%; + &:link, &:visited { color: @color-nav; } &:active, &:focus, &:hover { - background-color: transparent; + /*background-color: transparent;*/ + background-color: @color-gradient2; + color: @color-nav-active; } + + span { + display: block; + + padding: 0.4em 0.9em; + } } } } @@ -2002,30 +2041,30 @@ We are using some Webfonts. The fonts are from the Fontsquirrel display: table; height: 100%; - + margin-left: auto; margin-right: auto; padding-bottom: 0; - + text-align: center; vertical-align: middle; - + ul { display: table-cell; - + height: 100%; - + vertical-align: middle; li { display: table-cell; - + height: 100%; - + vertical-align: middle; - + &.active { border: none; } diff --git a/ccm-cms-bundle/web/themes/librecms-default/templates/layout.xml b/ccm-cms-bundle/web/themes/librecms-default/templates/layout.xml index 5c4e4da2e..a0906f82b 100644 --- a/ccm-cms-bundle/web/themes/librecms-default/templates/layout.xml +++ b/ccm-cms-bundle/web/themes/librecms-default/templates/layout.xml @@ -274,12 +274,12 @@