Download as
Browse Code »

Commit 999ca1fa73017503ad42f8a4dfa19fdcaa461f02

Authored by AurelioAHeckert
1 parent 897dda03
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem152: detalhes 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1287 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 6 changed files with 38 additions and 12 deletions   Show diff stats
app/models/tags_block.rb
  Diff comments   View file @999ca1f
@@ -12,7 +12,7 @@ class TagsBlock < Block @@ -12,7 +12,7 @@ class TagsBlock < Block
12 help_textile( 12 help_textile(
13 _('The tag is created when you add some one to your article. 13 _('The tag is created when you add some one to your article.
14 Try to add some tags to some articles and see your tag cloud to grow.'), 14 Try to add some tags to some articles and see your tag cloud to grow.'),
15 - _('How tags works here?') ) + 15 + _('How tags works here?'), :class => 'help_tags' ) +
16 tag_cloud( owner.tags, :id, 16 tag_cloud( owner.tags, :id,
17 owner.generate_url(:controller => 'profile', :action => 'tag') + '/', 17 owner.generate_url(:controller => 'profile', :action => 'tag') + '/',
18 :max_size => 20, :min_size => 10 ) 18 :max_size => 20, :min_size => 10 )
app/views/layouts/application.rhtml
  Diff comments   View file @999ca1f
@@ -95,7 +95,6 @@ @@ -95,7 +95,6 @@
95 <!-- Abaixo um cabeçalho especifico para a pagina de usuario. --> 95 <!-- Abaixo um cabeçalho especifico para a pagina de usuario. -->
96 </div><!-- id='header' --> 96 </div><!-- id='header' -->
97 <div id='content'> 97 <div id='content'>
98 - <!-- <a name='main_content'/></a> -->  
99 <div id='header_content'> 98 <div id='header_content'>
100 </div> 99 </div>
101 100
public/designs/templates/default/stylesheets/style.css
  Diff comments   View file @999ca1f
@@ -14,7 +14,11 @@ @@ -14,7 +14,11 @@
14 } 14 }
15 15
16 .box-3 { 16 .box-3 {
  17 + margin-top: 20px;
17 float: right; 18 float: right;
18 width: 200px; 19 width: 200px;
19 } 20 }
20 21
  22 +.block {
  23 + padding: 10px 0px;
  24 +}
public/stylesheets/button.css
  Diff comments   View file @999ca1f
  1 +
1 .button-bar { 2 .button-bar {
2 margin-top: 1em; 3 margin-top: 1em;
3 } 4 }
@@ -5,12 +6,11 @@ @@ -5,12 +6,11 @@
5 a.button, 6 a.button,
6 a.button:visited, 7 a.button:visited,
7 input.button { 8 input.button {
8 - margin-left: 5px; 9 + margin: 0px 2px;
9 background-repeat: no-repeat; 10 background-repeat: no-repeat;
10 background-position: 50% 50%; 11 background-position: 50% 50%;
11 - padding: 1px 0px 1px 20px;  
12 - height: 24px;  
13 - line-height: 22px; 12 + padding: 2px 0px 2px 20px;
  13 + line-height: 24px;
14 font-size: 12px; 14 font-size: 12px;
15 color: black; 15 color: black;
16 text-decoration: none; 16 text-decoration: none;
@@ -44,17 +44,24 @@ a.button.with-text, @@ -44,17 +44,24 @@ a.button.with-text,
44 a.button.with-text:visited, 44 a.button.with-text:visited,
45 input.button.with-text { 45 input.button.with-text {
46 background-color: #EEE; 46 background-color: #EEE;
47 - padding: 1px 2px 1px 25px; 47 + padding: 2px 2px 2px 25px;
48 background-position: 2px 50%; 48 background-position: 2px 50%;
49 border: 1px solid #AAA; 49 border: 1px solid #AAA;
  50 + line-height: 26px;
  51 +}
  52 +.msie a.button.with-text,
  53 +.msie a.button.with-text:visited,
  54 +.msie input.button.with-text {
  55 + line-height: 16px;
  56 + margin: 2px;
50 } 57 }
51 58
52 a.button:hover, 59 a.button:hover,
53 input.button:hover, 60 input.button:hover,
54 a.button.with-text:hover, 61 a.button.with-text:hover,
55 input.button.with-text:hover { 62 input.button.with-text:hover {
56 - border: 1px solid #777;  
57 - background-color: #DDD; 63 + border: 1px solid #678;
  64 + background-color: #CDE;
58 color: #000; 65 color: #000;
59 } 66 }
60 67
@@ -64,3 +71,4 @@ input.button.with-text:hover { @@ -64,3 +71,4 @@ input.button.with-text:hover {
64 .icon-button:hover { 71 .icon-button:hover {
65 border: none; 72 border: none;
66 } 73 }
  74 +
public/stylesheets/common.css
  Diff comments   View file @999ca1f
@@ -46,7 +46,7 @@ body.category4 #wrap { background-image: url(&quot;../images/bg-top-vermelho.png&quot;); } @@ -46,7 +46,7 @@ body.category4 #wrap { background-image: url(&quot;../images/bg-top-vermelho.png&quot;); }
46 } 46 }
47 47
48 #header { 48 #header {
49 - height: 50px; 49 + height: 60px;
50 } 50 }
51 51
52 #design_boxes { 52 #design_boxes {
@@ -341,7 +341,21 @@ div#notice { @@ -341,7 +341,21 @@ div#notice {
341 #content h1, #content h2, #content h3, 341 #content h1, #content h2, #content h3,
342 #content h4, #content h5, #content h6 { 342 #content h4, #content h5, #content h6 {
343 margin: 10px 0px; 343 margin: 10px 0px;
344 -} 344 + color: #2A5896;
  345 +}
  346 +body.category1 #content h1, body.category1 #content h2, body.category1 #content h3,
  347 +body.category1 #content h4, body.category1 #content h5, body.category1 #content h6
  348 + { color: #E26B00 }
  349 +body.category2 #content h1, body.category2 #content h2, body.category2 #content h3,
  350 +body.category2 #content h4, body.category2 #content h5, body.category2 #content h6
  351 + { color: #58A80A }
  352 +body.category3 #content h1, body.category3 #content h2, body.category3 #content h3,
  353 +body.category3 #content h4, body.category3 #content h5, body.category3 #content h6
  354 + { color: #694371 }
  355 +body.category4 #content h1, body.category4 #content h2, body.category4 #content h3,
  356 +body.category4 #content h4, body.category4 #content h5, body.category4 #content h6
  357 + { color: #B80000 }
  358 +
345 #content .block-title { 359 #content .block-title {
346 margin: 0px 0px 10px 0px; 360 margin: 0px 0px 10px 0px;
347 } 361 }
public/stylesheets/menu.css
  Diff comments   View file @999ca1f
@@ -190,7 +190,7 @@ body.category4 #assets_menu_list { background-image: url(/images/top-bar/assets- @@ -190,7 +190,7 @@ body.category4 #assets_menu_list { background-image: url(/images/top-bar/assets-
190 } 190 }
191 191
192 #user_box a, 192 #user_box a,
193 -#assets_menu a, 193 +/*#assets_menu a,*/
194 .top_extra_menu a { 194 .top_extra_menu a {
195 font-size: 12px; 195 font-size: 12px;
196 font-weight: bold; 196 font-weight: bold;
@@ -267,6 +267,7 @@ body.category4 .top_extra_menu a:hover { background: #CC0000; color: #FFF } @@ -267,6 +267,7 @@ body.category4 .top_extra_menu a:hover { background: #CC0000; color: #FFF }
267 position: absolute; 267 position: absolute;
268 top: 2px; 268 top: 2px;
269 left: 64px; 269 left: 64px;
  270 + float: left;
270 } 271 }
271 #user_box #open_search:hover { 272 #user_box #open_search:hover {
272 background: none; 273 background: none;