diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 86a3b3a..f4e7657 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -11,11 +11,13 @@ <%= stylesheet_link_tag 'common' %> - <%= stylesheet_link_tag 'help' %> - <%= stylesheet_link_tag 'menu' %> + <%= stylesheet_link_tag 'help' %> + <%= stylesheet_link_tag 'menu' %> <%= stylesheet_link_tag 'button' %> <%= stylesheet_link_tag 'search' %> <%= stylesheet_link_tag 'blocks' %> + <%= stylesheet_link_tag 'forms' %> + <%= stylesheet_link_tag 'login-box' %> <%# FIXME %> <%= stylesheet_link_tag '/designs/templates/default/stylesheets/style.css' %> diff --git a/public/designs/icons/default/cancel-HC.gif b/public/designs/icons/default/cancel-HC.gif new file mode 100644 index 0000000..b9e2e62 Binary files /dev/null and b/public/designs/icons/default/cancel-HC.gif differ diff --git a/public/designs/icons/default/cancel-fat-HC.gif b/public/designs/icons/default/cancel-fat-HC.gif new file mode 100644 index 0000000..1a28e8a Binary files /dev/null and b/public/designs/icons/default/cancel-fat-HC.gif differ diff --git a/public/designs/icons/default/key-HC.gif b/public/designs/icons/default/key-HC.gif new file mode 100644 index 0000000..e1b5fd1 Binary files /dev/null and b/public/designs/icons/default/key-HC.gif differ diff --git a/public/designs/icons/default/style.css b/public/designs/icons/default/style.css index 7dfca21..87fb6be 100644 --- a/public/designs/icons/default/style.css +++ b/public/designs/icons/default/style.css @@ -1,21 +1,21 @@ -.button.edit { background-image: url(gtk-edit.png); } -.button.home { background-image: url(gnome-home.png); } -.button.new { background-image: url(gtk-new.png); } -.button.close { background-image: url(gtk-close.png); } -.button.open { background-image: url(gtk-open.png); } -.button.cms { background-image: url(abiword_48.png)} -.button.save { background-image: url(gtk-save.png); } -.button.up { background-image: url(gtk-go-up.png); } -.button.cancel { background-image: url(gtk-cancel.png); } -.button.person { background-image: url(user_icon.png); } -.button.product { background-image: url(gnome-other.png); } -.button.delete { background-image: url(gtk-delete.png); } -.button.find { background-image: url(noosfero-find.png); } -.button.back { background-image: url(gtk-go-back-ltr.png); } -.button.next { background-image: url(gtk-media-next-ltr.png); } -.button.add { background-image: url(gtk-add.png); } -.button.up { background-image: url(gtk-go-up.png); } -.button.down { background-image: url(gtk-go-down.png); } -.button.search { background-image: url(gnome-search.png); } -.button.ok { background-image: url(gtk-ok.png); } -.button.login { background-image: url(password.png); } +.button.edit { background-image: url(gtk-edit.png); } +.button.home { background-image: url(gnome-home.png); } +.button.new { background-image: url(gtk-new.png); } +.button.close { background-image: url(cancel-HC.gif); } +.button.open { background-image: url(gtk-open.png); } +.button.cms { background-image: url(abiword_48.png) } +.button.save { background-image: url(gtk-save.png); } +.button.up { background-image: url(gtk-go-up.png); } +.button.cancel { background-image: url(cancel-HC.gif); } +.button.person { background-image: url(user_icon.png); } +.button.product { background-image: url(gnome-other.png); } +.button.delete { background-image: url(gtk-delete.png); } +.button.find { background-image: url(noosfero-find.png); } +.button.back { background-image: url(gtk-go-back-ltr.png); } +.button.next { background-image: url(gtk-media-next-ltr.png); } +.button.add { background-image: url(gtk-add.png); } +.button.up { background-image: url(gtk-go-up.png); } +.button.down { background-image: url(gtk-go-down.png); } +.button.search { background-image: url(gnome-search.png); } +.button.ok { background-image: url(gtk-ok.png); } +.button.login { background-image: url(key-HC.gif); } diff --git a/public/stylesheets/block.css b/public/stylesheets/block.css deleted file mode 100644 index aa1ddbc..0000000 --- a/public/stylesheets/block.css +++ /dev/null @@ -1,20 +0,0 @@ -body.noosfero-block { - background: white; - font-size: 12px; -} - -h2 { - padding: 0px; - margin: 0px; - font-size: 14px; - border-bottom: 1px solid black; -} - -input { - font-size: 10px; -} - -#login-box { - text-align: center; -} - diff --git a/public/stylesheets/button.css b/public/stylesheets/button.css index 3725128..e003c2c 100644 --- a/public/stylesheets/button.css +++ b/public/stylesheets/button.css @@ -7,7 +7,7 @@ margin-left: 5px; background-color: transparent; background-repeat: no-repeat; - background-position: 0 0; + background-position: 2px 50%; padding-left: 25px; padding-right: 2px; height: 24px; diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index d8e5d74..1d55b5e 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -336,12 +336,16 @@ div#notice { text-align: center; } +#login-box a, #content a { color: #05B; } +#login-box a:visited, #content a:visited { color: #68C; } +#login-box a:hover, +#login-box a:active, #content a:hover, #content a:active { color: #08F; diff --git a/public/stylesheets/lightbox.css b/public/stylesheets/lightbox.css index c78a3f2..30123a0 100644 --- a/public/stylesheets/lightbox.css +++ b/public/stylesheets/lightbox.css @@ -10,17 +10,16 @@ Modified : February 1, 2006 - - - - - - - - - - - - - - - - - - - - - */ #lightbox{ - display:none; + display: none; position: absolute; - top:50%; - left:50%; - z-index:9999; - width:500px; - margin:-220px 0 0 -250px; - border:1px solid #fff; - background:#FDFCE9; - text-align:left; - + top: 50%; + left: 50%; + z-index: 9999; + width: 500px; + margin: -200px 0 0 -250px; + border: 10px solid #000; + background: #FFF url(../images/bg-top-cinza.jpg) no-repeat 50% -15px; + text-align: left; padding: 1em; } #lightbox[id]{ diff --git a/public/stylesheets/login-box.css b/public/stylesheets/login-box.css index 2623a96..861eaa3 100644 --- a/public/stylesheets/login-box.css +++ b/public/stylesheets/login-box.css @@ -1,9 +1,11 @@ #login-box { - border: 2px solid #888; padding: 3px 10% 8px 10%; font-size: 10px; } +#lightbox #login-box { + padding: 3px 25% 8px 25%; +} #login-box .formfieldline input { width: 99%; @@ -21,6 +23,9 @@ margin: 0px; padding: 0px; } +#lightbox #login-box h2 { + color: #000; +} #login-box p { text-align: center; diff --git a/public/stylesheets/menu.css b/public/stylesheets/menu.css index 6329988..23db45c 100644 --- a/public/stylesheets/menu.css +++ b/public/stylesheets/menu.css @@ -78,6 +78,7 @@ body.category4 .linkSubMenu { background-image: url(/images/borda-esq-aba-vermel margin-right: 20px; padding-left: 21px; opacity: 0.7; + filter: alpha(opacity=70); display: block; float: left; height: 20px; @@ -88,6 +89,7 @@ body.category4 .linkSubMenu { background-image: url(/images/borda-esq-aba-vermel #user_box a:hover, #user_box a:active { opacity: 1; + filter: alpha(opacity=100); } #user_box a#link_to_envhome { -- libgit2 0.21.2