Skip to content

Commit

Permalink
Merge pull request #1 from buffpojken/master
Browse files Browse the repository at this point in the history
Merged branches
  • Loading branch information
thomasf committed Jun 15, 2012
2 parents e1e524d + e958d2c commit 067b27c
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.1
0.0.2
8 changes: 5 additions & 3 deletions koan.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

Gem::Specification.new do |s|
s.name = "koan"
s.version = "0.0.1"
s.version = "0.0.2"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["buffpojken"]
s.date = "2012-01-04"
s.date = "2012-01-05"
s.description = "Rails-dependent gem for Zendesk integration"
s.email = "daniel@sykewarrior.com"
s.extra_rdoc_files = [
Expand All @@ -18,10 +18,12 @@ Gem::Specification.new do |s|
]
s.files = [
"app/controllers/koan/koan_controller.rb",
"app/views/koan/koan/new.html.erb",
"config/routes.rb",
"lib/engine.rb",
"lib/koan.rb",
"lib/koan/engine.rb",
"public/images/koan/tab.png",
"public/javascripts/koan/koan.js",
"public/stylesheets/koan/koan.css"
]
s.homepage = "http://github.com/buffpojken/koan"
Expand Down
22 changes: 22 additions & 0 deletions public/stylesheets/koan/koan.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#koan-btn{background-image:url('/images/koan/tab.png');width:70px;height:118px;position:fixed;left:-20px;top:45%;cursor:pointer}
#koan-popin-body{width:400px}
.koan-field, .koan-area{background: #f6f6f6; width:390px;height:33px;padding:5px 5px;clear:both;margin:25px 0px 30px 0px;
-webkit-box-shadow: 1px 1px 6px rgba(50, 50, 50, 0.75);
-moz-box-shadow: 1px 1px 6px rgba(50, 50, 50, 0.75);
box-shadow: 1px 1px 6px rgba(50, 50, 50, 0.75);
background: -moz-linear-gradient(top, #f6f6f6 0%, #f4f4f4 44%, #e6e6e6 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f6f6f6), color-stop(44%,#f4f4f4), color-stop(100%,#e6e6e6));
background: -webkit-linear-gradient(top, #f6f6f6 0%,#f4f4f4 44%,#e6e6e6 100%);
background: -o-linear-gradient(top, #f6f6f6 0%,#f4f4f4 44%,#e6e6e6 100%);
background: -ms-linear-gradient(top, #f6f6f6 0%,#f4f4f4 44%,#e6e6e6 100%);
background: linear-gradient(top, #f6f6f6 0%,#f4f4f4 44%,#e6e6e6 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f6f6f6', endColorstr='#e6e6e6',GradientType=0 );}
.koan-area{height:160px}
.koan-field label{float:left;padding:9px 0px 0px 0px;text-shadow:#fff 0px 1px 0;width:18%;text-align:center}
.koan-field input{width:80%;float:right;background-color:transparent;outline:none;height:29px;-webkit-appearance: none;outline:none;border:none}
.koan-field.active, .koan-area.active{background-color:#fff;-moz-box-shadow:inset 0 0 4px #AAA,0 0 8px rgba(0,151,220,0.4);-webkit-box-shadow:inset 0 0 4px rgba(0,0,0,0.35),0 0 8px rgba(0,151,220,0.4);box-shadow:inset 0 0 4px #AAA,0 0 8px rgba(0,151,220,0.4);background-image:none;}
.koan-area label{float:left;padding:10px 0px 0px 13px;text-shadow:#fff 0px 1px 0;width:97%;text-align:left}
.koan-area textarea{width:97%;height:115px;margin:3px 0px 0px 0px;background-color:transparent;border:none;-webkit-appearance: none;resize:none;padding:5px;}
.koan-button-row{position:relative;left:50%;float:left;clear:left;}
.koan-button-row .inner{position:relative;left:-50%;text-align:left;}
.koan-button-row button{margin:0px auto;}

0 comments on commit 067b27c

Please sign in to comment.