[noosfero/noosfero][next] 4 commits: Fix invalid stylesheets
Bráulio Bhavamitra
gitlab at gitlab.com
Fri Apr 10 10:00:17 BRT 2015
Bráulio Bhavamitra pushed to next at Noosfero / noosfero
Commits:
074c6c08 by Braulio Bhavamitra at 2015-04-10T09:30:26Z
Fix invalid stylesheets
- - - - -
41803288 by Braulio Bhavamitra at 2015-04-10T09:59:47Z
Enable asset pipeline
- - - - -
1ffc0d1b by Braulio Bhavamitra at 2015-04-10T09:59:52Z
pjax: fix use with asset pipeline
- - - - -
d31ddc20 by Braulio Bhavamitra at 2015-04-10T09:59:53Z
schema.rb: update
- - - - -
29 changed files:
- Gemfile
- + app/assets/designs/icons
- + app/assets/designs/themes
- + app/assets/images
- + app/assets/javascripts
- + app/assets/plugins
- + app/assets/stylesheets
- app/helpers/application_helper.rb
- app/helpers/layout_helper.rb
- app/helpers/macros_helper.rb
- app/views/layouts/_javascript.html.erb
- app/views/layouts/application.html.erb
- + app/views/layouts/chat.html.erb
- app/views/layouts/slideshow.html.erb
- config/application.rb
- config/environments/production.rb
- config/routes.rb
- db/schema.rb
- gitignore.example
- lib/noosfero/plugin.rb
- plugins/pjax/public/javascripts/pjax.js
- plugins/pjax/views/layouts/pjax.html.erb
- public/javascripts/application.js
- public/javascripts/codepress/languages/asp.css
- public/javascripts/codepress/languages/vbscript.css
- − public/javascripts/jquery-ui-1.10.4/development-bundle/themes/base/minified/jquery.ui.theme.min.css
- public/stylesheets/application.css
- public/stylesheets/search.css
- test/unit/application_helper_test.rb
Changes:
=====================================
Gemfile
=====================================
--- a/Gemfile
+++ b/Gemfile
@@ -20,6 +20,11 @@ gem 'locale', '~> 2.0.5'
gem 'whenever', :require => false
gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
+group :assets do
+ gem 'uglifier', '>= 1.0.3'
+ gem 'sass-rails'
+end
+
group :production do
gem 'dalli', '~> 2.7.0'
end
=====================================
app/assets/designs/icons
=====================================
--- /dev/null
+++ b/app/assets/designs/icons
@@ -0,0 +1 @@
+../../../public/designs/icons
\ No newline at end of file
=====================================
app/assets/designs/themes
=====================================
--- /dev/null
+++ b/app/assets/designs/themes
@@ -0,0 +1 @@
+../../../public/designs/themes
\ No newline at end of file
=====================================
app/assets/images
=====================================
--- /dev/null
+++ b/app/assets/images
@@ -0,0 +1 @@
+../../public/images
\ No newline at end of file
=====================================
app/assets/javascripts
=====================================
--- /dev/null
+++ b/app/assets/javascripts
@@ -0,0 +1 @@
+../../public/javascripts
\ No newline at end of file
=====================================
app/assets/plugins
=====================================
--- /dev/null
+++ b/app/assets/plugins
@@ -0,0 +1 @@
+../../public/plugins
\ No newline at end of file
=====================================
app/assets/stylesheets
=====================================
--- /dev/null
+++ b/app/assets/stylesheets
@@ -0,0 +1 @@
+../../public/stylesheets
\ No newline at end of file
=====================================
app/helpers/application_helper.rb
=====================================
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -919,18 +919,6 @@ module ApplicationHelper
end
end
- def icon_theme_stylesheet_path
- icon_themes = []
- theme_icon_themes = theme_option(:icon_theme) || []
- for icon_theme in theme_icon_themes do
- theme_path = "/designs/icons/#{icon_theme}/style.css"
- if File.exists?(Rails.root.join('public', theme_path[1..-1]))
- icon_themes << theme_path
- end
- end
- icon_themes
- end
-
def page_title
CGI.escapeHTML(
(@page ? @page.title + ' - ' : '') +
=====================================
app/helpers/layout_helper.rb
=====================================
--- a/app/helpers/layout_helper.rb
+++ b/app/helpers/layout_helper.rb
@@ -28,12 +28,12 @@ module LayoutHelper
end
def noosfero_javascript
- plugins_javascripts = @plugins.map { |plugin| [plugin.js_files].flatten.map { |js| plugin.class.public_path(js) } }.flatten
+ plugins_javascripts = @plugins.map { |plugin| [plugin.js_files].flatten.map { |js| plugin.class.public_path(js, true) } }.flatten
output = ''
output += render 'layouts/javascript'
unless plugins_javascripts.empty?
- output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
+ output += javascript_include_tag *plugins_javascripts
end
output += theme_javascript_ng.to_s
output += javascript_tag 'render_all_jquery_ui_widgets()'
@@ -42,16 +42,6 @@ module LayoutHelper
end
def noosfero_stylesheets
- standard_stylesheets = [
- 'application',
- 'search',
- 'colorbox',
- 'selectordie',
- 'inputosaurus',
- 'chat',
- 'selectordie-theme',
- pngfix_stylesheet_path,
- ] + tokeninput_stylesheets
plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin|
plugin.class.public_path('style.css')
}
@@ -59,13 +49,13 @@ module LayoutHelper
global_css_at_fs = Rails.root.join 'public' + global_css_pub
output = []
- output << stylesheet_link_tag(standard_stylesheets, :cache => 'cache/application')
+ output << stylesheet_link_tag('application')
output << stylesheet_link_tag(template_stylesheet_path)
- output << stylesheet_link_tag(icon_theme_stylesheet_path)
+ output << stylesheet_link_tag(*icon_theme_stylesheet_path)
output << stylesheet_link_tag(jquery_ui_theme_stylesheet_path)
unless plugins_stylesheets.empty?
cacheid = "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}"
- output << stylesheet_link_tag(plugins_stylesheets, :cache => cacheid)
+ output << stylesheet_link_tag(*plugins_stylesheets, cache: cacheid)
end
if File.exists? global_css_at_fs
output << stylesheet_link_tag(global_css_pub)
@@ -74,14 +64,6 @@ module LayoutHelper
output.join "\n"
end
- def pngfix_stylesheet_path
- 'iepngfix/iepngfix.css' #TODO: deprecate it
- end
-
- def tokeninput_stylesheets
- ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet']
- end
-
def noosfero_layout_features
render :file => 'shared/noosfero_layout_features'
end
@@ -99,7 +81,7 @@ module LayoutHelper
icon_themes = []
theme_icon_themes = theme_option(:icon_theme) || []
for icon_theme in theme_icon_themes do
- theme_path = "/designs/icons/#{icon_theme}/style.css"
+ theme_path = "designs/icons/#{icon_theme}/style.css"
if File.exists?(Rails.root.join('public', theme_path))
icon_themes << theme_path
end
@@ -112,7 +94,7 @@ module LayoutHelper
end
def theme_stylesheet_path
- theme_path + '/style.css'
+ "/assets#{theme_path}/style.css"
end
def layout_template
=====================================
app/helpers/macros_helper.rb
=====================================
--- a/app/helpers/macros_helper.rb
+++ b/app/helpers/macros_helper.rb
@@ -42,7 +42,9 @@ module MacrosHelper
[macro.configuration[:js_files]].flatten.map { |js| plugins_javascripts << macro.plugin.public_path(js) }
end
end
- javascript_include_tag(plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty?
+ unless plugins_javascripts.empty?
+ javascript_include_tag *plugins_javascripts
+ end
end
def macro_css_files
=====================================
app/views/layouts/_javascript.html.erb
=====================================
--- a/app/views/layouts/_javascript.html.erb
+++ b/app/views/layouts/_javascript.html.erb
@@ -1,12 +1,4 @@
-<%= javascript_include_tag 'jquery-2.1.1.min', 'jquery-migrate-1.2.1', 'jrails', 'rails.js',
- 'jquery.cycle.all.min.js', 'jquery.colorbox-min.js',
- 'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
- 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput', 'jquery.typewatch', 'jquery.textchange',
- 'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'inputosaurus.js', 'select-or-die/_src/selectordie',
- # noosfero libraries
- 'application.js', 'modal.js',
- 'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow',
- :cache => 'cache/application' %>
+<%= javascript_include_tag 'application.js' %>
<% language = FastGettext.locale %>
<% %w{messages methods}.each do |type| %>
=====================================
app/views/layouts/application.html.erb
=====================================
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -21,7 +21,7 @@
import_controller_stylesheets(:themed_source => true)
%>
<%= stylesheet_link_tag template_stylesheet_path %>
- <%= stylesheet_link_tag icon_theme_stylesheet_path %>
+ <%= stylesheet_link_tag *icon_theme_stylesheet_path %>
<%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
<%# Add custom tags/styles/etc via content_for %>
=====================================
app/views/layouts/chat.html.erb
=====================================
--- /dev/null
+++ b/app/views/layouts/chat.html.erb
@@ -0,0 +1,64 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
+ <head>
+ <title><%= h page_title %></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta name="description" content="<%= @environment.name %>" />
+ <link rel="shortcut icon" href="<%= image_path(theme_favicon) %>" type="image/x-icon" />
+ <%= noosfero_javascript %>
+ <%= javascript_include_tag 'jquery.scrollabletab', 'strophejs-1.0.1/strophe', 'jquery.emoticon', '../designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat' %>
+ <%= noosfero_stylesheets %>
+ <%= stylesheet_link_tag *icon_theme_stylesheet_path %>
+ <%= stylesheet_link_tag theme_stylesheet_path %>
+ <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
+ <script type='text/javascript'>
+ var $presence_status_label = {
+ chat: '<%= _('Online') %>',
+ dnd: '<%= _('Busy') %>',
+ '': '<%= _('Offline') %>'
+ };
+ var $own_name = '<%= user.name %>';
+ var $starting_chat_notice = '<%= _("starting chat with %{name}") %>';
+ var $muc_domain = '<%= "conference.#{environment.default_hostname}" %>';
+ var $user_unavailable_error = '<%= _("<strong>ooops!</strong> The message could not be sent because the user is not online") %>';
+ var $update_presence_status_every = <%= User.expires_chat_status_every.minutes %>;
+ var $balloon_template = '<div data-who="%{who}" class="message %{who}"><img class="avatar" src="%{avatar_url}"/><% comment_balloon do %><h5 class="%{who}-name">%{name}</h5><span class="time">%{time}</span><p>%{message}</p><% end %></div>';
+ </script>
+ </head>
+ <body id='chat'>
+ <div id='title-bar'>
+ <h1 class='title'><%= _("%s - Friends online (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1>
+ </div>
+ <div id='buddy-list'>
+ <div id='environment-logo'>
+ <%= image_tag "#{theme_path}/images/thin-logo.png", :title => environment.name, :alt => environment.name %>
+ </div>
+ <div class='toolbar'>
+ <div id='user-status'><%= user_status_menu('icon-menu-offline', _('Offline')) %></div>
+ <div class='dialog-error' style='display: none'></div>
+ </div>
+ <ul class='buddy-list'>
+ <!-- <li class='offline'><a id='%{jid_id}' class='icon-menu-offline-11' href='#'>%{name}</a></li> -->
+ </ul>
+ </div>
+ <div id='chat-window' class='tabs-bottom'>
+ <div id='tabs'>
+ <ul>
+ <!-- <li class="tab"><a href="#{href}">#{label}</a></li> -->
+ </ul>
+ </div>
+ <!--
+ <div id='#conversation-%{jid_id}' class='conversation'>
+ <div class='history'>
+ <div class='message %{who}'><img class='avatar' src='%{avatar_url}' /><h5 class='%{who}-info'>%{name}</h5><span class='time'>%{time}</span><p>%{message}</p></div>
+ </div>
+ <div class='input-div'>
+ <div class='icon-chat'></div>
+ <textarea type='textarea' data-to='%{jid}'></textarea>
+ </div>
+ </div>
+ -->
+ </div>
+ <%= yield %>
+ </body>
+</html>
=====================================
app/views/layouts/slideshow.html.erb
=====================================
--- a/app/views/layouts/slideshow.html.erb
+++ b/app/views/layouts/slideshow.html.erb
@@ -11,7 +11,7 @@
%></title>
<%= stylesheet_import "slideshow" %>
- <%= javascript_include_tag 'jquery-2.1.1.min', 'sliderjs', 'pikachoose', :cache => 'cache/slideshow' %>
+ <%= javascript_include_tag 'jquery-2.1.1.min', 'sliderjs', 'pikachoose' %>
<script type="text/javascript">
$(document).ready(function (){
$("#slideshow").PikaChoose({
=====================================
config/application.rb
=====================================
--- a/config/application.rb
+++ b/config/application.rb
@@ -88,11 +88,25 @@ module Noosfero
config.active_record.whitelist_attributes = true
# Enable the asset pipeline
- config.assets.enabled = false
+ config.assets.enabled = true
+
+ # don't let rails prepend app/assets to config.assets.paths
+ # as we are doing it
+ config.paths['app/assets'] = ''
+
+ config.assets.paths =
+ Dir.glob("app/assets/plugins/*/{,stylesheets,javascripts}") +
+ Dir.glob("app/assets/{,stylesheets,javascripts}") +
+ # no precedence over core
+ Dir.glob("app/assets/designs/{icons,themes,user_themes}/*")
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
+ config.sass.preferred_syntax = :scss
+ config.sass.cache = true
+ config.sass.line_comments = false
+
def noosfero_session_secret
require 'fileutils'
target_dir = File.join(File.dirname(__FILE__), '../tmp')
=====================================
config/environments/production.rb
=====================================
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -14,12 +14,19 @@ Noosfero::Application.configure do
# Compress JavaScripts and CSS
config.assets.compress = true
- # Don't fallback to assets pipeline if a precompiled asset is missed
- config.assets.compile = false
-
# Generate digests for assets URLs
config.assets.digest = true
+ # pre-compile every asset
+ config.assets.precompile = Dir.glob("app/assets/**/*").map do |file|
+ next unless File.exists?(file) and File.file?(file)
+ File.basename file
+ end.compact
+
+ # fallback to assets pipeline if a precompiled asset is missed
+ config.assets.digest = true
+ config.assets.cache_store = :assets_live_compile_store
+
# Defaults to nil and saved in location specified by config.assets.prefix
# config.assets.manifest = YOUR_PATH
=====================================
config/routes.rb
=====================================
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -52,7 +52,6 @@ Noosfero::Application.routes.draw do
# categories index
match 'cat/*category_path' => 'search#category_index', :as => :category
- match 'assets/:asset(/*category_path)' => 'search#assets', :as => :assets
# search
match 'search(/:action(/*category_path))', :controller => 'search'
=====================================
db/schema.rb
=====================================
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150223180806) do
+ActiveRecord::Schema.define(:version => 20150408231524) do
create_table "abuse_reports", :force => true do |t|
t.integer "reporter_id"
@@ -263,6 +263,7 @@ ActiveRecord::Schema.define(:version => 20150223180806) do
t.string "source_type"
t.string "user_agent"
t.string "referrer"
+ t.text "settings"
end
add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
=====================================
gitignore.example
=====================================
--- a/gitignore.example
+++ b/gitignore.example
@@ -22,8 +22,12 @@ public/user_themes
public/designs/themes/default
public/designs/themes/*
public/designs/icons/default
+
+public/assets
+.sass-cache
public/javascripts/cache*
public/stylesheets/cache*
+
public/plugins
db/development.db
db/production.db
=====================================
lib/noosfero/plugin.rb
=====================================
--- a/lib/noosfero/plugin.rb
+++ b/lib/noosfero/plugin.rb
@@ -150,8 +150,8 @@ class Noosfero::Plugin
self.name.underscore.gsub('_plugin','')
end
- def public_path(file = '')
- File.join('/plugins', public_name, file)
+ def public_path file = '', relative=false
+ File.join "#{if relative then '' else '/' end}plugins", public_name, file
end
def root_path
=====================================
plugins/pjax/public/javascripts/pjax.js
=====================================
--- a/plugins/pjax/public/javascripts/pjax.js
+++ b/plugins/pjax/public/javascripts/pjax.js
@@ -8,7 +8,7 @@ pjax = {
themes: {},
load: function() {
- var target = jQuery('#content');
+ var target = jQuery('#wrap-1');
var content = jQuery('#content-inner');
var loadingTarget = jQuery('#content');
@@ -52,7 +52,7 @@ pjax = {
from_state = this.current_state || this.initial_state;
if (state.layout_template != from_state.layout_template) {
- var lt_css = jQuery('head link[href^="/designs/templates"]');
+ var lt_css = jQuery('head link[href*="designs/templates"]');
lt_css.attr('href', lt_css.attr('href').replace(/templates\/.+\/stylesheets/, 'templates/'+state.layout_template+'/stylesheets'));
}
@@ -78,7 +78,7 @@ pjax = {
return !pjax.css_loaded('/designs/themes/'+state.theme.id+'/style.css');
});
- var css = jQuery('head link[href^="/designs/themes/'+from_state.theme.id+'/style"]');
+ var css = jQuery('head link[href*="designs/themes/'+from_state.theme.id+'/style"]');
css.attr('href', css.attr('href').replace(/themes\/.+\/style/, 'themes/'+state.theme.id+'/style'));
jQuery('head link[rel="shortcut icon"]').attr('href', state.theme.favicon);
@@ -88,7 +88,7 @@ pjax = {
jQuery('#navigation ul').html(state.theme.extra_navigation);
jQuery('#theme-footer').html(state.theme.footer);
- jQuery('head script[src^="/designs/themes/'+from_state.theme.id+'/theme.js"]').remove();
+ jQuery('head script[src*="designs/themes/'+from_state.theme.id+'/theme.js"]').remove();
if (state.theme.js_src) {
var script = document.createElement('script');
script.type = 'text/javascript', script.src = state.theme.js_src;
=====================================
plugins/pjax/views/layouts/pjax.html.erb
=====================================
--- a/plugins/pjax/views/layouts/pjax.html.erb
+++ b/plugins/pjax/views/layouts/pjax.html.erb
@@ -1,10 +1,10 @@
<%
- update_js = render(:file => "#{Rails.root}/public/designs/themes/#{current_theme}/pjax_update.js.erb").to_json rescue nil
+ update_js = render(file: "#{Rails.root}/public/designs/themes/#{current_theme}/pjax_update.js.erb").to_json rescue nil
%>
<title><%= h page_title %></title>
-<%= render :file => "#{Rails.root}/public/designs/themes/#{current_theme}/layouts/_content.html.erb" rescue
+<%= render file: "#{Rails.root}/public/designs/themes/#{current_theme}/layouts/_content.html.erb" rescue
render "layouts/content" %>
<%= javascript_tag do %>
=====================================
public/javascripts/application.js
=====================================
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1,5 +1,33 @@
// Place your application-specific JavaScript functions and classes here
// This file is automatically included by javascript_include_tag :defaults
+/*
+* third party libraries
+*= require jquery-2.1.1.min.js
+*= require jquery-migrate-1.2.1.js
+*= require jquery.cycle.all.min.js
+*= require jquery.colorbox-min.js
+*= require jquery-ui-1.10.4/js/jquery-ui-1.10.4.min.js
+*= require jquery.scrollTo.js
+*= require jquery.form.js
+*= require jquery-validation/jquery.validate.js
+*= require jquery.cookie.js
+*= require jquery.ba-bbq.min.js
+*= require jquery.tokeninput.js
+*= require jquery-timepicker-addon/dist/jquery-ui-timepicker-addon.js
+*= require inputosaurus.js
+*= require reflection.js
+*= require rails.js
+*= require jrails.js
+* noosfero libraries
+*= require_self
+*= require modal.js
+* views speficics
+*= require add-and-join.js
+*= require report-abuse.js
+*= require manage-products.js
+*= require catalog.js
+*= require autogrow.js
+*/
// scope for noosfero stuff
noosfero = {
=====================================
public/javascripts/codepress/languages/asp.css
=====================================
--- a/public/javascripts/codepress/languages/asp.css
+++ b/public/javascripts/codepress/languages/asp.css
@@ -6,7 +6,7 @@
b {
color:#000080;
-}
+}
/* comments */
big, big b, big em, big ins, big s, strong i, strong i b, strong i s, strong i u, strong i a, strong i a u, strong i s u {
color:gray;
@@ -17,12 +17,12 @@ strong dfn, strong dfn a,strong dfn var, strong dfn a u, strong dfn u{
color:gray;
font-weight:normal;
}
- /* attributes */
+ /* attributes */
s, s b, span s u, span s cite, strong span s {
color:#5656fa ;
font-weight:normal;
}
- /* strings */
+ /* strings */
strong s,strong s b, strong s u, strong s cite {
color:#009900;
font-weight:normal;
@@ -34,7 +34,6 @@ strong ins{
/* Syntax */
strong a, strong a u {
color:#0000FF;
- font-weight:;
}
/* Native Keywords */
strong u {
@@ -58,7 +57,7 @@ em {
color:#800080;
font-style:normal;
}
- /* script */
+ /* script */
ins {
color:#800000;
font-weight:bold;
@@ -68,4 +67,4 @@ ins {
cite, s cite {
color:red;
font-weight:bold;
-}
\ No newline at end of file
+}
=====================================
public/javascripts/codepress/languages/vbscript.css
=====================================
--- a/public/javascripts/codepress/languages/vbscript.css
+++ b/public/javascripts/codepress/languages/vbscript.css
@@ -1,12 +1,12 @@
/*
- * CodePress color styles for ASP-VB syntax highlighting
+ * CodePress color styles for ASP-VB syntax highlighting
* By Martin D. Kirk
*/
/* tags */
b {
color:#000080;
-}
+}
/* comments */
big, big b, big em, big ins, big s, strong i, strong i b, strong i s, strong i u, strong i a, strong i a u, strong i s u {
color:gray;
@@ -17,12 +17,12 @@ strong dfn, strong dfn a,strong dfn var, strong dfn a u, strong dfn u{
color:gray;
font-weight:normal;
}
- /* attributes */
+ /* attributes */
s, s b, span s u, span s cite, strong span s {
color:#5656fa ;
font-weight:normal;
}
- /* strings */
+ /* strings */
strong s,strong s b, strong s u, strong s cite {
color:#009900;
font-weight:normal;
@@ -34,7 +34,6 @@ strong ins{
/* Syntax */
strong a, strong a u {
color:#0000FF;
- font-weight:;
}
/* Native Keywords */
strong u {
@@ -58,7 +57,7 @@ em {
color:#800080;
font-style:normal;
}
- /* script */
+ /* script */
ins {
color:#800000;
font-weight:bold;
@@ -68,4 +67,4 @@ ins {
cite, s cite {
color:red;
font-weight:bold;
-}
\ No newline at end of file
+}
=====================================
public/javascripts/jquery-ui-1.10.4/development-bundle/themes/base/minified/jquery.ui.theme.min.css deleted
=====================================
--- a/public/javascripts/jquery-ui-1.10.4/development-bundle/themes/base/minified/jquery.ui.theme.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery UI - v1.10.4 - 2014-04-02
-* http://jqueryui.com
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-undefined
\ No newline at end of file
=====================================
public/stylesheets/application.css
=====================================
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1,3 +1,21 @@
+/*
+ * thidparty libraries
+ *= require colorbox
+ *= require selectordie
+ *= require selectordie-theme
+ *= require inputosaurus
+ *= require token-input
+ *= require token-input-facebook
+ *= require token-input-mac
+ *= require token-input-facet
+ * noosfero libraries
+ *= require_self
+ *= require iepngfix/iepngfix
+ * views specifics
+ *= require chat
+ *= require search
+ */
+
/* browser fixes */
img:-moz-broken {
@@ -4414,7 +4432,8 @@ h1#agenda-title {
#groups-list li {
display: block;
list-style: none;
- margin-bottom: 20px background-color: #B8CFE7;
+ margin-bottom: 20px;
+ background-color: #B8CFE7;
}
#groups-list li .vcard {
@@ -6919,8 +6938,8 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
}
.fetching-overlay {
- position: absolute;
- top: 0px;
+ position: absolute;
+ top: 0px;
left: 0px;
right: 0px;
bottom: 0px;
=====================================
public/stylesheets/search.css
=====================================
--- a/public/stylesheets/search.css
+++ b/public/stylesheets/search.css
@@ -563,7 +563,8 @@ li.search-product-item {
}
li.search-product-item {
display:block;
- float:none overflow:visible;
+ float:none;
+ overflow:visible;
padding:10px 0;
margin:10px 0;
border-bottom:1px solid #ccc;
=====================================
test/unit/application_helper_test.rb
=====================================
--- a/test/unit/application_helper_test.rb
+++ b/test/unit/application_helper_test.rb
@@ -463,13 +463,13 @@ class ApplicationHelperTest < ActionView::TestCase
should 'base theme uses default icon theme' do
stubs(:current_theme).returns('base')
- assert_equal "/designs/icons/default/style.css", icon_theme_stylesheet_path.first
+ assert_equal "designs/icons/default/style.css", icon_theme_stylesheet_path.first
end
should 'base theme uses config to specify more then an icon theme' do
stubs(:current_theme).returns('base')
- assert_includes icon_theme_stylesheet_path, "/designs/icons/default/style.css"
- assert_includes icon_theme_stylesheet_path, "/designs/icons/pidgin/style.css"
+ assert_includes icon_theme_stylesheet_path, "designs/icons/default/style.css"
+ assert_includes icon_theme_stylesheet_path, "designs/icons/pidgin/style.css"
end
should 'not display active field if only required' do
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/fbb18e91844763fce1f2107ad1eb76d253bbb4d5...d31ddc20206d1bdb2842a2444f093c085355571e
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150410/01fb1966/attachment-0001.html>
More information about the Noosfero-dev
mailing list