diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index 985365736d..ad2716ee2f 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -172,6 +172,7 @@ h1.top-header { font-size: 12px; margin: (-$body-line-height) (-$body-line-height) $body-line-height; text-shadow: 0 1px 0 #fff; + height:46px; @media print { display: none; diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index bff06a37a6..60dd559a31 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -20,10 +20,10 @@ div.wiki-wrapper { p { float: left; - padding: 15px; + padding: lh(.75) lh(); margin-bottom: 0; color: darken(#F6EFD4, 55%); - line-height: 1em; + line-height: lh(); } ul { @@ -34,6 +34,7 @@ div.wiki-wrapper { float: left; input[type="button"] { + @extend .block-link; @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); @include border-radius(0); @include transition(); @@ -42,28 +43,31 @@ div.wiki-wrapper { color: darken(#F6EFD4, 80%); text-shadow: none; font-weight: normal; - font-size: 12px; - text-transform: uppercase; + // font-size: 12px; + // text-transform: uppercase; letter-spacing: 1px; - padding: 14.9px; + // padding: 14.9px; + padding: lh(.60) lh(); padding-left: 38px; margin: 0; - + background-position: 12px center; + background-color: darken(#F6EFD4, 5%); + background-repeat: no-repeat; &.view { - background: darken(#F6EFD4, 5%) url('/static/images/sequence-nav/view.png') no-repeat 12px 12px; + background-image: url('/static/images/sequence-nav/view.png'); } &.history { - background: darken(#F6EFD4, 5%) url('/static/images/sequence-nav/history.png') no-repeat 12px 12px; + background-image: url('/static/images/sequence-nav/history.png'); } &.edit { - background: darken(#F6EFD4, 5%) url('/static/images/sequence-nav/edit.png') no-repeat 12px 12px; + background-image: url('/static/images/sequence-nav/edit.png'); } &:hover { - background-color: #F6EFD4; + background-color: transparent; } } }