redde 0.1.2 → 0.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/main.sass +2 -3
  2. data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/page-sidebar.sass +2 -0
  3. data/lib/generators/redde/layout/templates/layouts/admin.html.haml +1 -1
  4. data/lib/redde/version.rb +1 -1
  5. data/spec/generators/photo_generator_spec.rb +1 -1
  6. metadata +3 -3
data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/main.sass CHANGED
@@ -31,9 +31,8 @@
31
31
 
32
32
  .content
33
33
  padding: 30px
34
-
35
- // .sidebar .content
36
- // margin-right: 305px
34
+ .page._sidebar &
35
+ margin-right: 305px
37
36
 
38
37
  // .sidebar .page-sidebar
39
38
  // float: right
data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/page-sidebar.sass CHANGED
@@ -4,6 +4,8 @@
4
4
  padding: 30px 0 0 30px
5
5
  width: 245px
6
6
  border-left: 1px solid #efefef
7
+ .page._full &
8
+ display: none
7
9
  ul.photos
8
10
  list-style-type: none
9
11
  li
data/lib/generators/redde/layout/templates/layouts/admin.html.haml CHANGED
@@ -20,7 +20,7 @@
20
20
  .notice= notice
21
21
  - if alert
22
22
  .alert= alert
23
- .page{:class => "#{yield(:page_sidebar).empty? ? 'full' : 'sidebar'}"}
23
+ .page{:class => "#{yield(:page_sidebar).empty? ? '_full' : '_sidebar'}"}
24
24
  #filter
25
25
  = yield(:filter)
26
26
  .page-sidebar
data/lib/redde/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Redde
2
- VERSION = "0.1.2"
2
+ VERSION = "0.1.3"
3
3
  end
data/spec/generators/photo_generator_spec.rb CHANGED
@@ -18,7 +18,7 @@ describe Redde::Generators::PhotoGenerator do
18
18
  end
19
19
 
20
20
  it "Generates views" do
21
- assert_file "app/views/admin/photos/index.html.haml"
21
+ assert_directory "app/views/admin/photos"
22
22
  end
23
23
 
24
24
  it "Generates model" do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: redde
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -328,7 +328,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
328
328
  version: '0'
329
329
  segments:
330
330
  - 0
331
- hash: -159252183115178573
331
+ hash: -2195825711924323486
332
332
  required_rubygems_version: !ruby/object:Gem::Requirement
333
333
  none: false
334
334
  requirements:
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
337
337
  version: '0'
338
338
  segments:
339
339
  - 0
340
- hash: -159252183115178573
340
+ hash: -2195825711924323486
341
341
  requirements: []
342
342
  rubyforge_project:
343
343
  rubygems_version: 1.8.24