diff --git a/ckan/public/base/less/ckan.less b/ckan/public/base/less/ckan.less index 26ec2f50e01..da61b80de44 100644 --- a/ckan/public/base/less/ckan.less +++ b/ckan/public/base/less/ckan.less @@ -2,7 +2,4 @@ @import "module.less"; @import "nav.less"; @import "dataset.less"; - -body { - background: @layout-background-color; -} +@import "masthead.less"; diff --git a/ckan/public/base/less/masthead.less b/ckan/public/base/less/masthead.less new file mode 100644 index 00000000000..6f215d35d94 --- /dev/null +++ b/ckan/public/base/less/masthead.less @@ -0,0 +1,56 @@ +.masthead { + .clearfix(); + #gradient > .vertical(@masthead-background-color-start, @masthead-background-color-end); + color: @masthead-text-color; + padding: 20px; +} + +.masthead a { + color: @masthead-link-color; +} + +.masthead hgroup, +.masthead nav { + float: left; +} + +.masthead hgroup h1, +.masthead hgroup p { + font-size: 34px; + line-height: 1.2; + display: inline; +} + +.masthead hgroup p { + margin-left: 0.3em; + font-style: italic; +} + +.masthead nav { + display: inline-block; + float: right; + line-height: 40px; +} + +.masthead nav ul { + margin: 0; +} + +.masthead nav > ul > li { + display: inline-block; +} + +.masthead nav > ul > li > a { + display: block; + font-size: 14px; + font-weight: bold; + padding: 4px 10px; +} + +.masthead nav > ul > li > a.active { + @inset-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3); + .border-radius(15px); + .box-shadow(@inset-box-shadow); + box-shadow: @inset-box-shadow, 0 1px 0 rgba(255, 255, 255, 0.3); + background-color: rgba(255, 255, 255, 0.15); +} diff --git a/ckan/public/base/less/variables.less b/ckan/public/base/less/variables.less index 3bb1a68a0e2..c6b6a7a1e9f 100644 --- a/ckan/public/base/less/variables.less +++ b/ckan/public/base/less/variables.less @@ -15,6 +15,11 @@ @nav-link-color: #333; +@masthead-text-color: #fff; +@masthead-link-color: @masthead-text-color; +@masthead-background-color-start: #005d7a; +@masthead-background-color-end: #005d7a; + // Twitter Bootstrap Overrides @bodyBackground: @layout-background-color; @baseFontFamily: @layout-font-family; diff --git a/ckan/public/base/test/primer/index.html b/ckan/public/base/test/primer/index.html index ea56ac083bd..089729f96f8 100644 --- a/ckan/public/base/test/primer/index.html +++ b/ckan/public/base/test/primer/index.html @@ -564,7 +564,7 @@

Counselling in London Central, Camden

- 4 datasets found for "London" + 4 datasets found for "London" + Tags: camden [remove] @@ -579,6 +579,22 @@

Counselling in London Central, Camden

+

Masthead (Site Header)

+
+
+

My Site Title

+

My Site Tagline

+
+ +