Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to new version #18

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/assets/images/alpha-horizontal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/alpha.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/hue-horizontal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/hue.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/saturation.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,647 changes: 1,109 additions & 538 deletions app/assets/javascripts/bootstrap-colorpicker.js

Large diffs are not rendered by default.

127 changes: 0 additions & 127 deletions app/assets/stylesheets/bootstrap-colorpicker.css.scss

This file was deleted.

251 changes: 251 additions & 0 deletions app/assets/stylesheets/bootstrap-colorpicker.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,251 @@
.colorpicker-saturation {
float: left;
width: 100px;
height: 100px;
cursor: crosshair;
background-image: image-url("saturation.png");
}

.colorpicker-saturation i {
position: absolute;
top: 0;
left: 0;
display: block;
width: 5px;
height: 5px;
margin: -4px 0 0 -4px;
border: 1px solid #000;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}

.colorpicker-saturation i b {
display: block;
width: 5px;
height: 5px;
border: 1px solid #fff;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}

.colorpicker-hue,
.colorpicker-alpha {
float: left;
width: 15px;
height: 100px;
margin-bottom: 4px;
margin-left: 4px;
cursor: row-resize;
}

.colorpicker-hue i,
.colorpicker-alpha i {
position: absolute;
top: 0;
left: 0;
display: block;
width: 100%;
height: 1px;
margin-top: -1px;
background: #000;
border-top: 1px solid #fff;
}

.colorpicker-hue {
background-image: image-url("hue.png");
}

.colorpicker-alpha {
display: none;
background-image: image-url("alpha.png");
}

.colorpicker-saturation,
.colorpicker-hue,
.colorpicker-alpha {
background-size: contain;
}

.colorpicker {
top: 0;
left: 0;
z-index: 2500;
min-width: 130px;
padding: 4px;
margin-top: 1px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
*zoom: 1;
}

.colorpicker:before,
.colorpicker:after {
display: table;
line-height: 0;
content: "";
}

.colorpicker:after {
clear: both;
}

.colorpicker:before {
position: absolute;
top: -7px;
left: 6px;
display: inline-block;
border-right: 7px solid transparent;
border-bottom: 7px solid #ccc;
border-left: 7px solid transparent;
border-bottom-color: rgba(0, 0, 0, 0.2);
content: '';
}

.colorpicker:after {
position: absolute;
top: -6px;
left: 7px;
display: inline-block;
border-right: 6px solid transparent;
border-bottom: 6px solid #ffffff;
border-left: 6px solid transparent;
content: '';
}

.colorpicker div {
position: relative;
}

.colorpicker.colorpicker-with-alpha {
min-width: 140px;
}

.colorpicker.colorpicker-with-alpha .colorpicker-alpha {
display: block;
}

.colorpicker-color {
height: 10px;
margin-top: 5px;
clear: both;
background-image: image-url("alpha.png");
background-position: 0 100%;
}

.colorpicker-color div {
height: 10px;
}

.colorpicker-selectors {
display: none;
height: 10px;
margin-top: 5px;
clear: both;
}

.colorpicker-selectors i {
float: left;
width: 10px;
height: 10px;
cursor: pointer;
}

.colorpicker-selectors i + i {
margin-left: 3px;
}

.colorpicker-element .input-group-addon i,
.colorpicker-element .add-on i {
display: inline-block;
width: 16px;
height: 16px;
vertical-align: text-top;
cursor: pointer;
}

.colorpicker.colorpicker-inline {
position: relative;
z-index: auto;
display: inline-block;
float: none;
}

.colorpicker.colorpicker-horizontal {
width: 110px;
height: auto;
min-width: 110px;
}

.colorpicker.colorpicker-horizontal .colorpicker-saturation {
margin-bottom: 4px;
}

.colorpicker.colorpicker-horizontal .colorpicker-color {
width: 100px;
}

.colorpicker.colorpicker-horizontal .colorpicker-hue,
.colorpicker.colorpicker-horizontal .colorpicker-alpha {
float: left;
width: 100px;
height: 15px;
margin-bottom: 4px;
margin-left: 0;
cursor: col-resize;
}

.colorpicker.colorpicker-horizontal .colorpicker-hue i,
.colorpicker.colorpicker-horizontal .colorpicker-alpha i {
position: absolute;
top: 0;
left: 0;
display: block;
width: 1px;
height: 15px;
margin-top: 0;
background: #ffffff;
border: none;
}

.colorpicker.colorpicker-horizontal .colorpicker-hue {
background-image: image-url("hue-horizontal.png");
}

.colorpicker.colorpicker-horizontal .colorpicker-alpha {
background-image: image-url("alpha-horizontal.png");
}

.colorpicker.colorpicker-hidden {
display: none;
}

.colorpicker.colorpicker-visible {
display: block;
}

.colorpicker-inline.colorpicker-visible {
display: inline-block;
}

.colorpicker-right:before {
right: 6px;
left: auto;
}

.colorpicker-right:after {
right: 7px;
left: auto;
}

.colorpicker-no-arrow:before {
border-right: 0;
border-left: 0;
}

.colorpicker-no-arrow:after {
border-right: 0;
border-left: 0;
}
1 change: 1 addition & 0 deletions bootstrap-colorpicker-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
gem.version = BootstrapColorpickerRails::Rails::VERSION

gem.add_dependency "railties", ">= 3.0"
gem.add_dependency "sass-rails", ">= 4.0"
gem.add_development_dependency "bundler", ">= 1.0"
gem.add_development_dependency "rake"
end
2 changes: 1 addition & 1 deletion lib/bootstrap-colorpicker-rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module BootstrapColorpickerRails
module Rails
VERSION = "0.3.1"
VERSION = "0.4.0"
end
end