Changesets can be listed by changeset number.
The Git repository is here.
Changeset 393
Layout and style changes to fit into the ROOL overall site design.
- Comitted by: rool
- Date: Monday March 21 15:15:21 2011 (over 13 years ago)
Affected files:
- rool/rails/canvass/trunk/app/views/layouts/_footer.html.erb
- rool/rails/canvass/trunk/app/views/layouts/_header.html.erb
- rool/rails/canvass/trunk/app/views/layouts/application.html.erb (diff)
- rool/rails/canvass/trunk/public/stylesheets/default_general.css (diff)
- rool/rails/canvass/trunk/public/stylesheets/default_print.css (diff)
- rool/rails/canvass/trunk/public/stylesheets/leightbox/leightbox.css (diff)
rool/rails/canvass/trunk/app/views/layouts/application.html.erb:
prev. | current | |
<% if using_quiet_prototype? -%> | ||
<%= javascript_include_tag( 'canvass/redcloth_preview.js' ) %> | ||
<% end -%> | ||
17 | | |
17 | <link type="text/css" rel="stylesheet" href="/css/risc_os_open_2011.css" media="all" /> | |
<%= stylesheet_link_tag( 'default_general', :media => :all ) %> | ||
<%= stylesheet_link_tag( 'default_print', :media => :print ) %> | ||
</head> | ||
<body> | ||
22 | | |
<%= render 'shared/fixed_header' %> | ||
24 | ||
25 | ||
27 | | |
24 | <div id="template_main"> | |
29 | | |
26 | <!-- Main body content --> | |
31 | | |
32 | | |
33 | | |
34 | | |
35 | ||
28 | <div id="template_body"> | |
29 | <div id="template_body_content"> | |
30 | <%= hubssolib_flash_tags -%> | |
31 | ||
<div class="content"> | ||
<% unless controller.skip_main_heading? -%> | ||
<h1><%= apphelp_heading() %></h1> | ||
<% end -%> | ||
<%= yield %> | ||
</div> | ||
38 | </div> | |
39 | </div> | |
43 | | |
44 | | |
45 | | |
41 | <!-- Sidebar --> | |
47 | | |
48 | | |
49 | | |
50 | | |
43 | <div id="template_sidebar"> | |
44 | <div id="template_sidebar_content"> | |
45 | <div class="template_sidebar_node"> | |
46 | <h3>Search whole site</h3> | |
52 | | |
53 | | |
54 | | |
48 | <p /> | |
49 | <form action="http://www.google.com/search" method="get" class="searchform"> | |
50 | <input type="hidden" name="num" value="10" /> | |
51 | <input type="hidden" name="hl" value="en" /> | |
52 | <input type="hidden" name="as_sitesearch" value="www.riscosopen.org" /> | |
53 | <input type="text" value="" maxlength="256" size="15" name="q" id="q" /> | |
54 | <b><input type="submit" value="Go" name="btnG" /></b> | |
55 | </form> | |
56 | </div> | |
56 | | |
57 | | |
58 | | |
59 | | |
60 | | |
61 | | |
62 | | |
63 | | |
64 | | |
65 | | |
66 | | |
67 | | |
68 | | |
58 | <p /> | |
59 | <%= render 'shared/fixed_sidebar' %> | |
61 | <p /> | |
62 | <div class="template_sidebar_node"> | |
63 | <h3><%= apphelp_generic( :actions ) %></h3> | |
64 | ||
65 | <ul> | |
66 | <%= | |
67 | buttons = [] | |
68 | ||
69 | if ( logged_in? && current_user.admin? ) | |
buttons << [ | ||
:index, | ||
{ | ||
:controller => PollsController, | ||
74 | | |
74 | :method => :user_polls_path, | |
75 | :text => apphelp_view_hint( :your_polls, PollsController ) | |
76 | }, | |
77 | { | |
78 | :user_id => current_user.id | |
} | ||
] | ||
81 | end | |
78 | | |
83 | buttons << [ | |
84 | :index, | |
85 | { | |
86 | :controller => PollsController, | |
87 | :method => :polls_path | |
88 | } | |
89 | ] | |
90 | ||
91 | if ( logged_in? ) | |
92 | buttons << [ | |
93 | :index, | |
94 | { | |
95 | :controller => DonationsController, | |
96 | :method => :user_donations_path, | |
97 | :text => apphelp_view_hint( :your_donations, DonationsController ) | |
98 | }, | |
99 | { | |
100 | :user_id => current_user.nil? ? 0 : current_user.id | |
101 | } | |
102 | ] | |
103 | ||
104 | if ( current_user.admin? ) | |
buttons << [ | ||
:index, | ||
{ | ||
:controller => DonationsController, | ||
83 | | |
84 | | |
85 | | |
86 | | |
87 | | |
109 | :method => :donations_path | |
} | ||
] | ||
90 | ||
91 | | |
92 | | |
93 | | |
94 | | |
95 | | |
96 | | |
97 | | |
98 | | |
99 | | |
end | ||
113 | end | |
102 | | |
103 | | |
104 | | |
105 | | |
106 | | |
107 | | |
108 | | |
109 | | |
110 | | |
111 | | |
112 | | |
113 | | |
114 | | |
115 | | |
116 | | |
117 | | |
118 | | |
119 | | |
120 | | |
121 | | |
122 | | |
123 | | |
115 | buttons += [ | |
116 | [ | |
117 | :index, | |
118 | { | |
119 | :controller => AuditersController, | |
120 | :method => :auditers_path | |
121 | } | |
122 | ], | |
123 | [ | |
124 | :index, | |
125 | { | |
126 | :controller => UsersController, | |
127 | :method => :users_path | |
128 | } | |
129 | ], | |
130 | [ | |
131 | :index, | |
132 | { | |
133 | :controller => CurrenciesController, | |
134 | :method => :currencies_path | |
135 | } | |
] | ||
137 | ] | |
126 | | |
127 | | |
128 | | |
129 | | |
130 | | |
131 | | |
132 | | |
133 | ||
134 | | |
135 | ||
136 | ||
137 | | |
138 | | |
139 | | |
140 | ||
141 | | |
142 | | |
143 | | |
139 | apphelp_protected_links_to( | |
140 | { :prefix => '<li>', :suffix => '</li>' }, | |
141 | *buttons | |
142 | ) | |
143 | %> | |
144 | </ul> | |
</div> | ||
145 | | |
146 | | |
147 | | |
148 | | |
146 | </div> | |
147 | </div> | |
150 | | |
151 | ||
152 | | |
149 | <div id="template_main_block_end"></div> | |
</div> | ||
<%= render 'shared/fixed_footer' %> | ||
156 | ||
157 | ||
</body> | ||
159 | ||
155 | </html> |
rool/rails/canvass/trunk/public/stylesheets/default_general.css:
prev. | current | |
* * | ||
* History: 11-Dec-2009 (ADH): Created. * | ||
* 18-Feb-2011 (ADH): Abridged version imported from Artisan. * | ||
9 | * 08-Mar-2011 (ADH): Stripped back further for ROOL. * | |
\************************************************************************/ | ||
11 | ||
12 | | |
13 | | |
14 | ||
15 | ||
16 | ||
17 | | |
18 | | |
19 | | |
20 | ||
21 | ||
h1, h3 { | ||
margin-bottom: 20px; | ||
} | ||
... | ... | |
background-color: #f4f4f4; | ||
display: inline-block; | ||
81 | | |
71 | /* border-radius: 10px; */ /* Valid, but the W3C CSS3 validator is buggy and complains - and has since 2006! */ | |
-moz-border-radius: 10px; | ||
-webkit-border-radius: 10px; | ||
... | ... | |
margin-bottom: 0; | ||
} | ||
114 | ||
115 | | |
116 | | |
117 | | |
118 | ||
119 | ||
120 | | |
121 | | |
122 | ||
123 | | |
124 | | |
125 | ||
126 | | |
127 | | |
128 | | |
129 | ||
130 | | |
131 | ||
132 | | |
133 | ||
134 | | |
135 | ||
136 | ||
137 | ||
138 | | |
139 | | |
140 | | |
141 | | |
142 | | |
143 | | |
144 | ||
145 | ||
146 | | |
147 | | |
148 | ||
149 | ||
150 | | |
151 | | |
152 | ||
153 | ||
154 | ||
155 | | |
156 | | |
157 | ||
158 | ||
159 | | |
160 | | |
161 | ||
162 | ||
163 | ||
164 | ||
165 | | |
166 | | |
167 | ||
168 | ||
169 | ||
170 | | |
171 | | |
172 | ||
173 | ||
174 | ||
175 | ||
176 | ||
177 | | |
178 | | |
179 | | |
180 | | |
181 | ||
182 | ||
183 | ||
184 | | |
185 | | |
186 | | |
187 | | |
188 | | |
189 | | |
190 | ||
191 | ||
192 | ||
193 | | |
194 | | |
195 | | |
196 | | |
197 | | |
198 | | |
199 | | |
200 | ||
201 | ||
202 | ||
203 | | |
204 | | |
205 | | |
206 | ||
207 | ||
208 | ||
209 | | |
210 | | |
211 | ||
212 | ||
/* Collapse margins and padding around "button_to..." forms */ | ||
form.button-to { | ||
... | ... | |
.buttons a, .buttons button { | ||
display: inline-block; | ||
247 | | |
248 | | |
249 | | |
250 | | |
138 | background: #eee url( /images/risc_os_open/button_fade.png ) top left repeat-x; | |
139 | border: 2px solid #e5e5e5; | |
/* Some browsers reset the font family in button elements, so it must be | ||
* explicitly restated here. | ||
*/ | ||
256 | | |
145 | font-family: homerton, tahoma, arial, helvetica, sans-serif; | |
258 | | |
147 | font-size: 11pt; | |
line-height: 130%; | ||
text-decoration: none; | ||
font-weight: bold; | ||
color: #565656; | ||
cursor: pointer; | ||
264 | | |
153 | padding: 5px 9px 7px 9px; | |
margin: 1px 0; /* Stop vertically stacked buttons from touching */ | ||
} | ||
... | ... | |
} | ||
.buttons button[ type ] { | ||
275 | | |
164 | padding: 5px 10px 7px 7px; | |
line-height: 17px; /* Safari */ | ||
} | ||
... | ... | |
button:hover, .buttons a:hover { | ||
background-color: #dff4ff; | ||
320 | | |
209 | border: 2px solid #c2e1ef; | |
color: #336699; | ||
323 | | |
212 | box-shadow: 0px 0px 4px #888; | |
-moz-box-shadow: #888 0 0 4px; | ||
-webkit-box-shadow: #888 0 0 4px; | ||
} | ||
.buttons a:active { | ||
background-color: #6299c5; | ||
330 | | |
219 | border: 2px solid #6299c5; | |
color: #fff; | ||
} | ||
334 | ||
223 | /* positive (accept-style) buttons */ | |
button.positive, .buttons a.positive { | ||
337 | | |
226 | color: #4e713e; | |
} | ||
.buttons a.positive:hover, button.positive:hover { | ||
341 | | |
342 | | |
343 | | |
230 | background-color: #e6efc2; | |
231 | border-color: #c6d880; | |
232 | color: #4c7c2e; | |
} | ||
.buttons a.positive:active { | ||
347 | | |
348 | | |
236 | background-color: #4c7c2e; | |
237 | border-color: #4c7c2e; | |
color: #fff; | ||
} | ||
352 | ||
241 | /* negative (cancellation-style) buttons */ | |
.buttons a.negative, button.negative { | ||
355 | | |
244 | color: #7c2e43; | |
} | ||
.buttons a.negative:hover, button.negative:hover { | ||
background-color: #fbe3e4; | ||
border-color: #fbc2c4; | ||
361 | | |
250 | color: #7c2e43; | |
} | ||
.buttons a.negative:active { | ||
365 | | |
366 | | |
254 | background-color: #7c2e43; | |
255 | border-color: #7c2e43; | |
color: #fff; | ||
} | ||
... | ... | |
background-color: #fff; | ||
border: 1px solid #ccc; | ||
661 | | |
550 | box-shadow: 0px 0px 4px #888; | |
-moz-box-shadow: #888 0 0 4px; | ||
-webkit-box-shadow: #888 0 0 4px; | ||
} |
rool/rails/canvass/trunk/public/stylesheets/default_print.css:
prev. | current | |
*/ | ||
div#header_and_content { | ||
30 | | |
30 | min-height: 0; | |
padding-top: 0; | ||
} | ||
rool/rails/canvass/trunk/public/stylesheets/leightbox/leightbox.css:
prev. | current | |
background-color:#333; | ||
-moz-opacity: 0.8; | ||
opacity:.80; | ||
39 | | |
} | ||
.lightbox[id]{ /* IE6 and below Can't See This */ position:fixed; }#overlay[id]{ /* IE6 and below Can't See This */ position:fixed; } | ||