diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml index 2c71830..45e1f33 100644 --- a/app/views/account/login.rhtml +++ b/app/views/account/login.rhtml @@ -1,4 +1,6 @@ -

<%= _('Login') %>

+
+ +

<%= _('Login') %>

<% labelled_form_for :user, @user, :url => { :controller => 'account', :action => 'login' } do |f| %> @@ -12,10 +14,13 @@ <% end %> -

+

<%= link_to _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>

-

+

<%= link_to _("I want to be an user!"), :controller => 'account', :action => 'signup' %> -

+

+ +
+ diff --git a/app/views/category/view.rhtml b/app/views/category/view.rhtml index 26ed069..8cdf450 100644 --- a/app/views/category/view.rhtml +++ b/app/views/category/view.rhtml @@ -1,16 +1,27 @@ -<%= @category.ancestors.reverse.map { |a| link_to_category(a) }.join(' → ') %> +
-

<%= _('Category: %s') % @category.name %>

+
+ <%= @category.ancestors.reverse.map { |a| link_to_category(a) }.join(' → ') %> +
-<%= render :partial => @category.class.name.underscore %> +

<%= _('Category: %s') % @category.name %>

-<% if @category.children.empty? %> - <%= _('No children categories') %> -<% else %> -

<%= _('Child categories:') %>

- -<% end %> + +
+ + + diff --git a/app/views/home/index.rhtml b/app/views/home/index.rhtml index 9c3cd1c..28436d0 100644 --- a/app/views/home/index.rhtml +++ b/app/views/home/index.rhtml @@ -5,7 +5,7 @@ <%# FIXME %> <%= render :file => 'account/login.rhtml' %> -

<%= _('Recent articles') %>

+

<%= _('Recent articles') %>

<% for article in @articles %>

<%= article.name %>

diff --git a/public/artwork/screens/bg-top.svg b/public/artwork/screens/bg-top.svg new file mode 100644 index 0000000..1e32dc4 --- /dev/null +++ b/public/artwork/screens/bg-top.svg @@ -0,0 +1,817 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/designs/templates/default/images/bg-top-azul.png b/public/designs/templates/default/images/bg-top-azul.png new file mode 100644 index 0000000..56ce395 Binary files /dev/null and b/public/designs/templates/default/images/bg-top-azul.png differ diff --git a/public/designs/templates/default/images/bg-top-cinza.jpg b/public/designs/templates/default/images/bg-top-cinza.jpg new file mode 100644 index 0000000..7094ddc Binary files /dev/null and b/public/designs/templates/default/images/bg-top-cinza.jpg differ diff --git a/public/designs/templates/default/images/bg-top-laranja.png b/public/designs/templates/default/images/bg-top-laranja.png new file mode 100644 index 0000000..e752b61 Binary files /dev/null and b/public/designs/templates/default/images/bg-top-laranja.png differ diff --git a/public/designs/templates/default/images/bg-top-lilas.png b/public/designs/templates/default/images/bg-top-lilas.png new file mode 100644 index 0000000..2d725c0 Binary files /dev/null and b/public/designs/templates/default/images/bg-top-lilas.png differ diff --git a/public/designs/templates/default/images/bg-top-verde.png b/public/designs/templates/default/images/bg-top-verde.png new file mode 100644 index 0000000..3ee58c9 Binary files /dev/null and b/public/designs/templates/default/images/bg-top-verde.png differ diff --git a/public/designs/templates/default/images/bg-top-vermelho.png b/public/designs/templates/default/images/bg-top-vermelho.png new file mode 100644 index 0000000..69a9101 Binary files /dev/null and b/public/designs/templates/default/images/bg-top-vermelho.png differ diff --git a/public/designs/templates/default/stylesheets/forms.css b/public/designs/templates/default/stylesheets/forms.css index 28b92e9..d4dd4de 100644 --- a/public/designs/templates/default/stylesheets/forms.css +++ b/public/designs/templates/default/stylesheets/forms.css @@ -4,7 +4,7 @@ } .formlabel { - font-size: 12px; + /* font-size: 11px; */ color: #444; display: block; padding: 2px 5px; @@ -41,5 +41,6 @@ color: #505050; background: #BBB url("../images/bt-bg.png") top left repeat-x; padding: 0px 30px; + margin: auto; } diff --git a/public/designs/templates/default/stylesheets/login-box.css b/public/designs/templates/default/stylesheets/login-box.css new file mode 100644 index 0000000..2623a96 --- /dev/null +++ b/public/designs/templates/default/stylesheets/login-box.css @@ -0,0 +1,37 @@ + +#login-box { + border: 2px solid #888; + padding: 3px 10% 8px 10%; + font-size: 10px; +} + +#login-box .formfieldline input { + width: 99%; +} + +#login-box form { + margin: 0px; + padding: 0px; +} + +#login-box h2 { + color: #888; + font-size: 18px; + text-align: center; + margin: 0px; + padding: 0px; +} + +#login-box p { + text-align: center; + margin: 0px; + padding: 0px; +} + +#login-box #forgot-passwd { + padding-bottom: 6px; +} + +#want-to-be-an-user { + font-size: 13px; +} diff --git a/public/designs/templates/default/stylesheets/style.css b/public/designs/templates/default/stylesheets/style.css index 57ea9ae..b7b4c69 100644 --- a/public/designs/templates/default/stylesheets/style.css +++ b/public/designs/templates/default/stylesheets/style.css @@ -2,39 +2,37 @@ @import url("contentblocks.css"); @import url("forms.css"); @import url("table.css"); +@import url("login-box.css"); body { + padding: 0px; + margin: 0px; font-family: Verdana, Sans-Serif; font-size: 14px; + /* + ** a imagem de fundo colorida é mais pesada, por isso carregamos + ** essa cinza mais leve antes para melhorar a esperiência do usuário. + */ + background-position: 50% 25px; + background-repeat: repeat-x; + background-attachment: fixed; + background-image: url(../images/bg-top-cinza.jpg); } -body.category #wrap { - background-attachment: fixed; - background: url("../images/bgblue.png") top left no-repeat; +#wrap { + background-position: 50% 25px; + background-repeat: repeat-x; + background-attachment: fixed; + background-image: url(../images/bg-top-azul.png); } -body.category1 #wrap { - background-attachment: fixed; - background: url("../images/bgorange.png") top left no-repeat; -} - -body.category2 #wrap { - background-attachment: fixed; - background: url("../images/bggreen.png") top left no-repeat; -} - -body.category3 #wrap { - background-attachment: fixed; - background: url("../images/bgpurple.png") top left no-repeat; -} - -body.category4 #wrap { - background-attachment: fixed; - background: url("../images/bgred.png") top left no-repeat; -} +body.category1 #wrap { background-image: url("../images/bg-top-laranja.png"); } +body.category2 #wrap { background-image: url("../images/bg-top-verde.png"); } +body.category3 #wrap { background-image: url("../images/bg-top-lilas.png"); } +body.category4 #wrap { background-image: url("../images/bg-top-vermelho.png"); } #header { - height: 150px; + height: 60px; } #design_boxes { @@ -96,3 +94,59 @@ div#notice { background: #ffffa9; padding: 10px; } + +/* * * Generic Content Formating * * */ + +#content h1 { + text-align: center; +} + +#content a { + color: #05B; +} +#content a:visited { + color: #68C; +} +#content a:hover, +#content a:active { + color: #08F; +} + +/* Category */ + +#view-category { /* none */ } + +#categiry-name { + margin: 0px; + position: relative; + top: -5px; +} + +#category-ancestors { + padding-top: 25px; + font-weight: bold; +} + +#content #category-ancestors a { + color: #000; + text-decoration: none; +} +#content #category-ancestors a:hover { + color: #07F; + text-decoration: underline; +} + +#category-childs h4, +#category-childs ul { + margin: 0px; +} + +#category-childs a { + font-weight: bold; + text-decoration: none; +} + +#cat-no-child { + color: #AAA; +} + diff --git a/public/stylesheets/button.css b/public/stylesheets/button.css index a8edcfc..56d8539 100644 --- a/public/stylesheets/button.css +++ b/public/stylesheets/button.css @@ -14,6 +14,9 @@ display: block; height: 24px; } +input.button { + float: none; +} .button, .button:visited { color: black; -- libgit2 0.21.2