Download as
Browse Code »

Commit fb17b619f1f1e416b4d1129f59504f9bc169429e

Authored by ValessioBrito
1 parent 4a94a81a
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem138: default block theme icons 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1114 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 33 additions and 38 deletions   Show diff stats
public/designs/templates/default/stylesheets/editor.css
  Diff comments   View file @fb17b61
@@ -40,13 +40,14 @@ border: 1px inset #545454; @@ -40,13 +40,14 @@ border: 1px inset #545454;
40 border: 2px dotted #545454; 40 border: 2px dotted #545454;
41 } 41 }
42 42
43 -#design_editor .design_blocks {  
44 - border: 2px dotted green;  
45 - padding: 5px; 43 +#design_editor ul:hover.design_blocks {
  44 + border: 3px dotted green;
  45 + position: relative;
46 } 46 }
47 47
48 -#design_editor .design_box {  
49 - border: 2px solid transparent; 48 +#design_editor .design_blocks {
  49 + border: 3px dotted #dfdfdf;
  50 + padding: 3px;
50 } 51 }
51 52
52 #design_editor .hover { 53 #design_editor .hover {
public/designs/templates/default/stylesheets/style.css
  Diff comments   View file @fb17b61
@@ -8,33 +8,33 @@ body { @@ -8,33 +8,33 @@ body {
8 font-size: 14px; 8 font-size: 14px;
9 } 9 }
10 10
11 -#wrap.category { 11 +body.category #wrap {
12 background-attachment: fixed; 12 background-attachment: fixed;
13 background: url("../images/bgblue.png") top left no-repeat; 13 background: url("../images/bgblue.png") top left no-repeat;
14 } 14 }
15 15
16 -#wrap.category1 { 16 +body.category1 #wrap {
17 background-attachment: fixed; 17 background-attachment: fixed;
18 - background: url("../images/bgorange.png") top left no-repeat;  
19 - } 18 + background: url("../images/bgorange.png") top left no-repeat;
  19 +}
20 20
21 -#wrap.category2 { 21 +body.category2 #wrap {
22 background-attachment: fixed; 22 background-attachment: fixed;
23 - background: url("../images/bggreen.png") top left no-repeat;  
24 - } 23 + background: url("../images/bggreen.png") top left no-repeat;
  24 +}
25 25
26 -#wrap.category3 { 26 +body.category3 #wrap {
27 background-attachment: fixed; 27 background-attachment: fixed;
28 - background: url("../images/bgpurple.png") top left no-repeat;  
29 - } 28 + background: url("../images/bgpurple.png") top left no-repeat;
  29 +}
30 30
31 -#wrap.category4 { 31 +body.category4 #wrap {
32 background-attachment: fixed; 32 background-attachment: fixed;
33 background: url("../images/bgred.png") top left no-repeat; 33 background: url("../images/bgred.png") top left no-repeat;
34 } 34 }
35 35
36 #header { 36 #header {
37 - height: 65px; 37 + height: 150px;
38 } 38 }
39 39
40 #design_boxes { 40 #design_boxes {
@@ -48,6 +48,7 @@ body { @@ -48,6 +48,7 @@ body {
48 width: 200px; 48 width: 200px;
49 float: right; 49 float: right;
50 margin-right: 10px; 50 margin-right: 10px;
  51 + margin-top: -80px;
51 } 52 }
52 53
53 #design_box_2 { 54 #design_box_2 {
@@ -95,9 +96,3 @@ div#notice { @@ -95,9 +96,3 @@ div#notice {
95 background: #ffffa9; 96 background: #ffffa9;
96 padding: 10px; 97 padding: 10px;
97 } 98 }
98 -  
99 -  
100 -#design_editor .design_box {  
101 - border: 1px solid black;  
102 - height: 400px;  
103 -}  
public/designs/themes/default/icons.png 0 → 100644
View file @fb17b61

1.28 KB
public/designs/themes/default/style.css
  Diff comments   View file @fb17b61
@@ -65,26 +65,28 @@ float: left; @@ -65,26 +65,28 @@ float: left;
65 margin-top: 3px !important; 65 margin-top: 3px !important;
66 margin-right: 5px !important; 66 margin-right: 5px !important;
67 float: right !important; 67 float: right !important;
  68 + opacity: 0.7;
68 } 69 }
69 70
70 .design_block a.button_block_hide { 71 .design_block a.button_block_hide {
71 -border-bottom: 2px solid #dfdfdf; 72 +background: url('icons.png') no-repeat;
  73 +background-position: -60px 0px;
72 } 74 }
73 -  
74 -.design_block a:hover.button_block_hide {  
75 -border-bottom: 2px solid #000000; 75 +.design_block a.button_block_remove {
  76 +background: red url('icons.png') no-repeat;
  77 +background-position: -80px 0px;
76 } 78 }
77 -  
78 -.design_block a.button_block_remove,  
79 -.design_block a.button_block_item_options,  
80 .design_block a.button_block_options { 79 .design_block a.button_block_options {
81 - background: #dfdfdf; 80 +background: blue url('icons.png') no-repeat;
  81 +background-position: 0px 0px;
  82 +}
  83 +.design_block a.button_block_item_options {
  84 +background: url('icons.png') no-repeat;
  85 +background-position: -40px 0px;
82 } 86 }
83 87
84 -.design_block a:hover.button_block_remove,  
85 -.design_block a.hover.button_block_item_options,  
86 -.design_block a.hover.button_block_options {  
87 - background: #000000; 88 +.design_block a:hover.design_button_block {
  89 + opacity: 1.0;
88 } 90 }
89 91
90 .design_block_content 92 .design_block_content
@@ -102,9 +104,6 @@ border-bottom: 2px solid #000000; @@ -102,9 +104,6 @@ border-bottom: 2px solid #000000;
102 display: block; 104 display: block;
103 color: #000; 105 color: #000;
104 } 106 }
105 -.design_block ul li a:hover {  
106 - background: #ddd;  
107 -}  
108 107
109 .button_block_options { 108 .button_block_options {
110 position: absolute; 109 position: absolute;