Commit b4de75271de8a4f9ee33fbde404a97cfb30b92d6

Authored by Juliana
2 parents cc515c82 44378211

Merge branch 'restructuring_css' of gitlab.com:softwarepublico/noosfero-spb-them…

…e into v2_members_page_and_block

Conflicts:
	style.css
css/administration-panel.css 0 → 100644
@@ -0,0 +1,135 @@ @@ -0,0 +1,135 @@
  1 +/*** Admin Pages - General Rules ***/
  2 +.action-admin_panel-index #content .main-block h2,
  3 +.controller-features #content .main-block h2{
  4 + font-family: Arial;
  5 + font-size: 22px;
  6 + font-weight: 700;
  7 + line-height: 21px;
  8 +}
  9 +
  10 +/*** Environment Settings ***/
  11 +
  12 +/* Profile tab */
  13 +
  14 +.action-admin_panel-site_info .main-content .ui-tabs{
  15 + border: none;
  16 +}
  17 +
  18 +.action-admin_panel-site_info .main-content .ui-tabs .ui-tabs-nav{
  19 + margin: 0 0 0 1em;
  20 + padding: 0;
  21 + background: none;
  22 + color: #172738;
  23 + border: 0px solid #aaaaaa;
  24 + border-radius: 4px;
  25 + font-weight: bold;
  26 +}
  27 +
  28 +.action-admin_panel-site_info .main-content .ui-widget-content .ui-state-default,
  29 +.action-admin_panel-site_info .main-content .ui-widget-header .ui-state-default{
  30 + background: #d5d5d5 none;
  31 + color: #555555;
  32 + font-weight: normal;
  33 +}
  34 +
  35 +.action-admin_panel-site_info .main-content .ui-widget-content .ui-state-active,
  36 +.action-admin_panel-site_info .main-content .ui-widget-header .ui-state-active{
  37 + background: #eeeff1;
  38 + color: #212121;
  39 + font-weight: normal;
  40 +}
  41 +
  42 +.action-admin_panel-site_info .main-content .ui-tabs .ui-tabs-panel{
  43 + display: block;
  44 + padding: 1em 1.4em;
  45 + background-color: #eeeff1;
  46 + color: #777;
  47 + border-width: 1px;
  48 + font-size: 13px;
  49 + text-decoration: none;
  50 +}
  51 +
  52 +/*** Organizations Settings ***/
  53 +
  54 +.action-organizations-index .main-block form#manage-profiles,
  55 +.action-organizations-index .main-block form#manage-profiles form{
  56 + background-color: transparent;
  57 +}
  58 +
  59 +.action-organizations-index .main-block form#manage-profiles .search-field{
  60 + margin-bottom: 30px;
  61 +}
  62 +
  63 +.action-organizations-index .main-block form#manage-profiles .search-field .formfield {
  64 + width: 100%;
  65 + margin-right: 0.5em;
  66 + float: left;
  67 +}
  68 +
  69 +.action-organizations-index .main-block form#manage-profiles .search-field .formfield input {
  70 + margin-top: 0px;
  71 + margin-right: 0.5em;
  72 + padding: 6px;
  73 + min-width: 97%;
  74 + height: 19px;
  75 + max-height: 19px;
  76 + background: none;
  77 + border: 1px solid #ccc;
  78 + border-radius: 4px;
  79 +}
  80 +
  81 +.action-organizations-index .main-block form#manage-profiles input.button.submit{
  82 + height: 32px;
  83 + margin-top: 8px;
  84 + padding: 5px 15px;
  85 + background: #3E67B1 none;
  86 + color: #FFF;
  87 + border-radius: 4px;
  88 + border: 1px solid #3E67B1;
  89 + font-size: 14px;
  90 + text-transform: uppercase;
  91 +}
  92 +
  93 +.action-organizations-index .main-block form#manage-profiles input.button.submit:hover{
  94 + background: #5E82C6;
  95 +}
  96 +
  97 +.action-organizations-index .main-block #environment-profiles-filter-title,
  98 +.action-organizations-index .main-block #environment-profiles-filter-filter{
  99 + line-height: 35px;
  100 + font-size: 12px;
  101 +}
  102 +
  103 +.action-organizations-index .main-block table#organizations-list th{
  104 + text-align: left;
  105 + vertical-align: middle;
  106 + padding: 2px 8px;
  107 +}
  108 +
  109 +/*** Features Settings ***/
  110 +
  111 +.controller-features #content form *{
  112 + font-size: 15px;
  113 +}
  114 +
  115 +.controller-features #content th{
  116 + text-align: left;
  117 +}
  118 +
  119 +.controller-features #content h3{
  120 + min-height: 0;
  121 + margin: 20px auto 10px auto;
  122 +}
  123 +
  124 +.controller-features #content hr{
  125 + display: none;
  126 +}
  127 +
  128 +.controller-features #content ul.token-input-list{
  129 + padding: 6px;
  130 + background: none;
  131 + border: 1px solid #ccc;
  132 + border-radius: 4px;
  133 + font-family: Arial, helvetica;
  134 + font-size: 15px;
  135 +}
css/article-page.css
@@ -28,6 +28,15 @@ @@ -28,6 +28,15 @@
28 line-height: 21px; 28 line-height: 21px;
29 } 29 }
30 30
  31 +#content #article-parent a.button.with-text{
  32 + background-color: #3E67B1;
  33 + color: #FFF;
  34 +}
  35 +
  36 +#content #article-parent a.button.with-text:hover{
  37 + background-color: #5E82C6;
  38 +}
  39 +
31 /* Need a dev solution - blog internal pages*/ 40 /* Need a dev solution - blog internal pages*/
32 41
33 #article-header .preview{ 42 #article-header .preview{
@@ -76,27 +85,34 @@ @@ -76,27 +85,34 @@
76 } 85 }
77 86
78 #content .main-block .article-body #article-actions:last-child{ 87 #content .main-block .article-body #article-actions:last-child{
79 - padding-top: 10px;  
80 - border-top: 4px solid #2C4B6B; 88 + margin: 0;
  89 + padding: 10px 0;
  90 + border-top: 1px solid #D3D6DE;
81 } 91 }
82 92
83 /*** Categories ***/ 93 /*** Categories ***/
84 94
  95 +#content .main-block #article-cat{
  96 + border-top: 4px solid #2C4B6B;
  97 + border-bottom: 1px solid #D3D6DE;
  98 +}
  99 +
85 #content .main-block #article-cat h4 { 100 #content .main-block #article-cat h4 {
86 float: left; 101 float: left;
87 - margin: 13px 10px 10px 0; 102 + margin: 12px 10px 10px 0;
88 min-height: 0px; 103 min-height: 0px;
  104 + color: #5E82C6;
89 font-family: Arial; 105 font-family: Arial;
90 - font-size: 1.3em; 106 + font-size: 12px;
91 font-weight: 300; 107 font-weight: 300;
92 text-decoration: initial; 108 text-decoration: initial;
93 } 109 }
94 110
95 #content .main-block #article-cat a{ 111 #content .main-block #article-cat a{
96 - float: left; 112 + display: inline-block;
97 margin: 10px 10px 10px 0; 113 margin: 10px 10px 10px 0;
98 padding: 3px 10px; 114 padding: 3px 10px;
99 - color: #3E67B1; 115 + color: #5E82C6;
100 background-color: #ECEDF1; 116 background-color: #ECEDF1;
101 border: 1px solid #D3D6DE; 117 border: 1px solid #D3D6DE;
102 border-radius: 3px; 118 border-radius: 3px;
@@ -104,7 +120,29 @@ @@ -104,7 +120,29 @@
104 text-decoration: initial; 120 text-decoration: initial;
105 } 121 }
106 122
107 -/*** end of categories ***/ 123 +/*** Tags ***/
  124 +
  125 +#content .main-block #article-tags{
  126 + width: 100%;
  127 + color: #5E82C6;
  128 + border-bottom: 1px solid #D3D6DE;
  129 + font-family: Arial;
  130 + font-size: 12px;
  131 + font-weight: 300;
  132 + text-align: left;
  133 +}
  134 +
  135 +#content .main-block #article-tags a{
  136 + display: inline-block;
  137 + margin: 10px 10px 10px 0;
  138 + padding: 3px 10px;
  139 + color: #5E82C6;
  140 + background-color: #ECEDF1;
  141 + border: 1px solid #D3D6DE;
  142 + border-radius: 3px;
  143 + font-size: 12px;
  144 + text-decoration: initial;
  145 +}
108 146
109 /*** Site Map page ***/ 147 /*** Site Map page ***/
110 148
css/community-pages.css
@@ -58,7 +58,6 @@ @@ -58,7 +58,6 @@
58 .action-profile-index #content .main-block h1 { 58 .action-profile-index #content .main-block h1 {
59 color: #172738; 59 color: #172738;
60 border-bottom: none; 60 border-bottom: none;
61 - font-size: 2.3em;  
62 font-weight: bold; 61 font-weight: bold;
63 font-variant: normal; 62 font-variant: normal;
64 font-family: Arial, open_sansbold, Helvetica, sans-serif; 63 font-family: Arial, open_sansbold, Helvetica, sans-serif;
@@ -99,14 +98,15 @@ @@ -99,14 +98,15 @@
99 98
100 .action-profile-index .main-block #public-profile-search form input.button.submit { 99 .action-profile-index .main-block #public-profile-search form input.button.submit {
101 height: 32px; 100 height: 32px;
102 - background: #2B51A8;  
103 - font-size: 14px;  
104 margin-top: 8px; 101 margin-top: 8px;
  102 + padding: 5px 15px;
105 color: #ffffff; 103 color: #ffffff;
106 - text-transform: uppercase; 104 + background: #2B51A8;
107 border-radius: 4px; 105 border-radius: 4px;
108 border: 1px solid #2B51A8; 106 border: 1px solid #2B51A8;
109 - padding: 5px 15px; 107 + font-size: 14px;
  108 + line-height: 14px
  109 + text-transform: uppercase;
110 } 110 }
111 111
112 /* Profile tab */ 112 /* Profile tab */
css/edition-pages.css
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 /*** Edit Blog and Articles ***/ 3 /*** Edit Blog and Articles ***/
4 4
5 -.controller-cms #content .main-block h1{ 5 +.controller-cms #content .main-content h1{
6 margin: 0 0 10px 0; 6 margin: 0 0 10px 0;
7 padding: 0; 7 padding: 0;
8 color: #172738; 8 color: #172738;
@@ -13,19 +13,19 @@ @@ -13,19 +13,19 @@
13 font-variant: normal; 13 font-variant: normal;
14 } 14 }
15 15
16 -.controller-cms #content .main-block form{ 16 +.controller-cms #content .main-content form{
17 font-size: 14px; 17 font-size: 14px;
18 font-family: Arial; 18 font-family: Arial;
19 } 19 }
20 20
21 -.controller-cms #content .main-block form .required-field .pseudoformlabel,  
22 -.controller-cms #content .main-block form .required-field label.formlabel:after { 21 +.controller-cms #content .main-content form .required-field .pseudoformlabel,
  22 +.controller-cms #content .main-content form .required-field label.formlabel:after {
23 color: #FF0366; 23 color: #FF0366;
24 font-size: 14px; 24 font-size: 14px;
25 font-weight: 500; 25 font-weight: 500;
26 } 26 }
27 27
28 -.controller-cms #content .main-block .formlabel { 28 +.controller-cms #content .main-content .formlabel{
29 display: inline-block; 29 display: inline-block;
30 max-width: 100%; 30 max-width: 100%;
31 margin-bottom: 5px; 31 margin-bottom: 5px;
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 font-size: 14px; 34 font-size: 14px;
35 } 35 }
36 36
37 -.controller-cms #content .main-block .formfieldline .formfield code { 37 +.controller-cms #content .main-content .formfieldline .formfield code{
38 display: block; 38 display: block;
39 width: auto; 39 width: auto;
40 height: 30px; 40 height: 30px;
@@ -45,21 +45,21 @@ @@ -45,21 +45,21 @@
45 font-family: Arial, helvetica; 45 font-family: Arial, helvetica;
46 } 46 }
47 47
48 -.controller-cms #content .main-block .formfieldline .formfield code * { 48 +.controller-cms #content .main-content .formfieldline .formfield code *{
49 display: inline; 49 display: inline;
50 } 50 }
51 51
52 -.controller-cms #content .main-block .formfieldline .formfield code input[type="text"] { 52 +.controller-cms #content .main-content .formfieldline .formfield input[type="text"]{
53 padding: 6px; 53 padding: 6px;
54 color: #585858; 54 color: #585858;
55 - background: none; 55 + background: #FFF;
56 border: 1px solid #ccc; 56 border: 1px solid #ccc;
57 border-radius: 4px; 57 border-radius: 4px;
58 font-size: 15px; 58 font-size: 15px;
59 font-family: Arial, helvetica; 59 font-family: Arial, helvetica;
60 } 60 }
61 61
62 -.controller-cms #content .main-block .formfieldline textarea{ 62 +.controller-cms #content .main-content .formfieldline textarea{
63 padding: 6px; 63 padding: 6px;
64 color: #585858; 64 color: #585858;
65 background: none; 65 background: none;
@@ -69,18 +69,18 @@ @@ -69,18 +69,18 @@
69 font-size: 15px; 69 font-size: 15px;
70 } 70 }
71 71
72 -.controller-cms #content .main-block .formfieldline .formfield code input[type="text"]:hover,  
73 -.controller-cms #content .main-block .formfieldline .formfield code input[type="text"]:focus,  
74 -.controller-cms #content .main-block .formfieldline textarea:hover,  
75 -.controller-cms #content .main-block .formfieldline textarea:focus{ 72 +.controller-cms #content .main-content .formfieldline .formfield code input[type="text"]:hover,
  73 +.controller-cms #content .main-content .formfieldline .formfield code input[type="text"]:focus,
  74 +.controller-cms #content .main-content .formfieldline textarea:hover,
  75 +.controller-cms #content .main-content .formfieldline textarea:focus{
76 border: 1px solid #172738; 76 border: 1px solid #172738;
77 } 77 }
78 78
79 -.controller-cms #content .main-block .formfieldline .type-file .type-file .formlabel{ 79 +.controller-cms #content .main-content .formfieldline .type-file .type-file .formlabel{
80 display: none; 80 display: none;
81 } 81 }
82 82
83 -.controller-cms #content .main-block .formfieldline .type-file .type-file .type-text .formlabel{ 83 +.controller-cms #content .main-content .formfieldline .type-file .type-file .type-text .formlabel{
84 display: block; 84 display: block;
85 } 85 }
86 86
@@ -102,30 +102,30 @@ @@ -102,30 +102,30 @@
102 border: 1px solid #172738; 102 border: 1px solid #172738;
103 } 103 }
104 104
105 -.controller-cms #content .formfield #fetch-external-feed { 105 +.controller-cms #content .formfield #fetch-external-feed{
106 padding-left: 20px; 106 padding-left: 20px;
107 border-radius: 4px; 107 border-radius: 4px;
108 } 108 }
109 109
110 -.controller-cms #content .formfield #fetch-external-feed > input { 110 +.controller-cms #content .formfield #fetch-external-feed > input{
111 height: 13px; 111 height: 13px;
112 margin: 8px 8px 8px 0px; 112 margin: 8px 8px 8px 0px;
113 vertical-align: middle; 113 vertical-align: middle;
114 width: 13px; 114 width: 13px;
115 } 115 }
116 116
117 -.controller-cms #content .formfield #fetch-external-feed #external-feed-options #external-feed-options-only-once input { 117 +.controller-cms #content .formfield #fetch-external-feed #external-feed-options #external-feed-options-only-once input{
118 margin-right: 3px; 118 margin-right: 3px;
119 width: 13px; 119 width: 13px;
120 vertical-align: middle; 120 vertical-align: middle;
121 } 121 }
122 122
123 -.controller-cms #content .formfield #fetch-external-feed #external-feed-options #external-feed-options-only-once label { 123 +.controller-cms #content .formfield #fetch-external-feed #external-feed-options #external-feed-options-only-once label{
124 margin-right: 250px; 124 margin-right: 250px;
125 } 125 }
126 126
127 .controller-cms #content .main-content form label.formlabel, 127 .controller-cms #content .main-content form label.formlabel,
128 -.controller-cms #content .main-content form .article-translation-field { 128 +.controller-cms #content .main-content form .article-translation-field{
129 font-size: 14px; 129 font-size: 14px;
130 margin-bottom: 5px; 130 margin-bottom: 5px;
131 color: #231f20; 131 color: #231f20;
@@ -136,74 +136,76 @@ @@ -136,74 +136,76 @@
136 margin-bottom: 15px; 136 margin-bottom: 15px;
137 } 137 }
138 138
139 -.controller-cms #content .main-block form .button-bar input{  
140 - min-width: 100px; 139 +.controller-cms #content .main-content form .button-bar input{
  140 + height: 30px;
  141 + padding: 2px 15px;
141 margin-right: 10px; 142 margin-right: 10px;
142 - padding: 2px 5px;  
143 color: #FFF; 143 color: #FFF;
144 - background: #2C66CE; 144 + background: #3E67B1;
145 font-size: 15px; 145 font-size: 15px;
146 - border: none;  
147 } 146 }
148 147
149 -.controller-cms #content .main-block form .button-bar input:hover { 148 +.controller-cms #content .main-content form .button-bar input:hover{
150 background: #5E82C6; 149 background: #5E82C6;
151 border: none; 150 border: none;
152 } 151 }
153 152
154 -.controller-cms #content .main-block form .button-bar a.button{  
155 - height: 29px;  
156 - min-width: 100px;  
157 - padding: 1px 0 0 0;  
158 - color: #2C66CE; 153 +.controller-cms #content .main-content form .button-bar input.button.with-text{
  154 + height: 36px;
  155 +}
  156 +
  157 +.controller-cms #content .main-content form .button-bar a.button{
  158 + height: 30px;
  159 + padding: 2px 15px;
  160 + color: #3E67B1;
159 background: #FFF; 161 background: #FFF;
160 - border: 1px solid #2C66CE; 162 + border: 1px solid #3E67B1;
161 font-size: 14px; 163 font-size: 14px;
162 text-align: center; 164 text-align: center;
163 } 165 }
164 166
165 -.controller-cms #content .main-block form .button-bar a.button:hover{ 167 +.controller-cms #content .main-content form .button-bar a.button:hover{
166 background: none; 168 background: none;
167 - color: #5E82C6;  
168 - border-color: #5E82C6; 169 + color: #3E67B1;
  170 + border-color: #3E67B1;
169 } 171 }
170 172
171 -.controller-cms #content .main-block form .box-title{ 173 +.controller-cms #content .main-content form .box-title{
172 font-size: 15px; 174 font-size: 15px;
173 font-family: Arial, helvetica; 175 font-family: Arial, helvetica;
174 } 176 }
175 177
176 -.controller-cms #content .main-block #category-ajax-selector{ 178 +.controller-cms #content .main-content #category-ajax-selector{
177 border-style: dotted; 179 border-style: dotted;
178 } 180 }
179 181
180 -.controller-cms #content .main-block #category-ajax-selector label{ 182 +.controller-cms #content .main-content #category-ajax-selector label{
181 font-size: 14px; 183 font-size: 14px;
182 } 184 }
183 185
184 -.controller-cms #content .main-block #category-ajax-selector .select-subcategory-link{ 186 +.controller-cms #content .main-content #category-ajax-selector .select-subcategory-link{
185 background: #FFF; 187 background: #FFF;
186 border: 1px solid #2C66CE; 188 border: 1px solid #2C66CE;
187 color: #2C66CE; 189 color: #2C66CE;
188 padding: 3px; 190 padding: 3px;
189 } 191 }
190 192
191 -.controller-cms #content .main-block #category-ajax-selector .select-subcategory-link:hover{ 193 +.controller-cms #content .main-content #category-ajax-selector .select-subcategory-link:hover{
192 background: #2C66CE; 194 background: #2C66CE;
193 color: #FFF; 195 color: #FFF;
194 } 196 }
195 197
196 -.controller-cms #content .main-block .inputosaurus-required{ 198 +.controller-cms #content .main-content .inputosaurus-required{
197 background: none; 199 background: none;
198 border: 1px solid #ccc; 200 border: 1px solid #ccc;
199 } 201 }
200 202
201 -.controller-cms #content .main-block .inputosaurus-required:hover,  
202 -.controller-cms #content .main-block .inputosaurus-required:focus{ 203 +.controller-cms #content .main-content .inputosaurus-required:hover,
  204 +.controller-cms #content .main-content .inputosaurus-required:focus{
203 border: 1px solid #172738; 205 border: 1px solid #172738;
204 } 206 }
205 207
206 -.controller-cms #content .main-block .inputosaurus-required input:hover{ 208 +.controller-cms #content .main-content .inputosaurus-required input:hover{
207 background: none; 209 background: none;
208 } 210 }
209 211
@@ -217,6 +219,33 @@ @@ -217,6 +219,33 @@
217 margin-bottom: 13px; 219 margin-bottom: 13px;
218 } 220 }
219 221
  222 +/*** Article's edition page ***/
  223 +
  224 +#content .text-editor-sidebar .header{
  225 + padding: 13px 10px;
  226 + color: #172738;
  227 + background: #D3D6DE;
  228 + border-radius: 4px;
  229 + font-size: 14px;
  230 + font-weight: 300;
  231 + font-family: Arial;
  232 +}
  233 +
  234 +#content .text-editor-sidebar .header a.button.icon-vertical-toggle{
  235 + padding: 0 15px;
  236 + background: #3E67B1;
  237 + color: #FFF;
  238 + font-size: 14px;
  239 + font-weight: 300;
  240 + font-family: Arial;
  241 +}
220 242
221 -/*** Edit Organizations ***/ 243 +#content .text-editor-sidebar .header a.button.icon-vertical-toggle:hover{
  244 + background: #5E82C6;
  245 +}
222 246
  247 +#content .text-editor-sidebar-box{
  248 + background: #ECEDF1;
  249 + border-radius: 4px;
  250 + border: 1px solid #D3D6DE;
  251 +}
css/home-page.css
@@ -12,6 +12,10 @@ @@ -12,6 +12,10 @@
12 12
13 /*** Box's patterns ***/ 13 /*** Box's patterns ***/
14 14
  15 +.action-home-index .block-outer{
  16 + margin-bottom: 45px;
  17 +}
  18 +
15 /* Read More pattern */ 19 /* Read More pattern */
16 20
17 .action-home-index #content .box .block-outer .read-more { 21 .action-home-index #content .box .block-outer .read-more {
@@ -52,9 +56,9 @@ @@ -52,9 +56,9 @@
52 /*** Software catalog search block **/ 56 /*** Software catalog search block **/
53 57
54 .action-home-index #content #catalogo-software-search { 58 .action-home-index #content #catalogo-software-search {
55 - border-radius: 4px;  
56 width: 100%; 59 width: 100%;
57 background-color: #1A397D; 60 background-color: #1A397D;
  61 + border-radius: 4px;
58 } 62 }
59 63
60 .action-home-index #content #catalogo-software-search h1 { 64 .action-home-index #content #catalogo-software-search h1 {
@@ -363,34 +367,31 @@ @@ -363,34 +367,31 @@
363 /******* See As Well Block - Highlights block *******/ 367 /******* See As Well Block - Highlights block *******/
364 368
365 .action-home-index #content .highlights-block .block-title { 369 .action-home-index #content .highlights-block .block-title {
366 - margin: 11px 0px 0px;  
367 - border: 1px solid #c0c1c1;  
368 - border-bottom: 0;  
369 - border-radius: 8px 8px 0 0;  
370 - padding: 15px 1px 21px 15px;  
371 - width: auto;  
372 - height: 16px;  
373 - background-color: #fff;  
374 - color: #172638;  
375 - font: bold 16px/1.3em 'open_sansbold', arial, helvetica, sans-serif;  
376 - text-transform: uppercase; 370 + display: none;
377 } 371 }
378 372
379 .action-home-index #content .highlights-border { 373 .action-home-index #content .highlights-border {
380 border: 1px solid #c0c1c1; 374 border: 1px solid #c0c1c1;
381 - border-radius: 0px 0px 8px 8px; 375 + border-radius: 8px 8px 8px 8px;
382 width: auto; 376 width: auto;
383 - max-height: 230px;  
384 - background: #fff; 377 + height: 248px;
  378 + max-height: 250px;
  379 + background-color: #e8e9ec;
  380 + background-image: linear-gradient(
  381 + 0deg,
  382 + transparent 45%,
  383 + #fff 55%);
  384 + background-size: 100% 100%;
385 } 385 }
386 386
387 .action-home-index #content .highlights-container { 387 .action-home-index #content .highlights-container {
388 - border-radius: 0px 0px 8px 8px; 388 + border-radius: 8px 8px 8px 8px;
389 border-width: 0px 0px 1px 0px; 389 border-width: 0px 0px 1px 0px;
  390 + border-bottom: none;
390 padding: 0px 0px 0px 0px; 391 padding: 0px 0px 0px 0px;
391 width: 100% !important; 392 width: 100% !important;
392 max-height: 230px; 393 max-height: 230px;
393 - background: #fff; 394 + background: transparent;
394 position: relative; 395 position: relative;
395 top: 0px; 396 top: 0px;
396 } 397 }
@@ -403,6 +404,10 @@ @@ -403,6 +404,10 @@
403 background-color: #fff; 404 background-color: #fff;
404 } 405 }
405 406
  407 +.action-home-index #content .highlights-image-link img{
  408 + max-height: 100px;
  409 +}
  410 +
406 .action-home-index #content .highlights-label { 411 .action-home-index #content .highlights-label {
407 border-top: 4px solid #3b61a7; 412 border-top: 4px solid #3b61a7;
408 padding: 23px 20px 46px 20px; 413 padding: 23px 20px 46px 20px;
@@ -419,10 +424,8 @@ @@ -419,10 +424,8 @@
419 424
420 .action-home-index #content .highlights-block-pager { 425 .action-home-index #content .highlights-block-pager {
421 border: 0; 426 border: 0;
422 - padding: 14px 0px 0px 0px;  
423 - height: 1px; 427 + padding: 0px 0px 0px 0px;
424 width: 232px; 428 width: 232px;
425 - background-color: #FFF;  
426 float: left; 429 float: left;
427 position: static; 430 position: static;
428 } 431 }
css/main-content.css
1 /*** Box ***/ 1 /*** Box ***/
2 .box-1 .block, 2 .box-1 .block,
3 .no-boxes .block { 3 .no-boxes .block {
4 - margin-top: 50px; 4 + margin-top: 50px;
5 } 5 }
6 6
7 -.block-outer {  
8 - margin-bottom: 45px;  
9 - clear: both; 7 +.box-2 .block-outer,
  8 +.box-3 .block-outer{
  9 + margin-bottom: 45px;
  10 + clear: both;
10 } 11 }
11 12
12 /*** Block Title ***/ 13 /*** Block Title ***/
@@ -41,13 +42,13 @@ @@ -41,13 +42,13 @@
41 #content .pagination a, 42 #content .pagination a,
42 #content .pagination em, 43 #content .pagination em,
43 #content .pagination span{ 44 #content .pagination span{
44 - padding: 7px 11px 7px 11px; 45 + padding: 5px 9px;
45 margin-right: 4px; 46 margin-right: 4px;
46 color: #172738; 47 color: #172738;
47 border: 1px solid #D3D6DE; 48 border: 1px solid #D3D6DE;
48 border-radius: 4px; 49 border-radius: 4px;
49 letter-spacing: 0.6px; 50 letter-spacing: 0.6px;
50 - font-size: 15px; 51 + font-size: 12px;
51 font-weight: 700; 52 font-weight: 700;
52 text-decoration: none; 53 text-decoration: none;
53 display: inline-table; 54 display: inline-table;
@@ -59,13 +60,11 @@ @@ -59,13 +60,11 @@
59 } 60 }
60 61
61 #content .pagination .previous_page{ 62 #content .pagination .previous_page{
62 - padding: 7px 11px 10px 11px;  
63 float: left; 63 float: left;
64 } 64 }
65 65
66 #content .pagination .next_page{ 66 #content .pagination .next_page{
67 float: right; 67 float: right;
68 - padding: 7px 11px 10px 11px;  
69 } 68 }
70 69
71 #content .pagination .previous_page, 70 #content .pagination .previous_page,
@@ -80,5 +79,39 @@ @@ -80,5 +79,39 @@
80 opacity: 0.5; 79 opacity: 0.5;
81 } 80 }
82 81
  82 +/*** Button ***/
  83 +
  84 +#content a.button.with-text,
  85 +#content #article-actions a.button.with-text{
  86 + height: 32px;
  87 + padding: 5px 15px;
  88 + background: #FFF none;
  89 + color: #3E67B1;
  90 + border-radius: 4px;
  91 + border: 1px solid #3E67B1;
  92 + font-size: 14px;
  93 + line-height: 32px;
  94 + text-transform: uppercase;
  95 +}
  96 +
  97 +#content form input.button.with-text{
  98 + height: 42px;
  99 + max-height: 42px;
  100 + padding: 5px 15px;
  101 + background: #FFF none;
  102 + color: #3E67B1;
  103 + border-radius: 4px;
  104 + border: 1px solid #3E67B1;
  105 + font-size: 14px;
  106 + line-height: 32px;
  107 + text-transform: uppercase;
  108 +}
  109 +
  110 +#content a.button:hover,
  111 +#content #article-actions a.button.with-text:hover,
  112 +#content input.button.with-text:hover{
  113 + background: #3E67B1 none;
  114 + color: #FFF;
  115 +}
83 116
84 117
css/overwriting-base-theme.css
@@ -54,21 +54,22 @@ @@ -54,21 +54,22 @@
54 #content .main-block h2, 54 #content .main-block h2,
55 #content .main-block h3, 55 #content .main-block h3,
56 #content .main-block h4 { 56 #content .main-block h4 {
57 - font-family: 'Open Sans', Arial, Helvetica, sans-serif; 57 + font-family: Arial, Helvetica, sans-serif;
58 } 58 }
59 59
60 #content .main-block h1, 60 #content .main-block h1,
61 #not-found h1, 61 #not-found h1,
62 #access-denied h1, 62 #access-denied h1,
63 #content .no-boxes h1 { 63 #content .no-boxes h1 {
64 - color: #444;  
65 - font-size: 1.7em;  
66 - padding: 7px 0;  
67 - margin-left: 0;  
68 - padding-left: 0.3em;  
69 - border-bottom: 1px solid #CCCCCC;  
70 - border-top: 0px solid #172838; 64 + margin: 20px 0 10px 0;
  65 + padding: 0;
  66 + color: #172738;
  67 + border-bottom: none;
  68 + font-family: Arial;
  69 + font-size: 34px;
71 font-weight: bold; 70 font-weight: bold;
  71 + font-variant: normal;
  72 + line-height: 37px;
72 } 73 }
73 74
74 #content .title { 75 #content .title {
@@ -77,8 +78,8 @@ @@ -77,8 +78,8 @@
77 } 78 }
78 79
79 #content .main-block h3 { 80 #content .main-block h3 {
80 - font-size: 1.5em;  
81 - min-height: 48px; 81 + font-size:18px;
  82 + line-height: 21px;
82 } 83 }
83 84
84 /****************************************/ 85 /****************************************/
css/search-pages.css 0 → 100644
@@ -0,0 +1,115 @@ @@ -0,0 +1,115 @@
  1 +/*** Search Community ***/
  2 +
  3 +.action-search-index #content form #search-header,
  4 +.action-search-people #content form #search-header,
  5 +.action-search-communities #content form #search-header{
  6 + margin-top: 5px;
  7 + float: right;
  8 + border: none;
  9 +}
  10 +
  11 +.action-search-people #content form #search-header #search-filters .sod_select,
  12 +.action-search-communities #content form #search-header #search-filters .sod_select{
  13 + color: #3E67B1;
  14 + border: 1px solid #3E67B1;
  15 + border-radius: 4px;
  16 + font-family: Arial;
  17 + font-variant: normal;
  18 + font-weight: 300;
  19 + box-shadow: none;
  20 +}
  21 +
  22 +.action-search-people #content form #search-header #search-filters .sod_select .sod_list,
  23 +.action-search-communities #content form #search-header #search-filters .sod_select .sod_list{
  24 + margin: -2px 0 0 -1px;
  25 + color: #3E67B1;
  26 + border: 1px solid #3E67B1;
  27 + border-top: none;
  28 + border-radius: 0px 0px 4px 4px;
  29 + font-family: Arial;
  30 + font-variant: normal;
  31 + font-weight: 300;
  32 +}
  33 +
  34 +.action-search-people #content form #search-header #search-filters .sod_select .sod_list .active,
  35 +.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .active{
  36 + border-radius: 0px 0px 4px 4px;
  37 +}
  38 +
  39 +.action-search-people #content form #search-header #search-filters .sod_select .sod_list .selected,
  40 +.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .selected{
  41 + padding-right: 21px;
  42 +}
  43 +
  44 +.action-search-people #content form #search-subheader .sod_select,
  45 +.action-search-communities #content form #search-subheader .sod_select{
  46 + line-height: 15px;
  47 +}
  48 +
  49 +.action-search-index #content form .search-field,
  50 +.action-search-people #content form .search-field,
  51 +.action-search-communities #content form .search-field{
  52 + margin-bottom: 30px;
  53 +}
  54 +
  55 +.action-search-index #content form .search-field .formfield,
  56 +.action-search-people #content form .search-field .formfield,
  57 +.action-search-communities #content form .search-field .formfield{
  58 + float: left;
  59 + width: 99%;
  60 +}
  61 +.action-search-index #content form .search-field .formfield input,
  62 +.action-search-people #content form .search-field .formfield input,
  63 +.action-search-communities #content form .search-field .formfield input{
  64 + margin-top: 0px;
  65 + padding: 6px;
  66 + height: 19px;
  67 + max-height: 19px;
  68 + max-width: 98%;
  69 + background: none;
  70 + border: 1px solid #ccc;
  71 + border-radius: 4px;
  72 +}
  73 +
  74 +.action-search-index #content form input.button.submit,
  75 +.action-search-people #content form input.button.submit,
  76 +.action-search-communities #content form input.button.submit{
  77 + height: 32px;
  78 + margin-top: 8px;
  79 + padding: 5px 15px;
  80 + background: #3E67B1 none;
  81 + color: #FFF;
  82 + border-radius: 4px;
  83 + border: 1px solid #3E67B1;
  84 + font-size: 14px;
  85 + line-height: 14px;
  86 + text-transform: uppercase;
  87 +}
  88 +
  89 +.action-search-index #content form input.button.submit:hover,
  90 +.action-search-people #content form input.button.submit:hover,
  91 +.action-search-communities #content form input.button.submit:hover{
  92 + background: #5E82C6;
  93 +}
  94 +
  95 +.action-search-people #search-results .search-results-type-people,
  96 +.action-search-communities #search-results .search-results-type-community{
  97 + background: none;
  98 + border: 1px solid #ccc;
  99 + border-radius: 10px;
  100 +}
  101 +
  102 +.action-search-index #search-results h3{
  103 + margin: 20px 0 10px 0;
  104 + color: #172738;
  105 + font-size:18px;
  106 + line-height: 21px;
  107 + font-family: Arial;
  108 + font-weight: 700;
  109 + font-variant: normal;
  110 +}
  111 +
  112 +.action-search-index #search-results .search-results-innerbox{
  113 + background: none;
  114 + border: 1px solid #ccc;
  115 +}
css/software-catalog-page.css
@@ -11,14 +11,16 @@ @@ -11,14 +11,16 @@
11 } 11 }
12 12
13 .action-search-software_infos #content .main-content h2{ 13 .action-search-software_infos #content .main-content h2{
14 - color: #ff0066; 14 + color: #FF0366;
15 font-size: 16px; 15 font-size: 16px;
16 font-family: "open_sansregular",Arial, Helvetica,sans-serif; 16 font-family: "open_sansregular",Arial, Helvetica,sans-serif;
  17 + font-weight: 300;
17 text-transform: uppercase; 18 text-transform: uppercase;
18 } 19 }
19 20
20 .action-search-software_infos #content .main-content h1{ 21 .action-search-software_infos #content .main-content h1{
21 padding: 5px 0 10px 0; 22 padding: 5px 0 10px 0;
  23 + border-bottom: 1px solid #D3D6DE;
22 font-family: Arial, Helvetica, sans-serif; 24 font-family: Arial, Helvetica, sans-serif;
23 font-size: 35px; 25 font-size: 35px;
24 font-variant: normal; 26 font-variant: normal;
@@ -32,15 +34,17 @@ @@ -32,15 +34,17 @@
32 padding: 0; 34 padding: 0;
33 background: #ecedf1; 35 background: #ecedf1;
34 border-radius: 4px; 36 border-radius: 4px;
35 - border: 1px solid #d7d7d7; 37 + border: 1px solid #D3D6DE;
36 } 38 }
37 39
38 .action-search-software_infos #software-search-container .search-form h3{ 40 .action-search-software_infos #software-search-container .search-form h3{
39 margin: 0; 41 margin: 0;
40 padding: 16px 0 10px 14px; 42 padding: 16px 0 10px 14px;
  43 + color: #2C4B6B;
41 font-family:"open_sansregular", Arial, Helvetica, sans-serif; 44 font-family:"open_sansregular", Arial, Helvetica, sans-serif;
42 font-weight: bold; 45 font-weight: bold;
43 font-size: 15px; 46 font-size: 15px;
  47 + text-transform: uppercase;
44 } 48 }
45 49
46 .action-search-software_infos #content .search-form .search-field .formfield { 50 .action-search-software_infos #content .search-form .search-field .formfield {
@@ -53,42 +57,45 @@ @@ -53,42 +57,45 @@
53 width: 96%; 57 width: 96%;
54 margin: 4px 0px 0px 13px; 58 margin: 4px 0px 0px 13px;
55 padding: 6px; 59 padding: 6px;
  60 + background: #FFF;
56 border-radius: 4px; 61 border-radius: 4px;
57 - border: 1px solid #d7d7d7; 62 + border: 1px solid #D3D6DE;
58 font-size: 14px; 63 font-size: 14px;
59 } 64 }
60 65
61 66
62 .action-search-software_infos #content .search-form .search-field input.button{ 67 .action-search-software_infos #content .search-form .search-field input.button{
63 padding: 0px; 68 padding: 0px;
64 - background-color: #2B65cd;  
65 - color: #ffffff;  
66 - border: 1px solid #2B65cd; 69 + background-color: #3E67B1;
  70 + color: #FFF;
  71 + border: 1px solid #3E67B1;
67 font-family: "open_sansbold",Arial,sans-serif; 72 font-family: "open_sansbold",Arial,sans-serif;
68 border-radius: 4px; 73 border-radius: 4px;
69 } 74 }
70 75
71 -.controller-search #content .search-form .search-field input.button.submit { 76 +.action-search-software_infos #content .search-form .search-field input.button.submit {
72 width: auto; 77 width: auto;
73 height: 30px; 78 height: 30px;
74 max-height: 30px; 79 max-height: 30px;
75 margin: 14px; 80 margin: 14px;
76 padding: 0 14px 0 14px; 81 padding: 0 14px 0 14px;
77 - background-color: #4562b1; 82 + background-color: #3E67B1;
  83 + line-height: 14px;
78 text-transform: uppercase; 84 text-transform: uppercase;
79 } 85 }
80 86
81 /* Filter options */ 87 /* Filter options */
82 88
83 .action-search-software_infos #filter-catalog-software { 89 .action-search-software_infos #filter-catalog-software {
84 - background-color: #d7d7d7; 90 + background-color: #D3D6DE;
85 } 91 }
86 92
87 .action-search-software_infos #filter-option-catalog-software { 93 .action-search-software_infos #filter-option-catalog-software {
88 padding: 14px; 94 padding: 14px;
89 - background-color: #d7d7d7;  
90 - border:none; 95 + background-color: #D3D6DE;
  96 + border: none;
91 font-size: 11px; 97 font-size: 11px;
  98 + text-align: right;
92 } 99 }
93 100
94 .action-search-software_infos #filter-option-catalog-software:hover { 101 .action-search-software_infos #filter-option-catalog-software:hover {
@@ -97,10 +104,10 @@ @@ -97,10 +104,10 @@
97 104
98 .action-search-software_infos #filter-option-catalog-software:after { 105 .action-search-software_infos #filter-option-catalog-software:after {
99 content: ""; 106 content: "";
100 - margin-left:5px; 107 + margin-left: 5px;
101 padding: 3px 10.5px; 108 padding: 3px 10.5px;
102 - background:url("../images/bottom-arrow.png") no-repeat center;  
103 - background-color:#4562b1; 109 + background: url("../images/bottom-arrow.png") no-repeat center;
  110 + background-color: #3E67B1;
104 border-radius: 4px; 111 border-radius: 4px;
105 } 112 }
106 113
@@ -124,12 +131,12 @@ @@ -124,12 +131,12 @@
124 } 131 }
125 132
126 .action-search-software_infos #group-categories label { 133 .action-search-software_infos #group-categories label {
127 - font-family:Arial; 134 + font-family: Arial;
128 font-size: 14px; 135 font-size: 14px;
129 } 136 }
130 137
131 .action-search-software_infos #group-categories label span { 138 .action-search-software_infos #group-categories label span {
132 - font-family:Arial; 139 + font-family: Arial;
133 font-size: 14px; 140 font-size: 14px;
134 } 141 }
135 142
@@ -145,15 +152,15 @@ @@ -145,15 +152,15 @@
145 152
146 .action-search-software_infos #filter-catalog-software .project-software span { 153 .action-search-software_infos #filter-catalog-software .project-software span {
147 padding: 2px 6px; 154 padding: 2px 6px;
148 - background: #fff;  
149 - color: #3867b7; 155 + background: #FFF;
  156 + color: #3E67B1;
150 border-radius: 50%; 157 border-radius: 50%;
151 font-size: 16px; 158 font-size: 16px;
152 } 159 }
153 160
154 .action-search-software_infos button#cleanup-filter-catalg { 161 .action-search-software_infos button#cleanup-filter-catalg {
155 cursor: pointer; 162 cursor: pointer;
156 - background-color: #4562b1; 163 + background-color: #3E67B1;
157 font-size: 14px; 164 font-size: 14px;
158 font-family:Arial; 165 font-family:Arial;
159 } 166 }
@@ -167,7 +174,7 @@ @@ -167,7 +174,7 @@
167 margin-left: 5px; 174 margin-left: 5px;
168 padding: 2.5px 10.5px; 175 padding: 2.5px 10.5px;
169 background: url("../images/top-arrow.png") no-repeat center; 176 background: url("../images/top-arrow.png") no-repeat center;
170 - background-color: #4562b1; 177 + background-color: #3E67B1;
171 border-radius: 4px; 178 border-radius: 4px;
172 } 179 }
173 180
@@ -234,7 +241,7 @@ @@ -234,7 +241,7 @@
234 } 241 }
235 242
236 .action-search-software_infos #search-results .search-software-item-column-left .vcard a:hover{ 243 .action-search-software_infos #search-results .search-software-item-column-left .vcard a:hover{
237 - color:#2C66CE; 244 + color: #3E67B1;
238 } 245 }
239 246
240 .action-search-software_infos #search-results .search-software-item-column-left .vcard a.profile_link{ 247 .action-search-software_infos #search-results .search-software-item-column-left .vcard a.profile_link{
@@ -268,7 +275,7 @@ @@ -268,7 +275,7 @@
268 padding-right: 20px; 275 padding-right: 20px;
269 top: 0px; 276 top: 0px;
270 position: absolute; 277 position: absolute;
271 - color: #21376c; 278 + color: #2C4B6B;
272 font-size: 13px; 279 font-size: 13px;
273 font-family: Arial; 280 font-family: Arial;
274 text-align: left; 281 text-align: left;
@@ -298,7 +305,7 @@ @@ -298,7 +305,7 @@
298 } 305 }
299 306
300 .action-search-software_infos #search-results .search-software-item-column-right .search-software-content-block h4 a { 307 .action-search-software_infos #search-results .search-software-item-column-right .search-software-content-block h4 a {
301 - color: #172938; 308 + color: #172738;
302 font-size: 19px; 309 font-size: 19px;
303 } 310 }
304 311
@@ -324,12 +331,12 @@ @@ -324,12 +331,12 @@
324 width: auto !important; /* force overwritting from base */ 331 width: auto !important; /* force overwritting from base */
325 margin-left: 7px !important; /* force overwritting from base */ 332 margin-left: 7px !important; /* force overwritting from base */
326 float: left; 333 float: left;
327 - color: #2B65cd; 334 + color: #3E67B1;
328 font-size: 13px; 335 font-size: 13px;
329 line-height: 18px; 336 line-height: 18px;
330 text-decoration: underline; 337 text-decoration: underline;
331 } 338 }
332 339
333 .action-search-software_infos #search-results .search-software-content-block #categories-list li a{ 340 .action-search-software_infos #search-results .search-software-content-block #categories-list li a{
334 - color: #2B65cd; 341 + color: #3E67B1;
335 } 342 }
css/software-pages.css
@@ -181,34 +181,34 @@ @@ -181,34 +181,34 @@
181 /*** Categories and Tags block ***/ 181 /*** Categories and Tags block ***/
182 182
183 #content .box-1 .categories-and-tags-block { 183 #content .box-1 .categories-and-tags-block {
184 - border-top: 4px solid #4562b1; 184 + border-top: 4px solid #2C4B6B;
185 } 185 }
186 186
187 #content .box-1 .categories-and-tags-block .block-title { 187 #content .box-1 .categories-and-tags-block .block-title {
188 - margin-top: 14px;  
189 - background: none;  
190 - font-size: 11px; 188 + margin: 13px 10px 10px 0;
  189 + padding: 3px 0px;
191 float: left; 190 float: left;
192 -}  
193 -  
194 -#content .box-1 .categories-and-tags-block .block-title:last-child {  
195 - border-top: 1px solid #8b949b;  
196 - border-bottom: 1px solid #8b949b; 191 + background: none;
  192 + color: #5E82C6;
  193 + font-family: Arial;
  194 + font-size: 12px;
  195 + font-weight: 300;
197 } 196 }
198 197
199 #content .box-1 .categories-and-tags-block .category_cloud { 198 #content .box-1 .categories-and-tags-block .category_cloud {
200 - margin: 12px auto 10px 0px; 199 + margin: 13px 10px 10px 0px;
201 float: left; 200 float: left;
202 } 201 }
203 202
204 #content .box-1 .categories-and-tags-block .category_cloud a { 203 #content .box-1 .categories-and-tags-block .category_cloud a {
205 - margin: 10px 3px;  
206 - padding: 3px 6px;  
207 - border: 1px solid #e9e8ed;  
208 - border-radius: 8px;  
209 - line-height: 28px;  
210 - background-color: #e9e8ed;  
211 - font-size: 11px; 204 + padding: 3px 10px;
  205 + margin: 0;
  206 + float: left;
  207 + color: #3E67B1;
  208 + background-color: #ECEDF1;
  209 + border: 1px solid #D3D6DE;
  210 + border-radius: 3px;
  211 + font-size: 12px;
212 } 212 }
213 213
214 #content .box-1 .categories-and-tags-block .category_cloud a:hover { 214 #content .box-1 .categories-and-tags-block .category_cloud a:hover {
  1 +/*** Noosfero Base Theme ***/
1 @import url(../profile-base/style.css); 2 @import url(../profile-base/style.css);
2 @import url(../../icons/tango/style.css); 3 @import url(../../icons/tango/style.css);
3 4
  5 +/*** SPB Theme section styles ***/
4 @import url(css/overwriting-base-theme.css); 6 @import url(css/overwriting-base-theme.css);
5 @import url(css/header.css); 7 @import url(css/header.css);
6 @import url(css/footer.css); 8 @import url(css/footer.css);
7 @import url(css/left-bar.css); 9 @import url(css/left-bar.css);
8 @import url(css/home-page.css); 10 @import url(css/home-page.css);
9 -@import url(css/software-pages.css);  
10 -@import url(css/software-catalog-page.css);  
11 @import url(css/main-content.css); 11 @import url(css/main-content.css);
  12 +@import url(css/edition-pages.css);
  13 +@import url(css/administration-panel.css);
12 @import url(css/article-page.css); 14 @import url(css/article-page.css);
13 -@import url(css/news-page.css); 15 +@import url(css/software-pages.css);
14 @import url(css/community-pages.css); 16 @import url(css/community-pages.css);
15 @import url(css/edition-pages.css); 17 @import url(css/edition-pages.css);
16 @import url(css/tabs.css); 18 @import url(css/tabs.css);
  19 +@import url(css/news-page.css);
  20 +@import url(css/search-pages.css);
  21 +@import url(css/software-catalog-page.css);
  22 +
17 /* 23 /*
18 @import url(css/use-report.css); 24 @import url(css/use-report.css);
19 @import url(css/tooltips.css); 25 @import url(css/tooltips.css);
@@ -94,19 +100,19 @@ body { @@ -94,19 +100,19 @@ body {
94 } 100 }
95 101
96 * :link,:visited { 102 * :link,:visited {
97 - text-decoration:none; 103 + text-decoration: none;
98 } 104 }
99 105
100 * ul,ol { 106 * ul,ol {
101 - list-style:none; 107 + list-style: none;
102 } 108 }
103 109
104 * h1,h2,h3,h4,h5,h6 { 110 * h1,h2,h3,h4,h5,h6 {
105 - color:inherit;  
106 - font-family: arial; 111 + color: inherit;
  112 + font-family: Arial;
107 font-weight: 700; 113 font-weight: 700;
108 - margin-top:20px;  
109 - margin-bottom:10px; 114 + margin-top: 20px;
  115 + margin-bottom: 10px;
110 } 116 }
111 117
112 * h1{ 118 * h1{
@@ -131,7 +137,7 @@ body { @@ -131,7 +137,7 @@ body {
131 137
132 #content h1, #content h2, #content h3, #content h4, #content h5, #content h6{ 138 #content h1, #content h2, #content h3, #content h4, #content h5, #content h6{
133 margin-top: 20px; 139 margin-top: 20px;
134 - margin-bottom:10px 140 + margin-bottom: 10px;
135 color: inherit; 141 color: inherit;
136 font-family: Arial; 142 font-family: Arial;
137 font-weight: 700; 143 font-weight: 700;