Download as
Browse Code »

Commit 88057aef08884c4d4637fab39e814a8ea62ea7a6

Authored by AurelioAHeckert
1 parent 06ff6031
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem360: Zen3 footer formated 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1767 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 6 changed files with 162 additions and 114 deletions   Show diff stats
app/views/layouts/application.rhtml
  Diff comments   View file @88057ae
@@ -9,6 +9,16 @@ @@ -9,6 +9,16 @@
9 </title> 9 </title>
10 <meta name="description" content="FIXME: Descriptions of Noosfero" /> 10 <meta name="description" content="FIXME: Descriptions of Noosfero" />
11 <meta name="keywords" content="Noosfero, Community, Open Source" /> 11 <meta name="keywords" content="Noosfero, Community, Open Source" />
  12 +
  13 + <%= javascript_include_tag 'default-config' %>
  14 + <%= javascript_include_tag :defaults %>
  15 + <%# javascript_include_tag 'animator' %>
  16 + <%= javascript_include_tag 'menu' %>
  17 + <%= javascript_include_tag 'auto-open-menu' %>
  18 + <%= include_lightbox_header %>
  19 + <%= javascript_include_tag 'cms' if @controller.controller_name == 'cms' %>
  20 + <%= theme_javascript %>
  21 +
12 <%# 22 <%#
13 stylesheet_import is better then stylesheet_link_tag because the stylesheet 23 stylesheet_import is better then stylesheet_link_tag because the stylesheet
14 must be loaded before the page show. 24 must be loaded before the page show.
@@ -33,17 +43,6 @@ @@ -33,17 +43,6 @@
33 <%= stylesheet_link_tag '/designs/templates/default/stylesheets/style.css' %> 43 <%= stylesheet_link_tag '/designs/templates/default/stylesheets/style.css' %>
34 <%= stylesheet_link_tag '/designs/icons/default/style.css' %> 44 <%= stylesheet_link_tag '/designs/icons/default/style.css' %>
35 45
36 - <%= javascript_include_tag 'default-config' %>  
37 - <%= javascript_include_tag :defaults %>  
38 - <%# javascript_include_tag 'animator' %>  
39 - <%= javascript_include_tag 'menu' %>  
40 - <%= javascript_include_tag 'auto-open-menu' %>  
41 - <%= include_lightbox_header %>  
42 - <%# cms stuff %>  
43 - <% if @controller.controller_name == 'cms' %>  
44 - <%= javascript_include_tag 'cms' %>  
45 - <% end %>  
46 - <%= theme_javascript %>  
47 </head> 46 </head>
48 47
49 <body class='noosfero category<%= category_color %><%= 48 <body class='noosfero category<%= category_color %><%=
public/designs/themes/ecosol/stylesheets/common.css
  Diff comments   View file @88057ae
@@ -67,108 +67,6 @@ body.category4 #content h4, body.category4 #content h5, body.category4 #content @@ -67,108 +67,6 @@ body.category4 #content h4, body.category4 #content h5, body.category4 #content
67 } 67 }
68 68
69 69
70 -/* file manager (big) style */  
71 -  
72 -div.file-manager {  
73 - clear: both;  
74 -}  
75 -  
76 -div.file-manager  
77 -div.file-manager-button {  
78 - float: left;  
79 - width: 140px;  
80 - text-align: center;  
81 - margin-right: 0.5em;  
82 - margin-top: 0.5em;  
83 -}  
84 -  
85 -div.file-manager  
86 -div.file-manager-button a img {  
87 - border: none;  
88 -}  
89 -  
90 -div.file-manager  
91 -div.file-manager-button a {  
92 - border: 1px solid #e0e0e0;  
93 - display: block;  
94 - padding: 3px;  
95 - height: 90px;  
96 - overflow: hidden;  
97 - background: white;  
98 - font-size: 90%;  
99 -}  
100 -  
101 -div.file-manager  
102 -div.file-manager-button a:hover {  
103 - border: 1px solid #006;  
104 - background: #acf;  
105 - color: #006;  
106 -}  
107 -  
108 -/************* file manager (small) style *****************/  
109 -.file-manager-small {  
110 - background: white;  
111 - border: 1px solid gray;  
112 -}  
113 -  
114 -.file-manager-title {  
115 - font-weight: bold;  
116 - border: 1px solid gray;  
117 - border-bottom: none;  
118 - border-top: none;  
119 - padding: 2px;  
120 - background: #579;  
121 - color: white;  
122 - height: 24px;  
123 -}  
124 -  
125 -.file-manager-small ul {  
126 - padding: 5px;  
127 - margin: 0px;  
128 -}  
129 -  
130 -.file-manager-small li {  
131 - list-style: none;  
132 - padding: 2px;  
133 -}  
134 -  
135 -div.file-manager-small  
136 -div.file-manager-button a div {  
137 - display: inline;  
138 -}  
139 -  
140 -div.file-manager-small  
141 -div.file-manager-button a img {  
142 - border: none;  
143 - vertical-align: middle;  
144 -}  
145 -  
146 -div.file-manager-small  
147 -div.file-manager-button a {  
148 - border: 1px solid transparent;  
149 -}  
150 -  
151 -div.file-manager-small  
152 -div.file-manager-button a:hover {  
153 - border: 1px solid #006;  
154 - background: #acf;  
155 - color: #006;  
156 -}  
157 -  
158 -.file-manager-small {  
159 - position: relative;  
160 -}  
161 -  
162 -.file-manager-small .file-manager-controls {  
163 - border-top: 1px solid gray;  
164 - padding: 4px;  
165 -}  
166 -  
167 -.file-manager-small .file-manager-controls * {  
168 - text-align: right;  
169 -}  
170 -  
171 -  
172 #lightbox{ 70 #lightbox{
173 background: #FFF url(../images/bg-top-cinza.jpg) no-repeat 50% -15px; 71 background: #FFF url(../images/bg-top-cinza.jpg) no-repeat 50% -15px;
174 } 72 }
public/designs/themes/zen3/stylesheets/common.css
  Diff comments   View file @88057ae
1 1
2 body { 2 body {
3 - background: #888A85; 3 + background: #BABDB6; #888A85;
4 } 4 }
5 5
6 #wrap { 6 #wrap {
@@ -13,3 +13,48 @@ body { @@ -13,3 +13,48 @@ body {
13 background: url(../images/bg-down.png) 0% 100% repeat-x; 13 background: url(../images/bg-down.png) 0% 100% repeat-x;
14 } 14 }
15 15
  16 +#lightbox{
  17 + background: #FFF url(../images/bg-top.png) repeat-x;
  18 +}
  19 +
  20 +#footer {
  21 + background: url("../images/bg-footer.png") repeat-x;
  22 + margin: 0px;
  23 + padding: 10px;
  24 + color: #FFF;
  25 +}
  26 +#footer a {
  27 + color: #FFF;
  28 +}
  29 +#footer a:hover {
  30 + color: #FFF;
  31 +}
  32 +
  33 +#footer div a {
  34 + border-bottom: 1px dotted #FFF;
  35 +}
  36 +#footer div a:hover {
  37 + border-bottom: 1px solid #FFF;
  38 +}
  39 +
  40 +#footer-esq,
  41 +#footer-dir,
  42 +#footer div {
  43 + opacity: 0.4;
  44 + filter: alpha(opacity=40);
  45 +}
  46 +
  47 +#footer-esq {
  48 + float: left;
  49 + text-align: left;
  50 +}
  51 +#footer-dir {
  52 + float: right;
  53 + text-align: right;
  54 +}
  55 +
  56 +#footer-esq:hover,
  57 +#footer-dir:hover {
  58 + opacity: 0.7;
  59 + filter: alpha(opacity=70);
  60 +}
public/stylesheets/controller_cms.css
  Diff comments   View file @88057ae
@@ -59,3 +59,67 @@ ul.categories li.cat_checked { @@ -59,3 +59,67 @@ ul.categories li.cat_checked {
59 background: #B8CFE7; 59 background: #B8CFE7;
60 } 60 }
61 61
  62 +/************* file manager (small) style *****************/
  63 +
  64 +.file-manager-small {
  65 + background: white;
  66 + border: 1px solid gray;
  67 +}
  68 +
  69 +.file-manager-title {
  70 + font-weight: bold;
  71 + border: 1px solid gray;
  72 + border-bottom: none;
  73 + border-top: none;
  74 + padding: 2px;
  75 + background: #579;
  76 + color: white;
  77 + height: 24px;
  78 +}
  79 +
  80 +.file-manager-small ul {
  81 + padding: 5px;
  82 + margin: 0px;
  83 +}
  84 +
  85 +.file-manager-small li {
  86 + list-style: none;
  87 + padding: 2px;
  88 +}
  89 +
  90 +div.file-manager-small
  91 +div.file-manager-button a div {
  92 + display: inline;
  93 +}
  94 +
  95 +div.file-manager-small
  96 +div.file-manager-button a img {
  97 + border: none;
  98 + vertical-align: middle;
  99 +}
  100 +
  101 +div.file-manager-small
  102 +div.file-manager-button a {
  103 + border: 1px solid transparent;
  104 +}
  105 +
  106 +div.file-manager-small
  107 +div.file-manager-button a:hover {
  108 + border: 1px solid #006;
  109 + background: #acf;
  110 + color: #006;
  111 +}
  112 +
  113 +.file-manager-small {
  114 + position: relative;
  115 +}
  116 +
  117 +.file-manager-small .file-manager-controls {
  118 + border-top: 1px solid gray;
  119 + padding: 4px;
  120 +}
  121 +
  122 +.file-manager-small .file-manager-controls * {
  123 + text-align: right;
  124 +}
  125 +
public/stylesheets/controller_profile_editor.css
  Diff comments   View file @88057ae
@@ -23,3 +23,44 @@ @@ -23,3 +23,44 @@
23 border: none !important; 23 border: none !important;
24 background-color: transparent !important; 24 background-color: transparent !important;
25 } 25 }
  26 +
  27 +
  28 +/* file manager (big) style */
  29 +
  30 +div.file-manager {
  31 + clear: both;
  32 +}
  33 +
  34 +div.file-manager
  35 +div.file-manager-button {
  36 + float: left;
  37 + width: 140px;
  38 + text-align: center;
  39 + margin-right: 0.5em;
  40 + margin-top: 0.5em;
  41 +}
  42 +
  43 +div.file-manager
  44 +div.file-manager-button a img {
  45 + border: none;
  46 +}
  47 +
  48 +div.file-manager
  49 +div.file-manager-button a {
  50 + border: 1px solid #e0e0e0;
  51 + display: block;
  52 + padding: 3px;
  53 + height: 90px;
  54 + overflow: hidden;
  55 + background: white;
  56 + font-size: 90%;
  57 + text-decoration: none;
  58 +}
  59 +
  60 +div.file-manager
  61 +div.file-manager-button a:hover {
  62 + border: 1px solid #006;
  63 + background: #acf;
  64 + color: #006;
  65 +}
  66 +
public/stylesheets/lightbox.css
  Diff comments   View file @88057ae
@@ -20,6 +20,7 @@ Modified : February 1, 2006 @@ -20,6 +20,7 @@ Modified : February 1, 2006
20 border: 10px solid #000; 20 border: 10px solid #000;
21 text-align: left; 21 text-align: left;
22 padding: 1em; 22 padding: 1em;
  23 + background: #FFF;
23 } 24 }
24 #lightbox[id]{ 25 #lightbox[id]{
25 position:fixed; 26 position:fixed;