[ckan-changes] commit/ckan: 3 new changesets
Bitbucket
commits-noreply at bitbucket.org
Wed Sep 14 18:17:24 UTC 2011
3 new changesets in ckan:
http://bitbucket.org/okfn/ckan/changeset/8c805ffe789b/
changeset: 8c805ffe789b
branch: feature-1294-ux-improvements-dataset
user: zephod
date: 2011-09-14 16:09:25
summary: [ux][m]: Imported full button styling, ensuring cross-browser compatibility with twitter style buttons.
affected #: 3 files (2.4 KB)
--- a/ckan/public/css/style.css Tue Sep 13 11:15:03 2011 +0100
+++ b/ckan/public/css/style.css Wed Sep 14 15:09:25 2011 +0100
@@ -905,47 +905,114 @@
float: right;
}
-input.pretty {
- font: -webkit-small-control;
- -webkit-border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- -webkit-transition: 0.1s linear all;
- -webkit-box-align: center;
- -webkit-appearance: button;
- box-sizing: border-box;
- text-align: center;
- margin: 0;
- vertical-align: baseline;
- cursor: pointer;
- display: inline-block;
- background-color: #E6E6E6;
- background-repeat: no-repeat;
- background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
- background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- padding: 5px 14px 6px;
- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
- color: #333;
- font-size: 13px;
- border: 1px solid #CCC;
- border-bottom-color: #BBB;
- border-radius: 4px;
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+
+.pretty-button {
+ cursor: pointer;
+ display: inline-block;
+ background-color: #e6e6e6;
+ background-repeat: no-repeat;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));
+ background-image: -webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ background-image: -moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ background-image: -ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ background-image: -o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ background-image: linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ padding: 4px 14px;
+ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+ color: #333;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-weight: normal;
+ font-size: 13px;
+ line-height: 18px;
+ border: 1px solid #ccc;
+ border-bottom-color: #bbb;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -webkit-transition: 0.1s linear all;
+ -moz-transition: 0.1s linear all;
+ transition: 0.1s linear all;
+}
+.pretty-button:hover {
+ background-position: 0 -15px;
+ color: #333;
+ text-decoration: none;
+}
+.pretty-button.primary, .pretty-button.danger {
+ color: #fff;
+}
+.pretty-button.primary:hover, .pretty-button.danger:hover {
+ color: #fff;
+}
+.pretty-button.primary {
+ background-color: #0064cd;
+ background-repeat: repeat-x;
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+ background-image: -moz-linear-gradient(#049cdb, #0064cd);
+ background-image: -ms-linear-gradient(#049cdb, #0064cd);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+ background-image: -webkit-linear-gradient(#049cdb, #0064cd);
+ background-image: -o-linear-gradient(#049cdb, #0064cd);
+ background-image: linear-gradient(#049cdb, #0064cd);
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ border-color: #0064cd #0064cd #003f81;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.pretty-button.danger {
+ background-color: #9d261d;
+ background-repeat: repeat-x;
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#d83a2e), to(#9d261d));
+ background-image: -moz-linear-gradient(#d83a2e, #9d261d);
+ background-image: -ms-linear-gradient(#d83a2e, #9d261d);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #d83a2e), color-stop(100%, #9d261d));
+ background-image: -webkit-linear-gradient(#d83a2e, #9d261d);
+ background-image: -o-linear-gradient(#d83a2e, #9d261d);
+ background-image: linear-gradient(#d83a2e, #9d261d);
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ border-color: #9d261d #9d261d #5c1611;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.pretty-button.large {
+ font-size: 16px;
+ line-height: 28px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+}
+.pretty-button.small {
+ padding-right: 9px;
+ padding-left: 9px;
+ font-size: 11px;
+}
+.pretty-button.disabled {
+ background-image: none;
+ filter: alpha(opacity=65);
+ -khtml-opacity: 0.65;
+ -moz-opacity: 0.65;
+ opacity: 0.65;
+ cursor: default;
+}
+.pretty-button:disabled {
+ background-image: none;
+ filter: alpha(opacity=65);
+ -khtml-opacity: 0.65;
+ -moz-opacity: 0.65;
+ opacity: 0.65;
+ cursor: default;
+}
+.pretty-button:active {
+ -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+button.pretty-button::-moz-focus-inner, input.pretty-button::-moz-focus-inner {
+ padding: 0;
+ border: 0;
}
-input.pretty.primary {
- color: white;
- background-color: #0064CD;
- background-repeat: repeat-x;
- background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
- background-image: -o-linear-gradient(top, #049cdb, #0064cd);
- background-image: linear-gradient(top, #049cdb, #0064cd);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-
--- a/ckan/public/scripts/templates.js Tue Sep 13 11:15:03 2011 +0100
+++ b/ckan/public/scripts/templates.js Wed Sep 14 15:09:25 2011 +0100
@@ -18,8 +18,8 @@
</dt> \
<dd> \
<input name="url" type="text" placeholder="http://mydataset.com/file.csv" style="width: 60%"/> \
- <input name="save" type="submit" class="pretty primary" value="Add" /> \
- <input name="reset" type="reset" class="pretty" value="Cancel" /> \
+ <input name="save" type="submit" class="pretty-button primary" value="Add" /> \
+ <input name="reset" type="reset" class="pretty-button" value="Cancel" /> \
</dd> \
</dl> \
\
@@ -36,8 +36,8 @@
</dt> \
<dd> \
<input name="url" type="text" placeholder="http://mydataset.com/file.csv" style="width: 60%" /> \
- <input name="save" type="submit" class="pretty primary" value="Add" /> \
- <input name="reset" type="reset" class="pretty" value="Cancel" /> \
+ <input name="save" type="submit" class="pretty-button primary" value="Add" /> \
+ <input name="reset" type="reset" class="pretty-button" value="Cancel" /> \
</dd> \
</dl> \
\
@@ -60,8 +60,8 @@
<dd> \
<input type="file" name="file" /> \
<span class="fileinfo"></span> \
- <input id="upload" name="upload" type="submit" class="pretty primary" value="Add" /> \
- <input id="reset" name="reset" type="reset" class="pretty" value="Cancel" /> \
+ <input id="upload" name="upload" type="submit" class="pretty-button primary" value="Add" /> \
+ <input id="reset" name="reset" type="reset" class="pretty-button" value="Cancel" /> \
</dd> \
</dl> \
</form> \
--- a/ckan/templates/package/new_package_form.html Tue Sep 13 11:15:03 2011 +0100
+++ b/ckan/templates/package/new_package_form.html Wed Sep 14 15:09:25 2011 +0100
@@ -246,7 +246,7 @@
<strong>Important:</strong> By submitting content, you agree to release your contributions
under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Database License</a>. Please <strong>refrain</strong> from editing this page if you are <strong>not</strong> happy to do this.
</p>
- <input id="save" tabindex="99" class="pretty primary" name="save" type="submit" value="Save Changes" />
+ <input id="save" tabindex="99" class="pretty-button primary" name="save" type="submit" value="Save Changes" /></div>
http://bitbucket.org/okfn/ckan/changeset/625f1823cbc2/
changeset: 625f1823cbc2
branch: feature-1294-ux-improvements-dataset
user: rgrp
date: 2011-09-14 20:14:48
summary: [merge,from-default][m]: merge recent changes from default (nothing major but a lot of i18n files).
affected #: 92 files (792.2 KB)
Diff too large to display.
http://bitbucket.org/okfn/ckan/changeset/a730cb525b29/
changeset: a730cb525b29
user: rgrp
date: 2011-09-14 20:16:25
summary: [merge,from-branch][s]: merge zephod's fix for button styling in cset:8c805ffe789b.
affected #: 3 files (2.4 KB)
--- a/ckan/public/css/style.css Wed Sep 14 18:26:27 2011 +0100
+++ b/ckan/public/css/style.css Wed Sep 14 19:16:25 2011 +0100
@@ -905,47 +905,114 @@
float: right;
}
-input.pretty {
- font: -webkit-small-control;
- -webkit-border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- -webkit-transition: 0.1s linear all;
- -webkit-box-align: center;
- -webkit-appearance: button;
- box-sizing: border-box;
- text-align: center;
- margin: 0;
- vertical-align: baseline;
- cursor: pointer;
- display: inline-block;
- background-color: #E6E6E6;
- background-repeat: no-repeat;
- background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
- background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- padding: 5px 14px 6px;
- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
- color: #333;
- font-size: 13px;
- border: 1px solid #CCC;
- border-bottom-color: #BBB;
- border-radius: 4px;
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+
+.pretty-button {
+ cursor: pointer;
+ display: inline-block;
+ background-color: #e6e6e6;
+ background-repeat: no-repeat;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));
+ background-image: -webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ background-image: -moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ background-image: -ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ background-image: -o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ background-image: linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
+ padding: 4px 14px;
+ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+ color: #333;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-weight: normal;
+ font-size: 13px;
+ line-height: 18px;
+ border: 1px solid #ccc;
+ border-bottom-color: #bbb;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -webkit-transition: 0.1s linear all;
+ -moz-transition: 0.1s linear all;
+ transition: 0.1s linear all;
+}
+.pretty-button:hover {
+ background-position: 0 -15px;
+ color: #333;
+ text-decoration: none;
+}
+.pretty-button.primary, .pretty-button.danger {
+ color: #fff;
+}
+.pretty-button.primary:hover, .pretty-button.danger:hover {
+ color: #fff;
+}
+.pretty-button.primary {
+ background-color: #0064cd;
+ background-repeat: repeat-x;
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+ background-image: -moz-linear-gradient(#049cdb, #0064cd);
+ background-image: -ms-linear-gradient(#049cdb, #0064cd);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+ background-image: -webkit-linear-gradient(#049cdb, #0064cd);
+ background-image: -o-linear-gradient(#049cdb, #0064cd);
+ background-image: linear-gradient(#049cdb, #0064cd);
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ border-color: #0064cd #0064cd #003f81;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.pretty-button.danger {
+ background-color: #9d261d;
+ background-repeat: repeat-x;
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#d83a2e), to(#9d261d));
+ background-image: -moz-linear-gradient(#d83a2e, #9d261d);
+ background-image: -ms-linear-gradient(#d83a2e, #9d261d);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #d83a2e), color-stop(100%, #9d261d));
+ background-image: -webkit-linear-gradient(#d83a2e, #9d261d);
+ background-image: -o-linear-gradient(#d83a2e, #9d261d);
+ background-image: linear-gradient(#d83a2e, #9d261d);
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ border-color: #9d261d #9d261d #5c1611;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.pretty-button.large {
+ font-size: 16px;
+ line-height: 28px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+}
+.pretty-button.small {
+ padding-right: 9px;
+ padding-left: 9px;
+ font-size: 11px;
+}
+.pretty-button.disabled {
+ background-image: none;
+ filter: alpha(opacity=65);
+ -khtml-opacity: 0.65;
+ -moz-opacity: 0.65;
+ opacity: 0.65;
+ cursor: default;
+}
+.pretty-button:disabled {
+ background-image: none;
+ filter: alpha(opacity=65);
+ -khtml-opacity: 0.65;
+ -moz-opacity: 0.65;
+ opacity: 0.65;
+ cursor: default;
+}
+.pretty-button:active {
+ -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+button.pretty-button::-moz-focus-inner, input.pretty-button::-moz-focus-inner {
+ padding: 0;
+ border: 0;
}
-input.pretty.primary {
- color: white;
- background-color: #0064CD;
- background-repeat: repeat-x;
- background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
- background-image: -o-linear-gradient(top, #049cdb, #0064cd);
- background-image: linear-gradient(top, #049cdb, #0064cd);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-
--- a/ckan/public/scripts/templates.js Wed Sep 14 18:26:27 2011 +0100
+++ b/ckan/public/scripts/templates.js Wed Sep 14 19:16:25 2011 +0100
@@ -18,8 +18,8 @@
</dt> \
<dd> \
<input name="url" type="text" placeholder="http://mydataset.com/file.csv" style="width: 60%"/> \
- <input name="save" type="submit" class="pretty primary" value="Add" /> \
- <input name="reset" type="reset" class="pretty" value="Cancel" /> \
+ <input name="save" type="submit" class="pretty-button primary" value="Add" /> \
+ <input name="reset" type="reset" class="pretty-button" value="Cancel" /> \
</dd> \
</dl> \
\
@@ -36,8 +36,8 @@
</dt> \
<dd> \
<input name="url" type="text" placeholder="http://mydataset.com/file.csv" style="width: 60%" /> \
- <input name="save" type="submit" class="pretty primary" value="Add" /> \
- <input name="reset" type="reset" class="pretty" value="Cancel" /> \
+ <input name="save" type="submit" class="pretty-button primary" value="Add" /> \
+ <input name="reset" type="reset" class="pretty-button" value="Cancel" /> \
</dd> \
</dl> \
\
@@ -60,8 +60,8 @@
<dd> \
<input type="file" name="file" /> \
<span class="fileinfo"></span> \
- <input id="upload" name="upload" type="submit" class="pretty primary" value="Add" /> \
- <input id="reset" name="reset" type="reset" class="pretty" value="Cancel" /> \
+ <input id="upload" name="upload" type="submit" class="pretty-button primary" value="Add" /> \
+ <input id="reset" name="reset" type="reset" class="pretty-button" value="Cancel" /> \
</dd> \
</dl> \
</form> \
--- a/ckan/templates/package/new_package_form.html Wed Sep 14 18:26:27 2011 +0100
+++ b/ckan/templates/package/new_package_form.html Wed Sep 14 19:16:25 2011 +0100
@@ -259,7 +259,7 @@
<strong>Important:</strong> By submitting content, you agree to release your contributions
under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Database License</a>. Please <strong>refrain</strong> from editing this page if you are <strong>not</strong> happy to do this.
</p>
- <input id="save" tabindex="99" class="pretty primary" name="save" type="submit" value="Save Changes" />
+ <input id="save" tabindex="99" class="pretty-button primary" name="save" type="submit" value="Save Changes" /></div>
Repository URL: https://bitbucket.org/okfn/ckan/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the ckan-changes
mailing list