mercury-rails 0.6.0 → 0.7.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercury-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -328,9 +328,9 @@ files:
 - app/assets/javascripts/mercury/uploader.js.coffee
 - app/assets/javascripts/mercury.js
 - app/assets/stylesheets/mercury/all_images.css.erb
-- app/assets/stylesheets/mercury/buttons.css
+- app/assets/stylesheets/mercury/bootstrap-ish.css
+- app/assets/stylesheets/mercury/bootstrap-overrides.css
 - app/assets/stylesheets/mercury/dialog.css
-- app/assets/stylesheets/mercury/form.css
 - app/assets/stylesheets/mercury/lightview.css
 - app/assets/stylesheets/mercury/mercury.css
 - app/assets/stylesheets/mercury/modal.css
@@ -517,7 +517,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1612885216118549362
+      hash: 1994431124283081759
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -526,7 +526,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1612885216118549362
+      hash: 1994431124283081759
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21

data/app/assets/stylesheets/mercury/buttons.css

@@ -1,73 +0,0 @@
-
-/*
- * Buttons TODO: Refactor to a more generic button
- *----------------------------------------------------------------------------*/
-.btn {
-  -webkit-background-clip: padding;
-  -moz-background-clip: padding;
-  background-clip: padding-box;
-  border-radius: 0.4em;
-  display: block;
-  font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', sans-serif;
-  font-size: 1.2em;
-  background: #f5f5f5;
-  border: 1px solid #a9a9a9;
-  color: #666;
-  cursor: pointer;
-  line-height: normal;
-  text-shadow: 0 -1px 0 rgba(255, 255, 255, 0.75);
-  padding: 0.4em 0.8em;
-}
-.btn:visited {
-  color: #666;
-}
-.btn:hover,
-.btn:focus,
-.btn.active {
-  color: #666;
-  background: #ededed;
-}
-.btn:hover,
-.btn.active {
-  border: 1px solid #8f8f8f;
-}
-.btn:hover {
-  -webkit-box-shadow: inset 0 1px 4px rgba(255, 255, 255, 0.7);
-  -moz-box-shadow: inset 0 1px 4px rgba(255, 255, 255, 0.7);
-  box-shadow: inset 0 1px 4px rgba(255, 255, 255, 0.7);
-}
-.btn:focus {
-  -webkit-box-shadow: 0 0 8px rgba(82, 168, 236, 0.6), inset 0 1px 4px rgba(255, 255, 255, 0.7);
-  -moz-box-shadow: 0 0 8px rgba(82, 168, 236, 0.6), inset 0 1px 4px rgba(255, 255, 255, 0.7);
-  box-shadow: 0 0 8px rgba(82, 168, 236, 0.6), inset 0 1px 4px rgba(255, 255, 255, 0.7);
-  border: 1px solid rgba(82, 168, 236, 0.8);
-  outline: 0;
-}
-.btn:active,
-.btn.active {
-  -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
-  box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
-}
-
-/* Overrides for the blue "important" button */
-.btn.important {
-  background: #268bd2;
-  border: 1px solid #16527c;
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.btn.important:visited {
-  color: #fff;
-}
-.btn.important:hover,
-.btn.important:focus,
-.btn.important.active {
-  color: #fff;
-  background: #2482c5;
-}
-.btn.important:hover,
-.btn.important.active {
-  border: 1px solid #0f3550;
-}
-

data/app/assets/stylesheets/mercury/form.css

@@ -1,125 +0,0 @@
-/*
- * Forms
- *---------------------------------------------------------------------------*/
-.mercury-form,
-.mercury-form ul,
-.mercury-form ol,
-.mercury-form li,
-.mercury-form fieldset,
-.mercury-form p {
-  margin: 0;
-  padding: 0;
-}
-.mercury-form abbr {
-  border: 0;
-  font-variant: normal;
-}
-.mercury-form fieldset {
-  margin-bottom: 10px;
-  background: #F6F6F6;
-  border: 1px solid #CCC;
-  border-radius: 7px;
-  -moz-border-radius: 7px;
-}
-.mercury-form fieldset:last-child {
-  margin-bottom: 0;
-}
-.mercury-form fieldset legend {
-  font-weight: bold;
-  margin-left: 10px;
-  margin-bottom: -4px;
-}
-.mercury-form ol {
-  margin: 12px 9px;
-}
-.mercury-form ol li {
-  display: block;
-  margin-bottom: 10px;
-}
-.mercury-form label {
-  display: block;
-  float: left;
-  width: 23%;
-  margin-right: 9px;
-  text-align: right;
-  line-height: 27px;
-  font-size: 1.1em;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.mercury-form label input {
-  width: auto !important;
-  margin: 0 5px 0 2px !important;
-}
-.mercury-form select,
-.mercury-form input[type=text],
-.mercury-form input[type=password],
-.mercury-form textarea,
-.mercury-form input.text {
-  margin: 0;
-  border: 2px solid #CCC;
-  padding: 2px 4px;
-  font-family: Arial, Geneva, sans-serif;
-  font-size: 1.5em;
-  width: 74%;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-}
-.mercury-form li.boolean {
-  margin-left: 23%;
-  padding-left: 9px;
-}
-.mercury-form li.boolean label {
-  width: auto;
-}
-.mercury-form fieldset.buttons,
-.mercury-form fieldset.actions {
-  clear: both;
-  padding: 0;
-  background: none;
-  border: none;
-  text-align: left;
-}
-.mercury-form fieldset.buttons ol,
-.mercury-form fieldset.actions ol {
-  margin: 0 -2px 0 0;
-  float: right;
-}
-.mercury-form fieldset.buttons ol li,
-.mercury-form fieldset.actions ol li {
-  float: left;
-  padding-left: 0.5em;
-  padding-right: 0;
-}
-.mercury-form fieldset.buttons .commit,
-.mercury-form fieldset.actions .action {
-  margin: 0;
-}
-.mercury-form fieldset.buttons .commit input,
-.mercury-form fieldset.actions .action input {
-  -webkit-background-clip: padding;
-  -moz-background-clip: padding;
-  background-clip: padding-box;
-  border-radius: 0.4em;
-  display: block;
-  font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', sans-serif;
-  font-size: 1.2em;
-  background: #268bd2;
-  border: 1px solid #16527c;
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  cursor: pointer;
-  line-height: normal;
-  padding: 0.4em 0.8em;
-}
-.mercury-form fieldset.buttons .commit input:hover,
-.mercury-form fieldset.actions .action input:hover {
-  color: #fff;
-  background: #2482c5;
-  border: 1px solid #0f3550;
-  -webkit-box-shadow: inset 0 1px 4px rgba(255, 255, 255, 0.7);
-  -moz-box-shadow: inset 0 1px 4px rgba(255, 255, 255, 0.7);
-  box-shadow: inset 0 1px 4px rgba(255, 255, 255, 0.7);
-}