Skip to content

Commit

Permalink
Merge branch 'feature-2375-demo-theme' of github.com:okfn/ckan into f…
Browse files Browse the repository at this point in the history
…eature-2375-demo-theme
  • Loading branch information
tobes committed May 24, 2012
2 parents 53cc673 + 20574ea commit c4ee72d
Show file tree
Hide file tree
Showing 20 changed files with 3,955 additions and 66 deletions.
Binary file modified ckan/public/base/images/sprite-ckan-icons.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions ckan/public/base/less/ckan.less
Expand Up @@ -2,6 +2,7 @@
@import "mixins.less";
@import "module.less";
@import "nav.less";
@import "forms.less";
@import "dataset.less";
@import "toolbar.less";
@import "prose.less";
Expand All @@ -20,7 +21,3 @@ body {
[hidden] {
display: none;
}

.btn {
font-weight: bold;
}
7 changes: 7 additions & 0 deletions ckan/public/base/less/dataset.less
Expand Up @@ -51,6 +51,13 @@
color: #000;
}

.filter-list .extra {
margin-top: 10px;
font-size: 18px;
font-weight: normal;
color: #000;
}

.search-giant {
position: relative;
}
Expand Down
143 changes: 143 additions & 0 deletions ckan/public/base/less/forms.less
@@ -0,0 +1,143 @@
.btn,
label {
font-weight: bold;
}

label {
font-size: 14px;
line-height: 2;
}

label:after {
content: ":";
}

input,
textarea,
select,
.uneditable-input {
font-size: 14px;
padding: 8px 10px;
}

select {
margin-top: 6px;
}

textarea {
max-width: 100%;
}

.control-full input,
.control-full select,
.control-full textarea {
.box-sizing(border-box);
height: auto;
width: 100%;
}

.control-large input,
.control-large .control-label {
font-size: 18px;
line-height: 2;
}

.control-large input {
}

.form-actions {
background: none;
margin-left: -@gutter-x;
margin-right: -@gutter-x;
padding-bottom: 0; // Prevents reduces the padding when included in a module.
text-align: right;
}

// Override the default form widths.
.form-horizontal .control-label {
width: 115px;
}

.form-horizontal .controls {
margin-left: 125px;
}

.form-horizontal .info-block {
position: relative;
float: right;
width: 265px;
font-size: 11px;
color: #AEAEAE;
line-height: 1.3;
padding: 6px 0 6px 25px;
}

.form-horizontal .info-block:after {
.ckan-icon;
.ckan-icon-info-flat;
content: "";
position: absolute;
left: 0;
top: 10px;
}

.editor textarea {
.border-radius(@inputBorderRadius @inputBorderRadius 0 0);
border-bottom: none;
font-size: 12px;
}

.editor .info-block {
.border-radius(0 0 @inputBorderRadius @inputBorderRadius);
display: block;
float: none;
padding: 4px 10px;
background: #ebebeb;
width: auto;
border: 1px solid @inputBorder;
border-top: none;
font-size: 11px;
color: #282828;
}

.editor .info-block:after {
content: none;
}

.stages {
.unstyled;
.clearfix;
color: #aeaeae;
counter-reset: stage;
margin-bottom: @gutter-y;
text-align: right;
}

.stages li {
display: inline-block;
line-height: 27px;
counter-increment: stage;
opacity: 0.5;
margin-right: 35px;
}

.stages li:before {
.border-radius(14px);
content: counter(stage);
display: inline-block;
width: 27px;
height: 27px;
margin-right: 5px;
color: #fff;
background: #aeaeae;
font-weight: bold;
text-align: center;
}

.stages .active {
opacity: 0.8;
}

.stages a {
color: #aeaeae;
}
10 changes: 8 additions & 2 deletions ckan/public/base/less/icons.less
Expand Up @@ -42,7 +42,9 @@
.ckan-icon-email { .ckan-icon-background-position(3, "small") }
.ckan-icon-share { .ckan-icon-background-position(4, "small") }
.ckan-icon-feed { .ckan-icon-background-position(5, "small") }
.ckan-icon-lock { .ckan-icon-background-position(6, "small") }
.ckan-icon-calendar{ .ckan-icon-background-position(6, "small") }
.ckan-icon-file { .ckan-icon-background-position(7, "small") }
.ckan-icon-lock { .ckan-icon-background-position(8, "small") }

// MEDIUM

Expand All @@ -52,7 +54,7 @@

// LARGE

.ckan-icon-lock { .ckan-icon-background-position(0, "large") }
.ckan-icon-large-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") }
Expand All @@ -61,3 +63,7 @@
.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-info { .ckan-icon-background-position(9, "large") }
.ckan-icon-download { .ckan-icon-background-position(10, "large") }
.ckan-icon-star { .ckan-icon-background-position(11, "large") }
.ckan-icon-info-flat { .ckan-icon-background-position(12, "large") }
4 changes: 2 additions & 2 deletions ckan/public/base/less/main.less
@@ -1,2 +1,2 @@
@import "./vendor/bootstrap/bootstrap.less";
@import "./ckan.less";
@import "vendor/bootstrap/bootstrap.less";
@import "ckan.less";
26 changes: 26 additions & 0 deletions ckan/public/base/less/mixins.less
Expand Up @@ -37,3 +37,29 @@
margin: 0;
list-style: none;
}

.simple-item {
padding: 7px @gutter-x;
border-bottom: 1px dotted #ccc;
}

.simple-list {
.clearfix;
.unstyled;
padding-bottom: 7px;

& > li {
.simple-item;
}

.ckan-icon {
position: relative;
top: 0px;
}
}

.secondary .simple-list > li {
padding-left: @gutter-small-x;
padding-right: @gutter-small-x;
position: relative;
}
14 changes: 7 additions & 7 deletions ckan/public/base/less/module.less
Expand Up @@ -8,7 +8,7 @@

.module > .heading {
font-size: 14px;
padding: 0 @module-margin-x;
padding: 0 @gutter-x;
border-bottom: 1px solid @module-heading-border-color;
#gradient > .vertical(@module-heading-background-color-start, @module-heading-background-color-end);
}
Expand All @@ -22,26 +22,26 @@
}

.module > .content {
padding: 0 @module-margin-x;
padding: 0 @gutter-x;
margin: 20px 0;
}

.module > .content:first-child {
margin-top: 0;
padding-top: @module-margin-y;
padding-top: @gutter-y;
}

.module > .content:last-child {
margin-bottom: 0;
padding-bottom: @module-margin-y;
padding-bottom: @gutter-y;
}

.module > .content :last-child {
margin-bottom: 0;
}

.module > .footer {
padding: 0 @module-margin-x 7px;
padding: 0 @gutter-x 7px;
}

.module .read-more {
Expand Down Expand Up @@ -101,7 +101,7 @@
.heading,
.content,
.footer {
padding-left: @secondary-module-margin-x;
padding-right: @secondary-module-margin-x;
padding-left: @gutter-small-x;
padding-right: @gutter-small-x;
}
}
37 changes: 15 additions & 22 deletions ckan/public/base/less/nav.less
@@ -1,24 +1,15 @@
.nav-simple {
.clearfix();
padding-bottom: 7px;
}

.nav-simple > li {
border-bottom: 1px dotted #ccc;
.simple-list;
}

.nav-simple > li > a {
color: @nav-link-color;
padding: 7px 25px;
margin: -7px -@gutter-x;
padding: 7px @gutter-x;
font-size: 12px;
line-height: 14px; // keeps the overall height an even number
}

.nav-simple > li > a .ckan-icon {
position: relative;
top: -1px;
}

.nav-simple > li.active {
background-color: #f2f2f2;
}
Expand All @@ -34,17 +25,19 @@
margin-right: 7px;
padding-left: 10px;
padding-right: 0px;
padding: 1px (@module-margin-x - 7);
padding: 1px (@gutter-x - 7);
}

.secondary .nav-simple > li > a {
padding-left: @secondary-module-margin-x;
padding-right: @secondary-module-margin-x;
padding-left: @gutter-small-x;
padding-right: @gutter-small-x;
position: relative;
}

.secondary .nav-simple > li > a:hover:after,
.secondary .nav-simple > li.active > a:hover:after {
// FACET NAVIGATION

.nav-facet > li > a:hover:after,
.nav-facet > li.active > a:hover:after {
.ckan-icon;
.ckan-icon-circle-add;
content: "";
Expand All @@ -54,16 +47,16 @@
margin-top: -8px;
}

.secondary .nav-simple > li > a:hover:after {
.nav-facet > li > a:hover:after {
.ckan-icon-circle-add;
}

.secondary .nav-simple > li.active > a:hover:after {
.nav-facet > 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;
.nav-facet > li.selected > a {
padding-left: @gutter-small-x - 7;
padding-right: @gutter-small-x - 7;
}
2 changes: 1 addition & 1 deletion ckan/public/base/less/toolbar.less
Expand Up @@ -8,7 +8,7 @@
.box-shadow(none);
float: left;
background: none;
margin: 0;
margin: 0 0 0 @gutter-small-x;
padding: 0;
border: none;
}
Expand Down
9 changes: 5 additions & 4 deletions ckan/public/base/less/variables.less
Expand Up @@ -13,11 +13,12 @@
@module-heading-border-color: #d0d0d0;
@module-heading-background-color-start: #f5f5f5;
@module-heading-background-color-end: #f0f0f0;
@module-margin-x: 25px;
@module-margin-y: 20px;

@secondary-module-margin-x: 15px;
@secondary-module-margin-y: @module-margin-y;

@gutter-x: 25px;
@gutter-y: 20px;
@gutter-small-x: 15px;
@gutter-small-y: @gutter-y;

@nav-link-color: #333;

Expand Down
3,473 changes: 3,471 additions & 2 deletions ckan/public/base/test/vendor/less.js

Large diffs are not rendered by default.

0 comments on commit c4ee72d

Please sign in to comment.