From 860fc258c53133385c1b436795386089be695be9 Mon Sep 17 00:00:00 2001 From: Aron Carroll Date: Thu, 17 May 2012 14:05:07 +0100 Subject: [PATCH 1/9] [2375] Add an icons.less file This contains all the styles for the inline icons. They can be used in the same way as the Bootstrap ones but use the .ckan-icon class instead. --- ckan/public/base/less/ckan.less | 1 + ckan/public/base/less/icons.less | 52 ++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 ckan/public/base/less/icons.less diff --git a/ckan/public/base/less/ckan.less b/ckan/public/base/less/ckan.less index eb664e51633..ae703043b6c 100644 --- a/ckan/public/base/less/ckan.less +++ b/ckan/public/base/less/ckan.less @@ -5,6 +5,7 @@ @import "dataset.less"; @import "toolbar.less"; @import "prose.less"; +@import "icons.less"; @import "layout.less"; @import "masthead.less"; @import "footer.less"; diff --git a/ckan/public/base/less/icons.less b/ckan/public/base/less/icons.less new file mode 100644 index 00000000000..b755af3c217 --- /dev/null +++ b/ckan/public/base/less/icons.less @@ -0,0 +1,52 @@ +@small-x: 16px; +@small-y: 16px; +@medium-x: 17px; +@medium-y: 17px; +@medium-offset-y: -@small-y; +@large-x: 20px; +@large-y: 20px; +@large-offset-x: -20px; +@large-offset-y: -(@small-y + @medium-y); + +.ckan-icon { + .ie7-restore-right-whitespace; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("@{image-path}/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; +} + +.ckan-icon-medium { + width: @medium-x; + height: @medium-y; +} + +.ckan-icon-large { + width: @large-x; + height: @large-y; +} + +.ckan-icon-background-position(@offset, @size) { + @w: "@{size}-x"; + @h: "@{size}-y"; + @x: "@{size}-offset-x"; + @y: "@{size}-offset-y"; + width: @@w; + height: @@h; + background-position: (@@x * @offset) @@y; +} + +.ckan-icon-lock { .ckan-icon-background-position(0, "large") } +.ckan-icon-photo { .ckan-icon-background-position(1, "large") } +.ckan-icon-add { .ckan-icon-background-position(2, "large") } +.ckan-icon-home { .ckan-icon-background-position(3, "large") } +.ckan-icon-rewind { .ckan-icon-background-position(4, "large") } +.ckan-icon-tools { .ckan-icon-background-position(5, "large") } +.ckan-icon-flag { .ckan-icon-background-position(6, "large") } +.ckan-icon-clipboard { .ckan-icon-background-position(7, "large") } +.ckan-icon-share { .ckan-icon-background-position(8, "large") } From 36a8fb925af56d5cf8bd17500ffbcbddd2260a91 Mon Sep 17 00:00:00 2001 From: Aron Carroll Date: Thu, 17 May 2012 14:12:39 +0100 Subject: [PATCH 2/9] [2375] Reduce the size of tag fonts --- ckan/public/base/less/mixins.less | 1 + 1 file changed, 1 insertion(+) diff --git a/ckan/public/base/less/mixins.less b/ckan/public/base/less/mixins.less index 9e506401662..164004671fd 100644 --- a/ckan/public/base/less/mixins.less +++ b/ckan/public/base/less/mixins.less @@ -15,6 +15,7 @@ background: url("@{image-path}/background-tag.png") no-repeat -13px center; position: relative; display: block; + font-size: 11px; line-height: 27px; color: @layout-link-color; padding-left: 10px; From 0b62aa6b7110a49627778c803f1da7374c0fd57c Mon Sep 17 00:00:00 2001 From: Aron Carroll Date: Thu, 17 May 2012 14:12:54 +0100 Subject: [PATCH 3/9] [2375] Add icons to dataset page and update sprite sheet --- ckan/public/base/images/sprite-ckan-icons.png | Bin 3203 -> 12710 bytes ckan/templates/package/read.html | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ckan/public/base/images/sprite-ckan-icons.png b/ckan/public/base/images/sprite-ckan-icons.png index c2ed497150b97b41324c1d126219a4cdac387b5d..fce0a6fe09bd68c87b2954b2322dd6f0588d46bd 100644 GIT binary patch delta 12157 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 delta 2553 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 diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html index 8877a76939c..ccc457e4d7e 100644 --- a/ckan/templates/package/read.html +++ b/ckan/templates/package/read.html @@ -127,7 +127,7 @@

Additional Info

From a568c001c77dc3002e142980c8b96720a32e885b Mon Sep 17 00:00:00 2001 From: Aron Carroll Date: Thu, 17 May 2012 14:29:02 +0100 Subject: [PATCH 4/9] [2375] Add social media icons to dataset page --- ckan/public/base/images/sprite-ckan-icons.png | Bin 12710 -> 12764 bytes ckan/public/base/less/icons.less | 30 ++++++++++++++++-- ckan/public/base/less/nav.less | 12 ++++--- ckan/templates/package/read.html | 10 +++--- 4 files changed, 40 insertions(+), 12 deletions(-) diff --git a/ckan/public/base/images/sprite-ckan-icons.png b/ckan/public/base/images/sprite-ckan-icons.png index fce0a6fe09bd68c87b2954b2322dd6f0588d46bd..6b5b93fb088a569ae67d1a87f27b834cfc7cfe52 100644 GIT binary patch delta 11914 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 li > a .ckan-icon { + position: relative; + top: -1px; +} + .nav-simple > li.selected > a { @inner-shadow: inset 0 1px 2px rgba(255, 255, 255, 0.35); @outer-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -34,16 +39,13 @@ } .secondary .nav-simple > li > a:hover:after { + .ckan-icon; + .ckan-icon-circle-add; content: ""; - display: block; position: absolute; top: 50%; right: 5px; - width: 17px; - height: 17px; margin-top: -8px; - background: url("@{sprite-path}") no-repeat; - background-position: -17px 0; } .secondary .nav-simple > li.selected > a { diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html index ccc457e4d7e..b80ef00ccc4 100644 --- a/ckan/templates/package/read.html +++ b/ckan/templates/package/read.html @@ -129,17 +129,17 @@

Additional Info

From 48347364a5699ac0eb9e282fc36199b51f44df91 Mon Sep 17 00:00:00 2001 From: Aron Carroll Date: Thu, 17 May 2012 14:31:20 +0100 Subject: [PATCH 5/9] [2375] Add missing header/footer gradient --- ckan/public/base/less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckan/public/base/less/variables.less b/ckan/public/base/less/variables.less index 999a1b5141e..5c0ad3fbaeb 100644 --- a/ckan/public/base/less/variables.less +++ b/ckan/public/base/less/variables.less @@ -24,7 +24,7 @@ @masthead-text-color: #fff; @masthead-link-color: @masthead-text-color; @masthead-background-color-start: #005d7a; -@masthead-background-color-end: #005d7a; +@masthead-background-color-end: #00536b; // Twitter Bootstrap Overrides @bodyBackground: @layout-background-color; From 5116aa333eab9123fd029a9d8fe95da065495912 Mon Sep 17 00:00:00 2001 From: Aron Carroll Date: Thu, 17 May 2012 14:51:08 +0100 Subject: [PATCH 6/9] [2375] Add icons to toolbar --- ckan/public/base/images/sprite-ckan-icons.png | Bin 12764 -> 12733 bytes ckan/public/base/less/icons.less | 15 --------------- ckan/public/base/less/toolbar.less | 12 ++++++++++++ ckan/templates/package/read.html | 6 +++--- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/ckan/public/base/images/sprite-ckan-icons.png b/ckan/public/base/images/sprite-ckan-icons.png index 6b5b93fb088a569ae67d1a87f27b834cfc7cfe52..4a1228e1064ac43881b9fae8f7b2c0ed3c3e447a 100644 GIT binary patch delta 11277 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.pkg_dict.get('title', c.pkg_dict.get('name'))} From cfafab3baea3a3753da9ae2d94ce99e78fe5519e Mon Sep 17 00:00:00 2001 From: Aron Carroll Date: Thu, 17 May 2012 15:11:33 +0100 Subject: [PATCH 7/9] [2375] Tweak indentation --- ckan/public/base/less/icons.less | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ckan/public/base/less/icons.less b/ckan/public/base/less/icons.less index 92fdb6d3639..e7861afc448 100644 --- a/ckan/public/base/less/icons.less +++ b/ckan/public/base/less/icons.less @@ -52,12 +52,12 @@ // LARGE -.ckan-icon-lock { .ckan-icon-background-position(0, "large") } -.ckan-icon-photo { .ckan-icon-background-position(1, "large") } -.ckan-icon-add { .ckan-icon-background-position(2, "large") } -.ckan-icon-home { .ckan-icon-background-position(3, "large") } -.ckan-icon-rewind { .ckan-icon-background-position(4, "large") } -.ckan-icon-tools { .ckan-icon-background-position(5, "large") } -.ckan-icon-flag { .ckan-icon-background-position(6, "large") } +.ckan-icon-lock { .ckan-icon-background-position(0, "large") } +.ckan-icon-photo { .ckan-icon-background-position(1, "large") } +.ckan-icon-add { .ckan-icon-background-position(2, "large") } +.ckan-icon-home { .ckan-icon-background-position(3, "large") } +.ckan-icon-rewind { .ckan-icon-background-position(4, "large") } +.ckan-icon-tools { .ckan-icon-background-position(5, "large") } +.ckan-icon-flag { .ckan-icon-background-position(6, "large") } .ckan-icon-clipboard { .ckan-icon-background-position(7, "large") } -.ckan-icon-share { .ckan-icon-background-position(8, "large") } +.ckan-icon-share { .ckan-icon-background-position(8, "large") } From e8945dfa981fb61e05ee25f221d88dcaffac2f9c Mon Sep 17 00:00:00 2001 From: Aron Carroll Date: Thu, 17 May 2012 15:38:26 +0100 Subject: [PATCH 8/9] [2375] Style the active facets --- ckan/public/base/less/mixins.less | 21 ++++++++-------- ckan/public/base/less/nav.less | 41 +++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/ckan/public/base/less/mixins.less b/ckan/public/base/less/mixins.less index 164004671fd..d15c7cb4c62 100644 --- a/ckan/public/base/less/mixins.less +++ b/ckan/public/base/less/mixins.less @@ -21,17 +21,16 @@ padding-left: 10px; padding-right: 5px; margin-right: 11px; -} - -.tag:after { - content: ""; - background: url("@{image-path}/background-tag.png") no-repeat center left; - position: absolute; - display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; + &:before { + content: ""; + background: url("@{image-path}/background-tag.png") no-repeat center left; + position: absolute; + display: block; + top: 0; + bottom: 0; + right: -11px; + width: 11px; + } } .unstyled { diff --git a/ckan/public/base/less/nav.less b/ckan/public/base/less/nav.less index d4903959bdc..cd8c936b923 100644 --- a/ckan/public/base/less/nav.less +++ b/ckan/public/base/less/nav.less @@ -10,6 +10,7 @@ .nav-simple > li > a { color: @nav-link-color; padding: 7px 25px; + font-size: 12px; line-height: 14px; // keeps the overall height an even number } @@ -18,18 +19,22 @@ top: -1px; } -.nav-simple > li.selected > a { - @inner-shadow: inset 0 1px 2px rgba(255, 255, 255, 0.35); - @outer-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - .border-radius(3px); - .box-shadow(@inner-shadow); - box-shadow: @inner-shadow, @outer-shadow; - cursor: default; - margin: 2px 5px 3px; - padding: 4px (@module-margin-x - 7); - background: #000; - color: #fff; - border: 1px solid black; +.nav-simple > li.active { + background-color: #f2f2f2; +} + +.nav-simple > li.active > a { + .tag; + .box-sizing(border-box); + font-size: 12px; + font-weight: bold; + position: relative; + left: 4px; + margin-left: 0; + margin-right: 7px; + padding-left: 10px; + padding-right: 0px; + padding: 1px (@module-margin-x - 7); } .secondary .nav-simple > li > a { @@ -38,7 +43,8 @@ position: relative; } -.secondary .nav-simple > li > a:hover:after { +.secondary .nav-simple > li > a:hover:after, +.secondary .nav-simple > li.active > a:hover:after { .ckan-icon; .ckan-icon-circle-add; content: ""; @@ -48,6 +54,15 @@ margin-top: -8px; } +.secondary .nav-simple > li > a:hover:after { + .ckan-icon-circle-add; +} + +.secondary .nav-simple > li.active > a:hover:after { + .ckan-icon-circle-cross; + right: 3px; +} + .secondary .nav-simple > li.selected > a { padding-left: @secondary-module-margin-x - 7; padding-right: @secondary-module-margin-x - 7; From 126964e9ff147c31467c016e9811d336d30cc28a Mon Sep 17 00:00:00 2001 From: Aron Carroll Date: Thu, 17 May 2012 15:42:48 +0100 Subject: [PATCH 9/9] [2375] Hide facet group if it contains no results --- ckan/templates/snippets/facet_list.html | 28 +++++++++++++------------ 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/ckan/templates/snippets/facet_list.html b/ckan/templates/snippets/facet_list.html index 0bb7c56afad..832f320c448 100644 --- a/ckan/templates/snippets/facet_list.html +++ b/ckan/templates/snippets/facet_list.html @@ -23,16 +23,18 @@ how a facet-item's count is displayed. --> -
-

${h.facet_title(title)} Clear All

- - -
+ +
+

${h.facet_title(title)} Clear All

+ + +
+