meurio_ui 1.4.6 → 1.4.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/mrui_compartilhaco.png +0 -0
  3. data/app/assets/stylesheets/meurio_ui/meurio_header.css.sass +9 -1
  4. data/app/views/meurio_ui/meurio_header.html.slim +7 -3
  5. data/lib/meurio_ui/version.rb +1 -1
  6. data/lib/meurio_ui/view_helpers.rb +4 -3
  7. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f6810e1e25c09eadf4cfec26068258c8758c6186
4
- data.tar.gz: 060c38616c2a722d33b1f44543a1bfcbfc97b387
3
+ metadata.gz: 34743074125d0ca2b3fc50faadb76beb48255204
4
+ data.tar.gz: 8b5a89fb2f5dc357ecadf012f3bff3a205e0f8a0
5
5
  SHA512:
6
- metadata.gz: 8065a8beac994cec825f0c07434230dcc31a4ef87d167ea3565d033e578c2156f6d0963be5f3a156df0dda7e15d874181146fa7738765238d65ad6a972a00449
7
- data.tar.gz: aa61378c25f1de6d691ef186a9ee50920df01d1e28236f76210b5341d2ed48aa6d9adf25e3891b0e778de4d569d65f4e2f2ef3396c4d4d74410c418d0c3d8f2f
6
+ metadata.gz: 1e59ce324a47a88add5766fc9573dade6f94f5154d1ae43b7abe54c8eaff31a7ba0de249d11da31c73929ba4b7b4cc68b93283757227d4fad79f68f09ead51d2
7
+ data.tar.gz: 977a72336c7c0bb45b86f8647edf8a29325ad9a7ed1a659116015525ce41ffc865752d83a92e0cb3ce6af7bac80d6daaede63a4bddf0889f2b788a1cf576122b
data/app/assets/stylesheets/meurio_ui/meurio_header.css.sass CHANGED
@@ -14,8 +14,15 @@
14
14
  height: auto
15
15
  border-right: $light-blue 1px solid
16
16
  padding-right: 1em
17
+ padding-left: .5em
17
18
  a
18
19
  padding-left: 0
20
+ li.toggle-topbar.icon-list
21
+ margin-top: 5px
22
+ &:before
23
+ color: white
24
+ font-size: rem-calc(32)
25
+ cursor: pointer
19
26
  section.top-bar-section
20
27
  padding: 0 !important
21
28
  ul.left a
@@ -78,7 +85,7 @@
78
85
  background: white
79
86
  top: 59px
80
87
  z-index: 1000
81
- width: 845px
88
+ width: 940px
82
89
  padding: 2em 1em 1em 1em
83
90
  display: none
84
91
  .meurio_app
@@ -136,6 +143,7 @@
136
143
  font-weight: bold
137
144
  color: black
138
145
  &.btn
146
+ +border-radius(2px)
139
147
  background: $orange
140
148
  color: white
141
149
  padding: .5em
data/app/views/meurio_ui/meurio_header.html.slim CHANGED
@@ -1,15 +1,16 @@
1
1
  .meurio_header
2
2
  .contain-to-grid
3
- nav.top-bar data={topbar: true}
3
+ nav.top-bar data={topbar: true} role="navigation"
4
4
  ul.title-area
5
5
  li.name
6
6
  h1= link_to image_tag('mrui_minhascidades.png'), "http://www.#{ENV['MEURIO_DOMAIN']}"
7
+ li.toggle-topbar.icon-list
7
8
  section.top-bar-section
8
9
  ul.left
9
10
  li= link_to image_tag('mrui_meurio.png'), "http://www.minhascidades.org.br/organizations/1", target: :blank
10
11
  li.divider
11
12
  li= link_to image_tag('mrui_minhasampa.png'), "http://www.minhascidades.org.br/organizations/2", target: :blank
12
- - if @app == :pdp || @app == :minhascidades || @app == :accounts || @app == :multitude
13
+ - if [:minhascidades, :pdp, :multitude, :compartilhaco, :accounts].include?(@app)
13
14
  ul.right
14
15
  - if current_user.present?
15
16
  li.has-dropdown
@@ -63,8 +64,11 @@
63
64
  = link_to("http://deguarda.#{ENV["MEURIO_DOMAIN"]}/", class: :meurio_app) do
64
65
  = image_tag("mrui_deguarda.png")
65
66
  span= application_name(:deguarda)
67
+ = link_to("http://compartilhaco.#{ENV["MEURIO_DOMAIN"]}/", class: :meurio_app) do
68
+ = image_tag("mrui_compartilhaco.png")
69
+ span= application_name(:compartilhaco)
66
70
  .alert
67
- - unless [:minhascidades, :pdp, :multitude].include?(@app)
71
+ - unless [:minhascidades, :pdp, :multitude, :compartilhaco].include?(@app)
68
72
  a.icon-warning href="#" data-dropdown="support-alert"
69
73
  #support-alert.f-dropdown.content data-dropdown-content=true
70
74
  | Esta versão do #{application_name(@app)} está disponível apenas para a cidade do Rio de Janeiro. Em breve disponibilizaremos para toda a #{link_to "Rede Minhas Cidades", "http://www.minhascidades.org.br/"}.
data/lib/meurio_ui/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module MeurioUi
2
2
  module Rails
3
- VERSION = "1.4.6"
3
+ VERSION = "1.4.7"
4
4
  end
5
5
  end
data/lib/meurio_ui/view_helpers.rb CHANGED
@@ -16,6 +16,7 @@ module MeurioUi
16
16
  return "De Olho" if app == :deolho
17
17
  return "De Guarda" if app == :deguarda
18
18
  return "Multitude" if app == :multitude
19
+ return "Compartilhaço" if app == :compartilhaco
19
20
  end
20
21
 
21
22
  def meurio_ui_assets
@@ -24,7 +25,7 @@ module MeurioUi
24
25
  end
25
26
 
26
27
  def sign_in_path
27
- if [:pdp, :multitude, :minhascidades].include? @app
28
+ if [:pdp, :multitude, :minhascidades, :compartilhaco].include? @app
28
29
  "http://accounts.#{ENV["MEURIO_DOMAIN"]}/?service=#{request.url}"
29
30
  else
30
31
  "http://accounts.#{ENV["MEURIO_DOMAIN"]}/?redirect_url=#{request.url}"
@@ -32,7 +33,7 @@ module MeurioUi
32
33
  end
33
34
 
34
35
  def sign_out_path
35
- if [:pdp, :multitude, :minhascidades].include? @app
36
+ if [:pdp, :multitude, :minhascidades, :compartilhaco].include? @app
36
37
  "http://accounts.#{ENV["MEURIO_DOMAIN"]}/logout?service=#{request.url}"
37
38
  else
38
39
  "http://accounts.#{ENV["MEURIO_DOMAIN"]}/logout?redirect_url=#{request.url}"
@@ -40,7 +41,7 @@ module MeurioUi
40
41
  end
41
42
 
42
43
  def edit_profile_path
43
- if [:pdp, :multitude, :minhascidades].include? @app
44
+ if [:pdp, :multitude, :minhascidades, :compartilhaco].include? @app
44
45
  "http://accounts.#{ENV["MEURIO_DOMAIN"]}/users/#{current_user.id}/edit"
45
46
  else
46
47
  "http://accounts.#{ENV["MEURIO_DOMAIN"]}/users/#{current_user.id}/edit"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: meurio_ui
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.6
4
+ version: 1.4.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nícolas Iensen
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-08-27 00:00:00.000000000 Z
12
+ date: 2014-09-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -69,6 +69,7 @@ files:
69
69
  - app/assets/fonts/mark_simonson_-_proxima_nova_soft_semibold-webfont.ttf
70
70
  - app/assets/fonts/mark_simonson_-_proxima_nova_soft_semibold-webfont.woff
71
71
  - app/assets/images/mrui_apoie.png
72
+ - app/assets/images/mrui_compartilhaco.png
72
73
  - app/assets/images/mrui_deguarda.png
73
74
  - app/assets/images/mrui_deolho.png
74
75
  - app/assets/images/mrui_divider.jpg
@@ -120,4 +121,3 @@ signing_key:
120
121
  specification_version: 4
121
122
  summary: Default UI elements for Meu Rio projects
122
123
  test_files: []
123
- has_rdoc: