Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'dev'

  • Loading branch information...
commit 681cfe8b0d7233b80fa7d8f5d36dc9a96ed94a2c 2 parents 4f41b5a + 0043a33
Lokesh Dhakar authored
6  .gitignore
@@ -36,6 +36,6 @@ Thumbs.db
36 36
 # App Files #
37 37
 #############
38 38
 *.tmproj
39  
-*.css
40  
-*.sass-cache
41  
-*.sass
  39
+.sass-cache/*
  40
+Rakefile
  41
+rsync-exclude
2  README.markdown
Source Rendered
@@ -33,7 +33,7 @@ colors.
33 33
 ##License
34 34
 by Lokesh Dhakar | [lokeshdhakar.com](http://www.lokeshdhakar.com)  | [twitter.com/lokeshdhakar](http://twitter.com/lokeshdhakar)  
35 35
 
36  
-Thanks to [jfsiii](https://github.com/jfsiii) for a large number of code improvements and other for submitting issues and fixes.
  36
+Thanks to [jfsiii](https://github.com/jfsiii) for a large number of code improvements and others for submitting issues and fixes.
37 37
 
38 38
 Licensed under the [Creative Commons Attribution 2.5 License](http://creativecommons.org/licenses/by/2.5/)
39 39
 
6  css/app.css
@@ -449,9 +449,3 @@ header {
449 449
 canvas {
450 450
   display: none;
451 451
 }
452  
-
453  
-/* line 181, ../sass/app.sass */
454  
-img {
455  
-  width: 100px;
456  
-  height: 100px;
457  
-}
2  index.html
@@ -24,7 +24,7 @@
24 24
       <h4><a href="http://lokeshdhakar.com">by Lokesh Dhakar</a></small></h4>
25 25
       
26 26
       <p>A script for grabbing the dominant color or color palette from an image. Uses Javascript and the canvas tag to make it happen.</p>
27  
-      <p><a href="http://www.lokeshdhakar.com/2011/11/03/color-thief/">Read more on my blog</a> | <a href="https://github.com/lokesh/color-thief">Get the code on Github</a>
  27
+      <p><a href="http://www.lokeshdhakar.com/color-thief/">Read more on my blog</a> | <a href="https://github.com/lokesh/color-thief">Get the code on Github</a>
28 28
       </p>
29 29
 	</header>
30 30
 
179  sass/app.sass
... ...
@@ -0,0 +1,179 @@
  1
+@import "compass/reset"
  2
+@import "compass/css3"
  3
+@import "compass/utilities/general/clearfix"
  4
+
  5
+body, input, textarea
  6
+  margin: 40px
  7
+  color: #888
  8
+  background: #222
  9
+  font: 16px/1.625em "Varela Round", "lucida grande", tahoma, sans-serif
  10
+  -wbkite-font-smoothing: antialiased
  11
+  
  12
+h1, h2, h3, h4, h5, h6
  13
+  color: white
  14
+  font-family: "Terminal Dosis", "lucida grande", tahoma, sans-serif
  15
+  line-height: 1em
  16
+  font-weight: 600
  17
+  margin-bottom: 0.5em
  18
+ 
  19
+h1
  20
+  font-size: 72px
  21
+  line-height: 0.5em
  22
+  margin-bottom: 0.3em
  23
+  small
  24
+    font-size: 20px
  25
+  span
  26
+    +transition( color 1s)
  27
+  &:hover
  28
+    .char1
  29
+      +transition( color .2s)    
  30
+      color: red
  31
+    .char2
  32
+      +transition( color .2s .1s)    
  33
+      color: orange
  34
+    .char3
  35
+      +transition( color .2s .2s)    
  36
+      color: yellow
  37
+    .char4
  38
+      +transition( color .2s .3s)    
  39
+      color: green
  40
+    .char5
  41
+      +transition( color .2s .4s)    
  42
+      color: blue
  43
+    .char6
  44
+      +transition( color .2s .5s)    
  45
+      color: indigo
  46
+    .char7
  47
+      +transition( color .2s .6s)    
  48
+      color: violet
  49
+    .char8
  50
+      +transition( color .2s .7s)    
  51
+      color: red
  52
+    .char9
  53
+      +transition( color .2s .8s)    
  54
+      color: orange
  55
+    .char10
  56
+      +transition( color .2s .9s)    
  57
+      color: yellow
  58
+    .char11
  59
+      +transition( color .2s 1s)    
  60
+      color: green
  61
+
  62
+h2
  63
+  font-size: 40px
  64
+  line-height: 1.2em
  65
+  text-align: center
  66
+
  67
+h3
  68
+  font-size: 16px
  69
+  letter-spacing: 0.1em
  70
+  text-transform: uppercase
  71
+
  72
+h4
  73
+  font-size: 20px
  74
+  margin-bottom: 1.25em
  75
+
  76
+p
  77
+  margin-bottom: 1.25em
  78
+
  79
+
  80
+strong
  81
+  font-weight: bold
  82
+  
  83
+  
  84
+/* Forms */
  85
+input
  86
+  &[type=text], &[type=password]
  87
+    background: #fafafa
  88
+    +box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.1))
  89
+    border: 1px solid #dddddd
  90
+    color: #888888
  91
+    +border-radius(4px)
  92
+
  93
+textarea
  94
+  background: #fafafa
  95
+  +box-shadow( inset 0 1px 1px rgba(0, 0, 0, 0.1))
  96
+  border: 1px solid #dddddd
  97
+  color: #888888
  98
+  +border-radius(4px)
  99
+
  100
+input[type=text]:focus
  101
+  color: #373737
  102
+
  103
+textarea
  104
+  &:focus
  105
+    color: #373737
  106
+  padding-left: 3px
  107
+  width: 98%
  108
+
  109
+input[type=text]
  110
+  padding: 3px
  111
+
  112
+
  113
+/* Links */
  114
+a
  115
+  color: #09a1ec
  116
+  text-decoration: none
  117
+  &:hover
  118
+    color: #7fd2fa
  119
+
  120
+#container
  121
+  width: 900px
  122
+  margin: 0 auto
  123
+
  124
+header
  125
+  padding-bottom: 40px
  126
+  text-align: center
  127
+  width: 600px
  128
+  margin: 0 auto
  129
+
  130
+.medianCutPalette h3
  131
+  margin-top: 20px
  132
+
  133
+.imageSection
  134
+  margin-bottom: 80px
  135
+  background: #111111
  136
+  +border-radius(10px)
  137
+  +pie-clearfix
  138
+  .imageWrap
  139
+    +border-left-radius(10px)
  140
+    width: 400px
  141
+    height: 300px
  142
+    float: left
  143
+    margin-right: 20px
  144
+    background: url(../img/dark_checkered_bg.png)
  145
+    .targetImage
  146
+      +border-left-radius(10px)
  147
+  .colors
  148
+    margin-top: 20px
  149
+    width: 400px
  150
+    float: left
  151
+    .function
  152
+      clear: left
  153
+      margin-bottom: 10px
  154
+      +pie-clearfix
  155
+      .swatches .swatch
  156
+        width: 40px
  157
+        height: 20px
  158
+        margin-right: 2px
  159
+        background: #dddddd
  160
+        float: left
  161
+        +transition( all .5s)
  162
+        &:hover
  163
+          +transition( none)
  164
+          +scale(1.2, 1.2)
  165
+          +box-shadow( 0 1px 10px black)
  166
+        &:first-child
  167
+          +border-left-radius(4px)
  168
+        &:last-child
  169
+          +border-right-radius(4px)
  170
+
  171
+/* Hardcoding the offset for the FB icon example
  172
+.fbIcon .imageWrap .targetImage
  173
+  +border-radius(0)
  174
+  position: relative
  175
+  top: 142px
  176
+  left: 192px
  177
+
  178
+canvas
  179
+  display: none

0 notes on commit 681cfe8

Please sign in to comment.
Something went wrong with that request. Please try again.