zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

first changes for improving css and compass sprites :)

Browse Source
pull/297/head
xavijam 11 years ago
parent afa4e3f7a5
commit 5ffcda6034
5 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File

10
Gemfile
Unescape View File

@ -31,13 +31,13 @@ gem "github_api", "~> 0.10.2"
gem "ejs", "~> 1.1.1"
group :assets do
gem 'asset_sync', "~> 1.0.0"
gem 'sass-rails', "~> 3.2.3"
gem 'sass-rails', "~> 3.2.6"
gem 'uglifier', "~> 1.3.0"
gem 'therubyracer', "~> 0.9.10"
gem 'compass', "~> 0.12.1"
gem 'compass-rails', "~> 1.0.1"
gem 'chunky_png', "~> 1.2.6"
gem 'oily_png', "~> 1.0.2"
gem 'compass', "~> 0.12.2"
gem 'compass-rails', "~> 1.0.3"
gem 'chunky_png', "~> 1.2.9"
gem 'oily_png', "~> 1.1.0"
gem 'mustache-trimmer', git: 'https://github.com/josh/mustache-trimmer.git'
end

37
Gemfile.lock
Unescape View File

@ -62,9 +62,6 @@ GEM
addressable (2.2.8)
aequitas (0.0.2)
arel (3.0.2)
asset_sync (1.0.0)
activemodel
fog (>= 1.8.0)
aws-sdk (1.8.5)
json (~> 1.4)
nokogiri (>= 1.4.4)
@ -82,14 +79,14 @@ GEM
charlock_holmes (0.6.9.4)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.2.8)
chunky_png (1.2.9)
coderay (1.0.9)
coercible (0.2.0)
backports (~> 3.0, >= 3.1.0)
descendants_tracker (~> 0.0.1)
columnize (0.3.6)
compass (0.12.2)
chunky_png (~> 1.2)
chunky_png (~> 1.2.9)
fssm (>= 0.2.7)
sass (~> 3.1)
compass-rails (1.0.3)
@ -116,7 +113,6 @@ GEM
ffi (>= 1.3.0)
mime-types (~> 1.18)
eventmachine (1.0.3)
excon (0.25.3)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.0.0)
@ -130,16 +126,6 @@ GEM
faye-websocket (0.4.7)
eventmachine (>= 0.12.0)
ffi (1.6.0)
fog (1.15.0)
builder
excon (~> 0.25.0)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5)
ruby-hmac
foreman (0.46.0)
thor (>= 0.13.6)
formatador (0.2.4)
@ -196,9 +182,6 @@ GEM
multi_xml (0.5.4)
multipart-post (1.2.0)
mustache (0.99.4)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.6.7)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
oauth (0.4.5)
@ -211,8 +194,8 @@ GEM
multi_json (~> 1.0)
multi_xml (~> 0.5)
rack (~> 1.2)
oily_png (1.0.3)
chunky_png (~> 1.2.1)
oily_png (1.1.0)
chunky_png (~> 1.2.7)
parallel (0.7.1)
parallel_tests (0.15.0)
parallel
@ -297,7 +280,6 @@ GEM
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.10.0)
ruby-hmac (0.4.0)
ruby-ole (1.2.11.3)
rubyzip (0.9.9)
sass (3.2.7)
@ -363,15 +345,14 @@ PLATFORMS
DEPENDENCIES
addressable (= 2.2.8)
aequitas (= 0.0.2)
asset_sync (~> 1.0.0)
aws-sdk (= 1.8.5)
bartt-ssl_requirement (~> 1.4.0)
builder (= 3.0.0)
capybara (= 1.1.2)
charlock_holmes (= 0.6.9.4)
chunky_png (~> 1.2.6)
compass (~> 0.12.1)
compass-rails (~> 1.0.1)
chunky_png (~> 1.2.9)
compass (~> 0.12.2)
compass-rails (~> 1.0.3)
dbf (= 2.0.6)
debugger (= 1.3.0)
ejs (~> 1.1.1)
@ -389,7 +370,7 @@ DEPENDENCIES
nokogiri (= 1.6.0)
oauth (= 0.4.5)
oauth-plugin (= 0.4.0.pre4)
oily_png (~> 1.0.2)
oily_png (~> 1.1.0)
parallel_tests
pg (= 0.13.2)
poltergeist (>= 1.0.0)
@ -412,7 +393,7 @@ DEPENDENCIES
rspec-rails (= 2.10.1)
ruby-ole (= 1.2.11.3)
rubyzip (= 0.9.9)
sass-rails (~> 3.2.3)
sass-rails (~> 3.2.6)
selenium-webdriver (>= 2.5.0)
sequel (= 3.42.0)
sequel_pg (= 1.6.3)

BIN
app/assets/images/icons-s4e5ecb391c.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 104 KiB

1
app/assets/stylesheets/elements/share_private_tables_dialog.css.scss
Unescape View File

@ -7,7 +7,6 @@
@import "compass";
@import "../common/vars";
@import "../common/mixins";
@import "../common/sprites";
.share_private_tables_dialog {
ul {

4
config/compass.rb
Unescape View File

@ -1,2 +1,4 @@
# Require any additional compass plugins here.
project_type = :rails
project_type = :rails
line_comments = false
output_style = :compressed
Write Preview
Loading…
Cancel
Save