From 7e93dd07242c4d753a7515a4c58fd9e8d8bf1e4e Mon Sep 17 00:00:00 2001 From: Jannik Beyerstedt Date: Sat, 21 May 2016 00:26:34 +0200 Subject: [PATCH] [SITE] new main menu and logo-icon --- assets/css/foundation.css | 3 -- assets/css/foundation.css.map | Bin 55175 -> 55134 bytes assets/css/main.css | 75 ++++++++++------------------- assets/css/main.css.map | Bin 8538 -> 7459 bytes assets/css/templates/photo.css | 6 ++- assets/css/templates/photo.css.map | Bin 7485 -> 7632 bytes assets/scss/_mainvariables.scss | 4 -- assets/scss/foundation.scss | 5 -- assets/scss/main.scss | 65 ++++++------------------- assets/scss/templates/photo.scss | 5 +- site/snippets/base/cont-header.php | 39 +++++++-------- 11 files changed, 65 insertions(+), 137 deletions(-) diff --git a/assets/css/foundation.css b/assets/css/foundation.css index 1fcdca9..036a36f 100644 --- a/assets/css/foundation.css +++ b/assets/css/foundation.css @@ -2344,7 +2344,4 @@ a.text-danger:hover { margin-left: 0; margin-right: 0; } } -.bg-inverse { - color: #eceeef; } - /*# sourceMappingURL=foundation.css.map */ \ No newline at end of file diff --git a/assets/css/foundation.css.map b/assets/css/foundation.css.map index e51eb1cd307c3080d0baf3ca3ba83119971c1cc3..d98f325b55382551fd5aeb42230974439608f01f 100644 GIT binary patch delta 28 jcmZo)&wOtk^9G;mLP|PZ3JOYjiMgr8N>&Qdv0SwPm1YSy delta 69 zcmcb&j=6n3^9G;m*4EaJj{ZS9;f{{sI?j%c&epDu&S5&rFh7`=&cR;$++&ABA_N)8$?uSF`e5p9ug#voJ<;P`!Al{|$kg9Zg8SA8*r)wnO4p_Z$b{e)q48=is^Z zu@uP=umjMezy7`>K(z37zKoADm+*J`ePYVTn6{P@T&>~f%=Hw(np*@5nh`98uhS`P zWH-D4z<_KMALS8_25%IFoDEHui*cji=>Q7(KG(3zilJB$u1f(jyI`+aGmdA#wsVdI`MH*c(I`IN8y^Sh|JrL zY7xR{FWOy3dmxxmNSVtSS*fL5FK#SZ=~+{}|Yus%S4UW4i1 z(YRVHCkf&cWEs!%R%PTGpWRr}ma_|V94+e--xRx-TO!i(1^z19(BS5d=8gDu-ka~u z9*#-sh&6W_PCd2@u*-wx(ez%aAC_gH` Zrtq}FFkLxW94mZPsV=Unv(w6_LL_qQ?&pRAvL% zOassq9kc@52H0jgfX+C8#qyA?;SahKzQY*gDZ^1XXgOxlI~@w^l)*7(cl@e4IBpPh zG3dV>)E)zKLs04v1R-$s>r8E1-e;EJ{lya49!z*n=3|{{iVxBxSUQB`c!gm3GmMY!&)0u zs_b`)H+f!GVtI4HAQZhqDLA8{6kh};*A*8u7y$A#uP`F1xMqe|*%rW-*WO@)nvcs5 z_zt~9ZstC(E4KJOF)JR#t`bm4&PS55O@K`j-&6^-GE^LcI%>?C$d~UB-{T9b1TFNc zlmgvJ?sw2Nmw9=}lm8I!nQb-D_}HwmU4Y$zMvgR$s=^~+7m3Gs$b%eCp@a+tG?J=6 zNx2kq3-CWQCCbsM{Yg2p*{}|Z^}7;OES#wr4(CAgrX#Ur=}=5qMXm^lGGnEObY{-enXBRH zvU*094p5|!F~sThqe!tw4w(|4CZ-a2jDW4ENC6Y?RwKTz{L%l7yh}RW)tDj8BjCRonu* zUl8;0#rc-)uswjikQK|@ZM%+goF}$;7T>ztbif1B&6aaGIBcDw9h{>TNBoL^k2Xu( oKk#O&boz7Z-AE+m> z!1aOb^VV^9bjfwHws!P4b1HD2{F75gy~HWcNhj6OF%@hr$dyqrR~jN*SvlE;tDn(w J^BJx}AprP&R4o7i delta 200 zcmca$z1M2PMh=Bw4;_C;M}KQqub=`a9dAcRZyi_9;7}b;M@LT`cdv-a7dhm({X@Zu zfc&7zzc_5UeS=~AfXPmrw%o2@d0(Ks$K)Sr|G9M4@S F1OUIBIT!!{ diff --git a/assets/scss/_mainvariables.scss b/assets/scss/_mainvariables.scss index 5ec0362..c2cd155 100644 --- a/assets/scss/_mainvariables.scss +++ b/assets/scss/_mainvariables.scss @@ -9,11 +9,7 @@ $link_visited: lighten($color_font, 60%); $col_xxs_bp: 543px; -$nav_bgColor: $color_base; -$nav_borderColor: darken($nav_bgColor, 15%); $nav_fgColor: #fff; -$nav_textXsWidth: 80px; -$nav_textSmWidth: 109px; $footer_color_bg: #bebebe; diff --git a/assets/scss/foundation.scss b/assets/scss/foundation.scss index b3e88c9..3e65efc 100644 --- a/assets/scss/foundation.scss +++ b/assets/scss/foundation.scss @@ -58,8 +58,3 @@ margin-right: 0; } } - -// fix change in bootstrap -.bg-inverse { - color: #eceeef; -} diff --git a/assets/scss/main.scss b/assets/scss/main.scss index 5b48bd2..9a4a19e 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -92,10 +92,10 @@ main div.container { $header_logoSize: 75px; header { - margin-bottom: 10px; img { width: $header_logoSize; height: $header_logoSize; + margin: 4px 0; float: left; } @@ -109,7 +109,6 @@ nav { padding-left: 0; // reset a { text-decoration: none; - background-color: inherit; color: inherit; } li { @@ -123,59 +122,19 @@ nav { @include media-breakpoint-up(sm) { nav { float: right; - height: $header_logoSize; ul.nav { a { float: left; text-align: center; - font-size: 16px; - padding: 45px 0 5px; - width: $nav_textSmWidth; + font-size: 18px; + font-weight: 300; + margin: 30px 9px 1px; } - a:hover, a:focus, a.active { - color: $nav_fgColor; - background-color: darken($nav_bgColor, 10%); + border-bottom: 1px solid $color_accent; } - } - ul.nav.home { - color: $nav_fgColor; - a { - background-color: $nav_bgColor; - border-right: 1px solid $nav_borderColor; - } - a:last-child { - border-right: 0; - } - - a.active { - color: $nav_fgColor; - border-bottom: 4px solid $color_accent; - padding-bottom: 1px; - } - } - ul.nav.main, ul.nav.second { - height: $header_logoSize/2; - a { - padding: 8px 0 5.5px; - } - } - ul.nav.main { - color: $nav_bgColor; - a.active { - color: $nav_fgColor; - border-bottom: 4px solid $color_accent; - padding-bottom: 1.5px; - } - } - ul.nav.second { - color: $nav_fgColor; - a { - background-color: $nav_bgColor; - } - a.active { - border-bottom: 4px solid $color_accent; - padding-bottom: 1.5px; + a.section { + font-weight: 500; } } } @@ -184,17 +143,20 @@ nav { nav { button.navbar-toggler { float: right; - margin-top: 10px; + margin-top: 24px; font-family: inherit; font-weight: 300; } ul.mobileNav { + color: $color_font_inv; + background-color: $color_bg_inv; + padding: 1rem 1rem; a { - font-size: 18px; + font-size: 20px; font-weight: 300; } a.active { - color: lighten($nav_bgColor, 10%); + color: $color_accent; font-weight: 700; } } @@ -212,6 +174,7 @@ nav { @include hover-focus { text-decoration: none; + outline: none; } } } diff --git a/assets/scss/templates/photo.scss b/assets/scss/templates/photo.scss index f9a3083..ed2dbbc 100644 --- a/assets/scss/templates/photo.scss +++ b/assets/scss/templates/photo.scss @@ -25,8 +25,11 @@ main p { } @include media-breakpoint-up(sm) { nav { - ul.nav.main { + ul.nav { color: $nav_fgColor; + a.section:hover, a.section:focus { + border: none; + } } } } diff --git a/site/snippets/base/cont-header.php b/site/snippets/base/cont-header.php index 612ee22..cc873c2 100644 --- a/site/snippets/base/cont-header.php +++ b/site/snippets/base/cont-header.php @@ -21,23 +21,21 @@ if ($page->depth() == 1) { ?>
-
-
+ + + +
@@ -53,19 +51,18 @@ if ($page->depth() == 1) { Menü -