diff --git a/lib/tasks/gettext.rake b/lib/tasks/gettext.rake index 66dc068..c02dd41 100644 --- a/lib/tasks/gettext.rake +++ b/lib/tasks/gettext.rake @@ -35,7 +35,7 @@ task :updatepo do Dir.glob("{app,lib}/**/*.{rb,rhtml,erb}") + Dir.glob('config/initializers/*.rb') + Dir.glob('public/*.html.erb') + - Dir.glob('public/designs/themes/{base,noosfero}/*.{rhtml,html.erb}') + Dir.glob('public/designs/themes/{base,noosfero,profile-base}/*.{rhtml,html.erb}') GetText.update_pofiles(Noosfero::PROJECT, sources, "#{Noosfero::PROJECT} #{Noosfero::VERSION}") end diff --git a/public/designs/themes/aluminium/footer.rhtml b/public/designs/themes/aluminium/footer.rhtml new file mode 120000 index 0000000..18e6abd --- /dev/null +++ b/public/designs/themes/aluminium/footer.rhtml @@ -0,0 +1 @@ +../profile-base/footer.rhtml \ No newline at end of file diff --git a/public/designs/themes/aluminium/header.rhtml b/public/designs/themes/aluminium/header.rhtml new file mode 120000 index 0000000..ab83dcb --- /dev/null +++ b/public/designs/themes/aluminium/header.rhtml @@ -0,0 +1 @@ +../profile-base/header.rhtml \ No newline at end of file diff --git a/public/designs/themes/aluminium/site_title.rhtml b/public/designs/themes/aluminium/site_title.rhtml new file mode 120000 index 0000000..a13a89e --- /dev/null +++ b/public/designs/themes/aluminium/site_title.rhtml @@ -0,0 +1 @@ +../profile-base/site_title.rhtml \ No newline at end of file diff --git a/public/designs/themes/aluminium/style.css b/public/designs/themes/aluminium/style.css new file mode 100644 index 0000000..5eaad6c --- /dev/null +++ b/public/designs/themes/aluminium/style.css @@ -0,0 +1,78 @@ +@import url(../profile-base/style.css); + +/************************** user bar ***************************/ + +#user a, +#user a strong { + color: #2E3436; +} + +/************************** content ***************************/ + +#content .block-title, +#content .main-block h1, #not-found h1, #access-denied h1 { + border-bottom:2px solid #2E3436; + color: #2E3436; +} + +.profile-image-block p { + color: #2E3436; +} + +.block a { + color: #2E3436; +} + +.block a:visited { + color: #555753; +} + +.control-panel a, +.control-panel a:visited { + color: #000; +} + +.controller-profile_editor .control-panel a:hover { + background-color: #2E3436; + color: #FFF; +} + +#content .link-list-block li a:hover { + background-color: #2E3436; +} + +#content .link-list-block li a.link-this-page { + background-color: #555753; + border-right:2px solid #2E3436; +} + +.template-rightbar #content .link-list-block li a.link-this-page, +#content .box-3 .link-list-block li a.link-this-page { + border-left: 2px solid #2E3436; +} + +/************** blog **************/ + +#content .blog-post .title a:hover { + color: #2E3436; +} + +/**************************** Comments *******************************/ + +#content .comments h3 { + color: #2E3436; + border-bottom: 2px solid #2E3436; +} + +.post_comment_box h4 { + background-color: #2E3436; + color: #FFF; +} + +/************************** theme footer ***************************/ + +#footer-content a, +#footer-content a:hover, +#footer-content a:visited { + color: #2E3436; +} diff --git a/public/designs/themes/aluminium/theme.yml b/public/designs/themes/aluminium/theme.yml new file mode 100644 index 0000000..cee7b81 --- /dev/null +++ b/public/designs/themes/aluminium/theme.yml @@ -0,0 +1,3 @@ +theme: "Aluminium theme" +layout: "application-ng" +icon_theme: [default, pidgin] diff --git a/public/designs/themes/butter/footer.rhtml b/public/designs/themes/butter/footer.rhtml new file mode 120000 index 0000000..18e6abd --- /dev/null +++ b/public/designs/themes/butter/footer.rhtml @@ -0,0 +1 @@ +../profile-base/footer.rhtml \ No newline at end of file diff --git a/public/designs/themes/butter/header.rhtml b/public/designs/themes/butter/header.rhtml new file mode 120000 index 0000000..ab83dcb --- /dev/null +++ b/public/designs/themes/butter/header.rhtml @@ -0,0 +1 @@ +../profile-base/header.rhtml \ No newline at end of file diff --git a/public/designs/themes/butter/site_title.rhtml b/public/designs/themes/butter/site_title.rhtml new file mode 120000 index 0000000..a13a89e --- /dev/null +++ b/public/designs/themes/butter/site_title.rhtml @@ -0,0 +1 @@ +../profile-base/site_title.rhtml \ No newline at end of file diff --git a/public/designs/themes/butter/style.css b/public/designs/themes/butter/style.css new file mode 100644 index 0000000..4317b4b --- /dev/null +++ b/public/designs/themes/butter/style.css @@ -0,0 +1,78 @@ +@import url(../profile-base/style.css); + +/************************** user bar ***************************/ + +#user a, +#user a strong { + color: #C4A000; +} + +/************************** content ***************************/ + +#content .block-title, +#content .main-block h1, #not-found h1, #access-denied h1 { + border-bottom:2px solid #C4A000; + color: #C4A000; +} + +.profile-image-block p { + color: #C4A000; +} + +.block a { + color: #C4A000; +} + +.block a:visited { + color: #EDD400; +} + +.control-panel a, +.control-panel a:visited { + color: #000; +} + +.controller-profile_editor .control-panel a:hover { + background-color: #C4A000; + color: #FFF; +} + +#content .link-list-block li a:hover { + background-color: #C4A000; +} + +#content .link-list-block li a.link-this-page { + background-color: #EDD400; + border-right:2px solid #C4A000; +} + +.template-rightbar #content .link-list-block li a.link-this-page, +#content .box-3 .link-list-block li a.link-this-page { + border-left: 2px solid #C4A000; +} + +/************** blog **************/ + +#content .blog-post .title a:hover { + color: #C4A000; +} + +/**************************** Comments *******************************/ + +#content .comments h3 { + color: #C4A000; + border-bottom: 2px solid #C4A000; +} + +.post_comment_box h4 { + background-color: #C4A000; + color: #FFF; +} + +/************************** theme footer ***************************/ + +#footer-content a, +#footer-content a:hover, +#footer-content a:visited { + color: #C4A000; +} diff --git a/public/designs/themes/butter/theme.yml b/public/designs/themes/butter/theme.yml new file mode 100644 index 0000000..56ae4a4 --- /dev/null +++ b/public/designs/themes/butter/theme.yml @@ -0,0 +1,3 @@ +theme: "Butter theme" +layout: "application-ng" +icon_theme: [default, pidgin] diff --git a/public/designs/themes/chameleon/footer.rhtml b/public/designs/themes/chameleon/footer.rhtml new file mode 120000 index 0000000..18e6abd --- /dev/null +++ b/public/designs/themes/chameleon/footer.rhtml @@ -0,0 +1 @@ +../profile-base/footer.rhtml \ No newline at end of file diff --git a/public/designs/themes/chameleon/header.rhtml b/public/designs/themes/chameleon/header.rhtml new file mode 120000 index 0000000..ab83dcb --- /dev/null +++ b/public/designs/themes/chameleon/header.rhtml @@ -0,0 +1 @@ +../profile-base/header.rhtml \ No newline at end of file diff --git a/public/designs/themes/chameleon/site_title.rhtml b/public/designs/themes/chameleon/site_title.rhtml new file mode 120000 index 0000000..a13a89e --- /dev/null +++ b/public/designs/themes/chameleon/site_title.rhtml @@ -0,0 +1 @@ +../profile-base/site_title.rhtml \ No newline at end of file diff --git a/public/designs/themes/chameleon/style.css b/public/designs/themes/chameleon/style.css new file mode 100644 index 0000000..5f4cce5 --- /dev/null +++ b/public/designs/themes/chameleon/style.css @@ -0,0 +1,78 @@ +@import url(../profile-base/style.css); + +/************************** user bar ***************************/ + +#user a, +#user a strong { + color: #4E9A06; +} + +/************************** content ***************************/ + +#content .block-title, +#content .main-block h1, #not-found h1, #access-denied h1 { + border-bottom:2px solid #4E9A06; + color: #4E9A06; +} + +.profile-image-block p { + color: #4E9A06; +} + +.block a { + color: #4E9A06; +} + +.block a:visited { + color: #73D216; +} + +.control-panel a, +.control-panel a:visited { + color: #000; +} + +.controller-profile_editor .control-panel a:hover { + background-color: #4E9A06; + color: #FFF; +} + +#content .link-list-block li a:hover { + background-color: #4E9A06; +} + +#content .link-list-block li a.link-this-page { + background-color: #73D216; + border-right:2px solid #4E9A06; +} + +.template-rightbar #content .link-list-block li a.link-this-page, +#content .box-3 .link-list-block li a.link-this-page { + border-left: 2px solid #4E9A06; +} + +/************** blog **************/ + +#content .blog-post .title a:hover { + color: #4E9A06; +} + +/**************************** Comments *******************************/ + +#content .comments h3 { + color: #4E9A06; + border-bottom: 2px solid #4E9A06; +} + +.post_comment_box h4 { + background-color: #4E9A06; + color: #FFF; +} + +/************************** theme footer ***************************/ + +#footer-content a, +#footer-content a:hover, +#footer-content a:visited { + color: #4E9A06; +} diff --git a/public/designs/themes/chameleon/theme.yml b/public/designs/themes/chameleon/theme.yml new file mode 100644 index 0000000..fd0c583 --- /dev/null +++ b/public/designs/themes/chameleon/theme.yml @@ -0,0 +1,3 @@ +theme: "Chameleon theme" +layout: "application-ng" +icon_theme: [default, pidgin] diff --git a/public/designs/themes/chocolate/footer.rhtml b/public/designs/themes/chocolate/footer.rhtml new file mode 120000 index 0000000..18e6abd --- /dev/null +++ b/public/designs/themes/chocolate/footer.rhtml @@ -0,0 +1 @@ +../profile-base/footer.rhtml \ No newline at end of file diff --git a/public/designs/themes/chocolate/header.rhtml b/public/designs/themes/chocolate/header.rhtml new file mode 120000 index 0000000..ab83dcb --- /dev/null +++ b/public/designs/themes/chocolate/header.rhtml @@ -0,0 +1 @@ +../profile-base/header.rhtml \ No newline at end of file diff --git a/public/designs/themes/chocolate/site_title.rhtml b/public/designs/themes/chocolate/site_title.rhtml new file mode 120000 index 0000000..a13a89e --- /dev/null +++ b/public/designs/themes/chocolate/site_title.rhtml @@ -0,0 +1 @@ +../profile-base/site_title.rhtml \ No newline at end of file diff --git a/public/designs/themes/chocolate/style.css b/public/designs/themes/chocolate/style.css new file mode 100644 index 0000000..60ccbbe --- /dev/null +++ b/public/designs/themes/chocolate/style.css @@ -0,0 +1,78 @@ +@import url(../profile-base/style.css); + +/************************** user bar ***************************/ + +#user a, +#user a strong { + color: #8F5902; +} + +/************************** content ***************************/ + +#content .block-title, +#content .main-block h1, #not-found h1, #access-denied h1 { + border-bottom:2px solid #8F5902; + color: #8F5902; +} + +.profile-image-block p { + color: #8F5902; +} + +.block a { + color: #8F5902; +} + +.block a:visited { + color: #C17D11; +} + +.control-panel a, +.control-panel a:visited { + color: #000; +} + +.controller-profile_editor .control-panel a:hover { + background-color: #8F5902; + color: #FFF; +} + +#content .link-list-block li a:hover { + background-color: #8F5902; +} + +#content .link-list-block li a.link-this-page { + background-color: #C17D11; + border-right:2px solid #8F5902; +} + +.template-rightbar #content .link-list-block li a.link-this-page, +#content .box-3 .link-list-block li a.link-this-page { + border-left: 2px solid #8F5902; +} + +/************** blog **************/ + +#content .blog-post .title a:hover { + color: #8F5902; +} + +/**************************** Comments *******************************/ + +#content .comments h3 { + color: #8F5902; + border-bottom: 2px solid #8F5902; +} + +.post_comment_box h4 { + background-color: #8F5902; + color: #FFF; +} + +/************************** theme footer ***************************/ + +#footer-content a, +#footer-content a:hover, +#footer-content a:visited { + color: #8F5902; +} diff --git a/public/designs/themes/chocolate/theme.yml b/public/designs/themes/chocolate/theme.yml new file mode 100644 index 0000000..e9c5894 --- /dev/null +++ b/public/designs/themes/chocolate/theme.yml @@ -0,0 +1,3 @@ +theme: "Chocolate theme" +layout: "application-ng" +icon_theme: [default, pidgin] diff --git a/public/designs/themes/orange/footer.rhtml b/public/designs/themes/orange/footer.rhtml new file mode 120000 index 0000000..18e6abd --- /dev/null +++ b/public/designs/themes/orange/footer.rhtml @@ -0,0 +1 @@ +../profile-base/footer.rhtml \ No newline at end of file diff --git a/public/designs/themes/orange/header.rhtml b/public/designs/themes/orange/header.rhtml new file mode 120000 index 0000000..ab83dcb --- /dev/null +++ b/public/designs/themes/orange/header.rhtml @@ -0,0 +1 @@ +../profile-base/header.rhtml \ No newline at end of file diff --git a/public/designs/themes/orange/site_title.rhtml b/public/designs/themes/orange/site_title.rhtml new file mode 120000 index 0000000..a13a89e --- /dev/null +++ b/public/designs/themes/orange/site_title.rhtml @@ -0,0 +1 @@ +../profile-base/site_title.rhtml \ No newline at end of file diff --git a/public/designs/themes/orange/style.css b/public/designs/themes/orange/style.css new file mode 100644 index 0000000..0d2dd08 --- /dev/null +++ b/public/designs/themes/orange/style.css @@ -0,0 +1,78 @@ +@import url(../profile-base/style.css); + +/************************** user bar ***************************/ + +#user a, +#user a strong { + color: #CE5C00; +} + +/************************** content ***************************/ + +#content .block-title, +#content .main-block h1, #not-found h1, #access-denied h1 { + border-bottom:2px solid #CE5C00; + color: #CE5C00; +} + +.profile-image-block p { + color: #CE5C00; +} + +.block a { + color: #CE5C00; +} + +.block a:visited { + color: #F57900; +} + +.control-panel a, +.control-panel a:visited { + color: #000; +} + +.controller-profile_editor .control-panel a:hover { + background-color: #CE5C00; + color: #FFF; +} + +#content .link-list-block li a:hover { + background-color: #CE5C00; +} + +#content .link-list-block li a.link-this-page { + background-color: #F57900; + border-right:2px solid #CE5C00; +} + +.template-rightbar #content .link-list-block li a.link-this-page, +#content .box-3 .link-list-block li a.link-this-page { + border-left: 2px solid #CE5C00; +} + +/************** blog **************/ + +#content .blog-post .title a:hover { + color: #CE5C00; +} + +/**************************** Comments *******************************/ + +#content .comments h3 { + color: #CE5C00; + border-bottom: 2px solid #CE5C00; +} + +.post_comment_box h4 { + background-color: #CE5C00; + color: #FFF; +} + +/************************** theme footer ***************************/ + +#footer-content a, +#footer-content a:hover, +#footer-content a:visited { + color: #CE5C00; +} diff --git a/public/designs/themes/orange/theme.yml b/public/designs/themes/orange/theme.yml new file mode 100644 index 0000000..80adb93 --- /dev/null +++ b/public/designs/themes/orange/theme.yml @@ -0,0 +1,3 @@ +theme: "Orange Red theme" +layout: "application-ng" +icon_theme: [default, pidgin] diff --git a/public/designs/themes/plum/footer.rhtml b/public/designs/themes/plum/footer.rhtml new file mode 120000 index 0000000..18e6abd --- /dev/null +++ b/public/designs/themes/plum/footer.rhtml @@ -0,0 +1 @@ +../profile-base/footer.rhtml \ No newline at end of file diff --git a/public/designs/themes/plum/header.rhtml b/public/designs/themes/plum/header.rhtml new file mode 120000 index 0000000..ab83dcb --- /dev/null +++ b/public/designs/themes/plum/header.rhtml @@ -0,0 +1 @@ +../profile-base/header.rhtml \ No newline at end of file diff --git a/public/designs/themes/plum/site_title.rhtml b/public/designs/themes/plum/site_title.rhtml new file mode 120000 index 0000000..a13a89e --- /dev/null +++ b/public/designs/themes/plum/site_title.rhtml @@ -0,0 +1 @@ +../profile-base/site_title.rhtml \ No newline at end of file diff --git a/public/designs/themes/plum/style.css b/public/designs/themes/plum/style.css new file mode 100644 index 0000000..3468971 --- /dev/null +++ b/public/designs/themes/plum/style.css @@ -0,0 +1,78 @@ +@import url(../profile-base/style.css); + +/************************** user bar ***************************/ + +#user a, +#user a strong { + color: #5C3566; +} + +/************************** content ***************************/ + +#content .block-title, +#content .main-block h1, #not-found h1, #access-denied h1 { + border-bottom:2px solid #5C3566; + color: #5C3566; +} + +.profile-image-block p { + color: #5C3566; +} + +.block a { + color: #5C3566; +} + +.block a:visited { + color: #75507B; +} + +.control-panel a, +.control-panel a:visited { + color: #000; +} + +.controller-profile_editor .control-panel a:hover { + background-color: #5C3566; + color: #FFF; +} + +#content .link-list-block li a:hover { + background-color: #5C3566; +} + +#content .link-list-block li a.link-this-page { + background-color: #75507B; + border-right:2px solid #5C3566; +} + +.template-rightbar #content .link-list-block li a.link-this-page, +#content .box-3 .link-list-block li a.link-this-page { + border-left: 2px solid #5C3566; +} + +/************** blog **************/ + +#content .blog-post .title a:hover { + color: #5C3566; +} + +/**************************** Comments *******************************/ + +#content .comments h3 { + color: #5C3566; + border-bottom: 2px solid #5C3566; +} + +.post_comment_box h4 { + background-color: #5C3566; + color: #FFF; +} + +/************************** theme footer ***************************/ + +#footer-content a, +#footer-content a:hover, +#footer-content a:visited { + color: #5C3566; +} diff --git a/public/designs/themes/plum/theme.yml b/public/designs/themes/plum/theme.yml new file mode 100644 index 0000000..c71f4ec --- /dev/null +++ b/public/designs/themes/plum/theme.yml @@ -0,0 +1,3 @@ +theme: "Plum theme" +layout: "application-ng" +icon_theme: [default, pidgin] diff --git a/public/designs/themes/profile-base/footer.rhtml b/public/designs/themes/profile-base/footer.rhtml new file mode 100644 index 0000000..9218869 --- /dev/null +++ b/public/designs/themes/profile-base/footer.rhtml @@ -0,0 +1,3 @@ +
diff --git a/public/designs/themes/profile-base/header.rhtml b/public/designs/themes/profile-base/header.rhtml new file mode 100644 index 0000000..856bf3e --- /dev/null +++ b/public/designs/themes/profile-base/header.rhtml @@ -0,0 +1,18 @@ + + + diff --git a/public/designs/themes/profile-base/site_title.rhtml b/public/designs/themes/profile-base/site_title.rhtml new file mode 100644 index 0000000..ead1cf1 --- /dev/null +++ b/public/designs/themes/profile-base/site_title.rhtml @@ -0,0 +1,5 @@ +<% if File.exists?(File.join(Rails.root, 'public', "/designs/themes/#{environment.theme}/images/thin-logo.png")) %> + <%= link_to(image_tag("/designs/themes/#{environment.theme}/images/thin-logo.png"), environment.top_url) %> +<% else %> + <%= link_to(image_tag("/designs/themes/noosfero/images/thin-logo.png"), environment.top_url) %> +<% end %> diff --git a/public/designs/themes/profile-base/style.css b/public/designs/themes/profile-base/style.css new file mode 100644 index 0000000..77d903c --- /dev/null +++ b/public/designs/themes/profile-base/style.css @@ -0,0 +1,166 @@ +@import url(../base/style.css); + +head { + margin: 0px; + padding: 0px; +} + +body { + margin: 0px auto; + padding: 0px; +} + +#wrap-1 { + position: relative; +} + +#wrap-2 { + margin-top: -4px; + padding-bottom: 0px; +} + +#navigation, +#navigation-end { + display: none; +} + +#theme-header { + height: 30px; +} + +/************************** user bar ***************************/ + +#user { + top: -23px; + right: 0px; + height: 20px; +} + +/************************** navigation ***************************/ + +#navigation { + background: none; +} + +/************************** content ***************************/ + +#content { + margin-top: 0px; +} + +#boxes { + margin-top: 20px; +} + +#profile-header { + margin: -10px; + margin-bottom: 0px; + width: 958px; + max-width: none; + max-height: none; +} + +#profile-footer { + margin-left: -10px; + width: 958px; + max-width: none; +} + +.template-rightbar #content .link-list-block li a.link-this-page, +#content .box-3 .link-list-block li a.link-this-page { + border-right: none; + margin-left: -5px; + margin-right: 0px; + max-width: 170px; + -moz-border-radius: 0px 4px 4px 0px; + -webkit-border-radius: 0px 4px 4px 0px; +} + +/************** articles **************/ + +#content .blog-posts { + margin-top: 30px; +} + +#article .blog-feed-link { + position: absolute; + right: 0px; + top: 28px; +} + +#article-tags { + margin-right: 30px; +} + +#article-parent { + display: block; +} +/************** environment bar **************/ + +#site-title { + position: absolute; + left: 10px; + top: -27px; + height: 40px; + width: 264px; +} + +#site-title a { + display: block; + top: 0px; + left: 0px; + height: 20px; +} + +#assets-menu { + display: none; + position: absolute; + top: 26px; + left: 56px; + min-width: 140px; + z-index: 10; + border: 1px solid #D3D7CF; + border-top: none; + background: #EEE; + padding: 0px 4px 6px 4px; + -moz-border-radius: 0px 0px 10px 10px; + -webkit-border-radius: 0px 0px 10px 10px; + border-radius-bottomleft: 10px; + border-radius-bottomright: 10px; +} + +#assets-menu ul, +#assets-menu li { + margin: 0px; + padding: 0px; + list-style: none; +} + +#assets-menu a { + text-decoration: none; + display: block; + padding: 2px 4px 2px 8px; + color: #555; + border: 1px solid #EEE; +} + +#assets-menu a:hover { + background: #FBFBFB; + border: 1px solid #F6F6F6; + color: #000; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} + +/**************************** Comments *******************************/ + +.post_comment_box.closed h4 { + border: none; +} + +/************************** theme footer ***************************/ + +#footer-content { + text-align: right; +} diff --git a/public/designs/themes/profile-base/theme.yml b/public/designs/themes/profile-base/theme.yml new file mode 100644 index 0000000..0d14a1d --- /dev/null +++ b/public/designs/themes/profile-base/theme.yml @@ -0,0 +1,3 @@ +theme: "Noosfero base theme for profiles" +layout: "application-ng" +icon_theme: [default, pidgin] diff --git a/public/designs/themes/scarletred/footer.rhtml b/public/designs/themes/scarletred/footer.rhtml new file mode 120000 index 0000000..18e6abd --- /dev/null +++ b/public/designs/themes/scarletred/footer.rhtml @@ -0,0 +1 @@ +../profile-base/footer.rhtml \ No newline at end of file diff --git a/public/designs/themes/scarletred/header.rhtml b/public/designs/themes/scarletred/header.rhtml deleted file mode 100644 index 856bf3e..0000000 --- a/public/designs/themes/scarletred/header.rhtml +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/public/designs/themes/scarletred/header.rhtml b/public/designs/themes/scarletred/header.rhtml new file mode 120000 index 0000000..ab83dcb --- /dev/null +++ b/public/designs/themes/scarletred/header.rhtml @@ -0,0 +1 @@ +../profile-base/header.rhtml \ No newline at end of file diff --git a/public/designs/themes/scarletred/imgs/comment-owner-bg-L.png b/public/designs/themes/scarletred/imgs/comment-owner-bg-L.png deleted file mode 100644 index c81eb82..0000000 Binary files a/public/designs/themes/scarletred/imgs/comment-owner-bg-L.png and /dev/null differ diff --git a/public/designs/themes/scarletred/imgs/comment-owner-bg-N.png b/public/designs/themes/scarletred/imgs/comment-owner-bg-N.png deleted file mode 100644 index 611d014..0000000 Binary files a/public/designs/themes/scarletred/imgs/comment-owner-bg-N.png and /dev/null differ diff --git a/public/designs/themes/scarletred/imgs/comment-owner-bg-NL.png b/public/designs/themes/scarletred/imgs/comment-owner-bg-NL.png deleted file mode 100644 index 6e765d1..0000000 Binary files a/public/designs/themes/scarletred/imgs/comment-owner-bg-NL.png and /dev/null differ diff --git a/public/designs/themes/scarletred/imgs/comment-owner-bg-NO.png b/public/designs/themes/scarletred/imgs/comment-owner-bg-NO.png deleted file mode 100644 index df0415d..0000000 Binary files a/public/designs/themes/scarletred/imgs/comment-owner-bg-NO.png and /dev/null differ diff --git a/public/designs/themes/scarletred/imgs/comment-owner-bg-O.png b/public/designs/themes/scarletred/imgs/comment-owner-bg-O.png deleted file mode 100644 index 5cacb12..0000000 Binary files a/public/designs/themes/scarletred/imgs/comment-owner-bg-O.png and /dev/null differ diff --git a/public/designs/themes/scarletred/imgs/comment-owner-bg-S.png b/public/designs/themes/scarletred/imgs/comment-owner-bg-S.png deleted file mode 100644 index f3293fb..0000000 Binary files a/public/designs/themes/scarletred/imgs/comment-owner-bg-S.png and /dev/null differ diff --git a/public/designs/themes/scarletred/imgs/comment-owner-bg.png b/public/designs/themes/scarletred/imgs/comment-owner-bg.png deleted file mode 100644 index ccad53f..0000000 Binary files a/public/designs/themes/scarletred/imgs/comment-owner-bg.png and /dev/null differ diff --git a/public/designs/themes/scarletred/site_title.rhtml b/public/designs/themes/scarletred/site_title.rhtml deleted file mode 100644 index bbaf5f1..0000000 --- a/public/designs/themes/scarletred/site_title.rhtml +++ /dev/null @@ -1,5 +0,0 @@ -<% if File.exists?(File.join(Rails.root, 'public', "/designs/themes/#{environment.theme}/images/thin-logo.png")) %> - <%= link_to(image_tag("/designs/themes/#{environment.theme}/images/thin-logo.png"), environment.top_url) %> -<% else %> - <%= link_to(environment.name, environment.top_url) %> -<% end %> diff --git a/public/designs/themes/scarletred/site_title.rhtml b/public/designs/themes/scarletred/site_title.rhtml new file mode 120000 index 0000000..a13a89e --- /dev/null +++ b/public/designs/themes/scarletred/site_title.rhtml @@ -0,0 +1 @@ +../profile-base/site_title.rhtml \ No newline at end of file diff --git a/public/designs/themes/scarletred/style.css b/public/designs/themes/scarletred/style.css index 71a87ae..53ea569 100644 --- a/public/designs/themes/scarletred/style.css +++ b/public/designs/themes/scarletred/style.css @@ -1,76 +1,14 @@ -@import url(../base/style.css); - -head { - margin: 0px; - padding: 0px; -} - -body { - margin: 0px auto; - padding: 0px; -} - -#wrap-1 { - position: relative; -} - -#wrap-2 { - margin-top: -4px; - padding-bottom: 0px; -} - -#navigation, -#navigation-end { - display: none; -} - -#theme-header { - height: 30px; -} +@import url(../profile-base/style.css); /************************** user bar ***************************/ -#user { - top: -23px; - right: 0px; - height: 20px; -} - #user a, #user a strong { color: #A40000; } -/************************** navigation ***************************/ - -#navigation { - background: none; -} - /************************** content ***************************/ -#content { - margin-top: 0px; -} - -#boxes { - margin-top: 20px; -} - -#profile-header { - margin: -10px; - margin-bottom: 0px; - width: 958px; - max-width: none; - max-height: none; -} - -#profile-footer { - margin-left: -10px; - width: 958px; - max-width: none; -} - #content .block-title, #content .main-block h1, #not-found h1, #access-denied h1 { border-bottom:2px solid #A40000; @@ -111,100 +49,14 @@ body { .template-rightbar #content .link-list-block li a.link-this-page, #content .box-3 .link-list-block li a.link-this-page { border-left: 2px solid #A40000; - border-right: none; - margin-left: -5px; - margin-right: 0px; - max-width: 170px; - -moz-border-radius-bottomleft: 0; - -moz-border-radius-topleft: 0; - -moz-border-radius-bottomright: 4px; - -moz-border-radius-topright: 4px; - -webkit-border-radius-bottomleft: 0; - -webkit-border-radius-topleft: 0; - -webkit-border-radius-bottomright: 4px; - -webkit-border-radius-topright: 4px; } /************** blog **************/ -#content .blog-posts { - margin-top: 30px; -} - #content .blog-post .title a:hover { color: #A40000; } -#article .blog-feed-link { - position: absolute; - right: 0px; - top: 28px; -} - -#article-tags { - margin-right: 30px; -} - -/************** environment bar **************/ - -#site-title { - position: absolute; - left: 10px; - top: -27px; - height: 40px; - width: 264px; -} - -#site-title a { - display: block; - top: 0px; - left: 0px; - height: 20px; -} - -#assets-menu { - display: none; - position: absolute; - top: 26px; - left: 56px; - min-width: 140px; - z-index: 10; - border: 1px solid #D3D7CF; - border-top: none; - background: #EEE; - padding: 0px 4px 6px 4px; - -moz-border-radius-bottomleft: 10px; - -moz-border-radius-bottomright: 10px; - -webkit-border-radius-bottomleft: 10px; - -webkit-border-radius-bottomright: 10px; - border-radius-bottomleft: 10px; - border-radius-bottomright: 10px; -} - -#assets-menu ul, -#assets-menu li { - margin: 0px; - padding: 0px; - list-style: none; -} - -#assets-menu a { - text-decoration: none; - display: block; - padding: 2px 4px 2px 8px; - color: #555; - border: 1px solid #EEE; -} - -#assets-menu a:hover { - background: #FBFBFB; - border: 1px solid #F6F6F6; - color: #000; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; -} - /**************************** Comments *******************************/ #content .comments h3 { @@ -217,6 +69,10 @@ body { color: #FFF; } -.post_comment_box.closed h4 { - border: none; +/************************** theme footer ***************************/ + +#footer-content a, +#footer-content a:hover, +#footer-content a:visited { + color: #A40000; } diff --git a/public/designs/themes/skyblue/footer.rhtml b/public/designs/themes/skyblue/footer.rhtml new file mode 120000 index 0000000..18e6abd --- /dev/null +++ b/public/designs/themes/skyblue/footer.rhtml @@ -0,0 +1 @@ +../profile-base/footer.rhtml \ No newline at end of file diff --git a/public/designs/themes/skyblue/header.rhtml b/public/designs/themes/skyblue/header.rhtml new file mode 120000 index 0000000..ab83dcb --- /dev/null +++ b/public/designs/themes/skyblue/header.rhtml @@ -0,0 +1 @@ +../profile-base/header.rhtml \ No newline at end of file diff --git a/public/designs/themes/skyblue/site_title.rhtml b/public/designs/themes/skyblue/site_title.rhtml new file mode 120000 index 0000000..a13a89e --- /dev/null +++ b/public/designs/themes/skyblue/site_title.rhtml @@ -0,0 +1 @@ +../profile-base/site_title.rhtml \ No newline at end of file diff --git a/public/designs/themes/skyblue/style.css b/public/designs/themes/skyblue/style.css new file mode 100644 index 0000000..32f63da --- /dev/null +++ b/public/designs/themes/skyblue/style.css @@ -0,0 +1,78 @@ +@import url(../profile-base/style.css); + +/************************** user bar ***************************/ + +#user a, +#user a strong { + color: #204A87; +} + +/************************** content ***************************/ + +#content .block-title, +#content .main-block h1, #not-found h1, #access-denied h1 { + border-bottom:2px solid #204A87; + color: #204A87; +} + +.profile-image-block p { + color: #204A87; +} + +.block a { + color: #204A87; +} + +.block a:visited { + color: #3465A4; +} + +.control-panel a, +.control-panel a:visited { + color: #000; +} + +.controller-profile_editor .control-panel a:hover { + background-color: #204A87; + color: #FFF; +} + +#content .link-list-block li a:hover { + background-color: #204A87; +} + +#content .link-list-block li a.link-this-page { + background-color: #3465A4; + border-right:2px solid #204A87; +} + +.template-rightbar #content .link-list-block li a.link-this-page, +#content .box-3 .link-list-block li a.link-this-page { + border-left: 2px solid #204A87; +} + +/************** blog **************/ + +#content .blog-post .title a:hover { + color: #204A87; +} + +/**************************** Comments *******************************/ + +#content .comments h3 { + color: #204A87; + border-bottom: 2px solid #204A87; +} + +.post_comment_box h4 { + background-color: #204A87; + color: #FFF; +} + +/************************** theme footer ***************************/ + +#footer-content a, +#footer-content a:hover, +#footer-content a:visited { + color: #204A87; +} diff --git a/public/designs/themes/skyblue/theme.yml b/public/designs/themes/skyblue/theme.yml new file mode 100644 index 0000000..74e33a3 --- /dev/null +++ b/public/designs/themes/skyblue/theme.yml @@ -0,0 +1,3 @@ +theme: "Skyblue theme" +layout: "application-ng" +icon_theme: [default, pidgin] -- libgit2 0.21.2