From 07dcf5e6c032f0f9901d8b46d743390bb698eb68 Mon Sep 17 00:00:00 2001
From: Marcela Ribeiro de Oliveira <mro15@inf.ufpr.br>
Date: Thu, 8 Oct 2015 10:31:29 -0300
Subject: [PATCH] Add color constrast
---
Gemfile | 2 +-
Gemfile.lock | 2 --
app/assets/javascripts/application/accessibility.js | 4 +++-
app/assets/stylesheets/application.scss | 4 ++++
app/views/collections/index.html.erb | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Gemfile b/Gemfile
index d95a4f75..19a2fa6f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.0'
# Use postgresql as the database for Active Record
-gem 'pg'
+#gem 'pg'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
diff --git a/Gemfile.lock b/Gemfile.lock
index 765382ed..29f636de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -214,7 +214,6 @@ GEM
mimemagic (= 0.3.0)
parser (2.2.2.6)
ast (>= 1.1, < 3.0)
- pg (0.18.3)
procto (0.0.2)
puma (2.14.0)
rack (1.6.4)
@@ -391,7 +390,6 @@ DEPENDENCIES
mina
orientdb4r
paperclip
- pg
puma
rack-cors
rack-mini-profiler
diff --git a/app/assets/javascripts/application/accessibility.js b/app/assets/javascripts/application/accessibility.js
index a5a8557a..52f6b75f 100644
--- a/app/assets/javascripts/application/accessibility.js
+++ b/app/assets/javascripts/application/accessibility.js
@@ -66,7 +66,8 @@ var contrast = function() {
if (contrast_c == null || contrast_c != "true") {
$(contrast_elements).removeClass('contraste');
$('.search-bar').css('border-top','none');
- $('#menu-bar').removeClass('menu-bar-contrast');
+ $('#menu-bar').removeClass('menu-bar-contrast');0
+ $('.navbar-header').removeClass('set-Colecao');
var $select = $('select.select-tag-container').select2();
$select.data('select2').$container.removeClass("selec");
@@ -113,6 +114,7 @@ var contrast = function() {
$(contrast_elements).addClass('contraste');
$('.search-bar').css('border-top','2px solid white');
$('#menu-bar').addClass('menu-bar-contrast');
+ $('.navbar-header').addClass('set-Colecao');
//contraste select2(menu esquerda)
var $select = $('.select-tag-container').select2();
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 6a77ac88..d5c9dd2f 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -389,3 +389,7 @@ table.tipo1 p{ font-size: 15px; font-weight: bold; }
.fundo{
background: black;
}
+
+.set-Colecao{
+ color: black;
+}
diff --git a/app/views/collections/index.html.erb b/app/views/collections/index.html.erb
index 17a6fc78..0cefac7b 100644
--- a/app/views/collections/index.html.erb
+++ b/app/views/collections/index.html.erb
@@ -242,4 +242,4 @@
</div>
</div>
</div>
-<% end %>
\ No newline at end of file
+<% end %>
--
GitLab