Download as
Browse Code »

Commit 44e7f2b9c603a312734784147b19e241ab6c9611

Authored by AntonioTerceiro
1 parent e49388c6
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

ActionItem0: design organization 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@351 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 37 additions and 98 deletions   Show diff stats
public/designs/templates/default/stylesheets/blocks.css
View file @e49388c
... ... @@ -1,76 +0,0 @@
1   -/* Default Plain Theme for Blocks */
2   -
3   -div.block
4   -{
5   - background: #FFFFFF;
6   - border: 3px solid #000000;
7   - margin-bottom: 10px;
8   -}
9   -
10   -div.block ul
11   -{
12   - margin-left: 15px;
13   -}
14   -
15   -div.block h3
16   -{
17   - color: #FFFFFF;
18   - background: #545454;
19   - font-family: Sans-serif;
20   - font-size: 13px;
21   - font-weight: normal;
22   - border-bottom: 1px solid black;
23   - height: 27px;
24   - margin: 0px;
25   - line-height: 27px;
26   - padding-left: 10px;
27   -}
28   -
29   -div.block span {
30   -display: none;
31   -}
32   -
33   -div.block a:hover span {
34   -display: inline;
35   -position: absolute;
36   -color: #dfdfdf;
37   -background: #000000;
38   -font-family: Sans-serif;
39   -font-size: 13px;
40   -font-weight: normal;
41   -margin: 10px;
42   -padding-left: 5px;
43   -padding-right: 5px;
44   -}
45   -
46   -div.block a {
47   -display: block;
48   -width: 10px;
49   -height: 10px;
50   -margin-top: 10px;
51   -margin-right: 5px;
52   -float: right;
53   -}
54   -
55   -div.block a.button_block_hide {
56   -border-bottom: 2px solid #dfdfdf;
57   -}
58   -
59   -div.block a:hover.button_block_hide {
60   -border-bottom: 2px solid #000000;
61   -}
62   -
63   -div.block a.button_block_remove {
64   -background: #dfdfdf;
65   -}
66   -
67   -div.block a:hover.button_block_remove {
68   -background: #000000;
69   -}
70   -
71   -div.block_content
72   -{
73   - padding: 5px;
74   -}
75   -
76   -
public/designs/templates/default/stylesheets/style.css
  Diff comments   View file @44e7f2b
1   -@import "blocks.css";
2   -
3 1 body, td, tr, li {
4 2 font-family: Verdana, Arial, Helvetica, sans-serif;
5 3 font-size: 12px;
... ... @@ -42,7 +40,7 @@ blockquote p {
42 40 }
43 41  
44 42 #content {
45   - padding: 1em;
  43 + padding: 0px;
46 44 }
47 45  
48 46 #footer {
... ... @@ -60,47 +58,67 @@ blockquote p {
60 58 }
61 59  
62 60 #boxes {
63   -position: relative;
64   -border: 1px solid red;
  61 + position: relative;
  62 + padding: 1em;
  63 +/* border: 1px solid red; */
65 64 }
66 65  
67   -#boxes ul, #boxes li {
68   -list-style: none;
  66 +ul.block_list {
69 67 margin: 0;
70 68 padding: 0;
71 69 }
72 70  
  71 +ul.block_list li {
  72 +list-style: none;
  73 +}
  74 +
73 75 /* Box 1 is the main area */
74 76 #box_1 {
75 77 margin-right: 220px;
76 78 margin-left: 220px;
77   - border: 1px solid yellow;
  79 + /* border: 1px solid yellow; */
78 80 }
79 81  
80 82 /* Box 2 on the left side */
81 83 #box_2 {
82 84 float: left;
83   - border: 1px solid blue;
  85 + /* border: 1px solid blue; */
84 86 width: 200px;
85 87 padding: 0px;
86 88 }
87 89  
88 90 /* Box 3 on the right side */
89 91 #box_3 {
90   - border: 1px solid green;
  92 + /* border: 1px solid green; */
91 93 width: 200px;
92 94 float: right;
93 95 padding: 0px;
94 96 }
95 97  
96   -table {
97   - border-collapse: collapse;
  98 +#design_editor_toolbar {
  99 + padding: 0.5em;
98 100 }
99 101  
100   -td, th {
101   - border: 1px solid gray;
  102 +#design_editor_toolbar h3 {
  103 + margin-top: 0px;
  104 + margin-bottom: 0.5em;
102 105 }
103 106  
104   -th {
105   - background: gray;
  107 +#design_editor .box {
  108 + border: 2px dashed gray;
  109 + padding: 2px;
  110 +}
  111 +
  112 +#design_editor .hover {
  113 + background: #ff6;
  114 + border: 2px solid black;
  115 +}
  116 +
  117 +#design_editor_toolbar {
  118 + border: 1px solid black;
  119 + margin-bottom: 0.5em;
  120 +}
  121 +
  122 +.design_editor_box_toolbar {
  123 + padding: 0.5em;
106 124 }
... ...
public/designs/themes/green/green.css
  Diff comments   View file @44e7f2b
1   -
2   -#frame {
3   - background-color: pink;
4   -}
  1 +/* empty */
... ...
public/designs/themes/green/green.yml
  Diff comments   View file @44e7f2b
1   -title: "Pink"
2   -description: "A theme with weird taste for colors"
  1 +title: "Green"
  2 +description: "A theme with green stuff"
... ...