Skip to content
Snippets Groups Projects
Commit 10866bf0 authored by Bruno Nocera Zanette's avatar Bruno Nocera Zanette
Browse files

Merge branch 'master' into generate-thumbnails 

Conflicts:
	app/repositories/orient_db/learning_object_repository.rb
	config/routes.rb
parents 534db87f 9809dc81
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 591 additions and 170 deletions
Gemfile
+ 6
− 0
View file @ 10866bf0
......@@ -81,6 +81,7 @@ gem 'rubycritic', require: false
# docs
gem 'rdoc'
gem 'stackprof'
group :development, :test do
# profiler
......@@ -100,6 +101,11 @@ group :development, :test do
gem 'spring'
gem 'sqlite3'
#JavaScript runtime
gem 'execjs'
gem 'therubyracer'
end
group :test do
......
Gemfile.lock 0 → 100644
+ 351
− 0
View file @ 10866bf0
GEM
remote: https://rubygems.org/
specs:
abstract_type (0.0.7)
actionmailer (4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.0)
actionview (= 4.2.0)
activesupport (= 4.2.0)
rack (~> 1.6.0)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.0)
activesupport (= 4.2.0)
globalid (>= 0.3.0)
activemodel (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1)
activerecord (4.2.0)
activemodel (= 4.2.0)
activesupport (= 4.2.0)
arel (~> 6.0)
activesupport (4.2.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
arel (6.0.3)
ast (2.1.0)
autoprefixer-rails (6.0.3)
execjs
json
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
bcrypt (3.1.10)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.5.1)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.3.0)
builder (3.2.2)
bullet (4.14.7)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.9.0)
byebug (6.0.2)
chart-js-rails (0.0.9)
railties (> 3.1)
chronic (0.10.2)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.7)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.0)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
concord (0.1.5)
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
curb (0.8.8)
debug_inspector (0.0.2)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (3.5.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise_token_auth (0.1.34)
devise (= 3.5.1)
rails (~> 4.2)
diff-lcs (1.2.5)
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
dspace_rest_client (1.1.2)
curb (~> 0.8.6)
rest-client (>= 1.7, < 2)
equalizer (0.0.11)
erubis (2.7.0)
execjs (2.6.0)
fast_stack (0.1.0)
rake
rake-compiler
flamegraph (0.1.0)
fast_stack
flay (2.4.0)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
flog (4.2.1)
ruby_parser (~> 3.1, > 3.1.0)
sexp_processor (~> 4.4)
globalid (0.3.6)
activesupport (>= 4.1.0)
gruff (0.6.0)
rmagick (>= 2.13.4)
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.7.0)
ice_nine (0.11.1)
jbuilder (2.3.1)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (4.0.5)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
json (1.8.3)
libv8 (3.16.14.11)
locastyle (0.0.1)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
mime-types (2.6.2)
mimemagic (0.3.0)
mina (0.3.7)
open4 (~> 1.3.4)
rake
mini_portile (0.6.2)
minitest (5.8.1)
multi_json (1.11.2)
netrc (0.10.3)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
open4 (1.3.4)
orientdb4r (0.5.1)
rest-client (~> 1.7)
orm_adapter (0.5.0)
paperclip (4.3.1)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
cocaine (~> 0.5.5)
mime-types
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)
rack-cors (0.4.0)
rack-mini-profiler (0.9.7)
rack (>= 1.1.3)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.0)
actionmailer (= 4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
activemodel (= 4.2.0)
activerecord (= 4.2.0)
activesupport (= 4.2.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.0)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
railties (4.2.0)
actionpack (= 4.2.0)
activesupport (= 4.2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
rake (10.4.2)
rake-compiler (0.9.5)
rake
rdoc (4.2.0)
reek (1.6.5)
parser (~> 2.2.0.pre.7)
rainbow (>= 1.99, < 3.0)
unparser (~> 0.2.2)
ref (2.0.0)
responders (2.1.0)
railties (>= 4.2.0, < 5)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rmagick (2.15.4)
rsolr (1.0.12)
builder (>= 2.1.2)
ruby_parser (3.7.1)
sexp_processor (~> 4.1)
rubycritic (1.4.0)
flay (= 2.4.0)
flog (= 4.2.1)
parser (>= 2.2.0, < 3.0)
reek (= 1.6.5)
virtus (~> 1.0)
sass (3.4.18)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
select2-rails (4.0.0)
thor (~> 0.14)
sexp_processor (4.6.0)
shoulda (3.5.0)
shoulda-context (~> 1.0, >= 1.0.1)
shoulda-matchers (>= 1.4.1, < 3.0)
shoulda-callback-matchers (1.1.3)
activesupport (>= 3)
shoulda-context (1.2.1)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
spring (1.4.0)
sprockets (3.3.5)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10)
stackprof (0.2.7)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.1)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.1)
uniform_notifier (1.9.0)
unparser (0.2.4)
abstract_type (~> 0.0.7)
adamantium (~> 0.2.0)
concord (~> 0.1.5)
diff-lcs (~> 1.2.5)
equalizer (~> 0.0.9)
parser (~> 2.2.2)
procto (~> 0.0.2)
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
warden (1.2.3)
rack (>= 1.0)
web-console (2.2.1)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
whenever (0.9.4)
chronic (>= 0.6.3)
will_paginate (3.0.7)
PLATFORMS
ruby
DEPENDENCIES
bcrypt (~> 3.1.7)
better_errors
bootstrap-sass
bullet
byebug
chart-js-rails
coffee-rails (~> 4.1.0)
devise
devise_token_auth
dspace_rest_client (~> 1.1.0)
execjs
flamegraph
gruff
jbuilder (~> 2.0)
jquery-rails
jquery-turbolinks
locastyle
mina
orientdb4r
paperclip
pg
puma
rack-cors
rack-mini-profiler
rails (= 4.2.0)
rdoc
rmagick
rsolr (~> 1.0.12)
rubycritic
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
select2-rails
shoulda
shoulda-callback-matchers (~> 1.1.1)
spring
sqlite3
stackprof
therubyracer
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)
whenever
will_paginate (~> 3.0.5)
BUNDLED WITH
1.10.6
app/assets/images/logo.png
+ 0
− 0
View replaced file @ 534db87f View file @ 10866bf0
app/assets/images/logo.png

13 KiB | W: | H:

app/assets/images/logo.png

213 KiB | W: | H:

app/assets/images/logo.png
app/assets/images/logo.png
app/assets/images/logo.png
app/assets/images/logo.png
  • 2-up
  • Swipe
  • Onion skin
app/assets/images/user-anon.png 0 → 100644
+ 0
− 0
View file @ 10866bf0
app/assets/images/user-anon.png

1.62 KiB

app/assets/javascripts/application.js
+ 1
− 134
View file @ 10866bf0
......@@ -16,137 +16,4 @@
//= require jquery.turbolinks
//= require bootstrap-sprockets
//= require select2
//= require_tree ./application
/*
$('h2').each(function(index,value) {
$(this).css('fontSize', (parseFloat($(this).css('fontSize')) + (size_c - 15)) + 'px');
});
$('h3').each(function(index,value) {
$(this).css('fontSize', (parseFloat($(this).css('fontSize')) + (size_c - 15)) + 'px');
});
$('h4').each(function(index,value) {
$(this).css('fontSize', (parseFloat($(this).css('fontSize')) + (size_c - 15)) + 'px');
});
$('h5').each(function(index,value) {
$(this).css('fontSize', (parseFloat($(this).css('fontSize')) + (size_c - 15)) + 'px');
});
$('h6').each(function(index,value) {
$(this).css('fontSize', (parseFloat($(this).css('fontSize')) + (size_c - 15)) + 'px');
});
*/
$(document).ready(function(){
size_c = readCookie('fontSize');
if (size_c != null) {
document.body.style.fontSize = size_c + 'px';
$('.dropdown-menu').css('fontSize', document.body.style.fontSize);
$('h1,h2,h3,h4,h5,h6').each(function(index,value) {
$(this).css('fontSize', (parseFloat($(this).css('fontSize')) + (size_c - 15)) + 'px');
});
}
Contrast();
});
//source: http://www.linhadecodigo.com.br/artigo/1615/acessibilidade-aumentando-e-diminuindo-tamanho-de-letra-em-seu-site.aspx
function createCookie(name,value,days) {
if (days) {
var date = new Date();
date.setTime(date.getTime()+(days*24*60*60*1000));
var expires = "; expires="+date.toGMTString();
} else var expires = "";
document.cookie = name+"="+value+expires+"; path=/";
}
function readCookie(name) {
var nameEQ = name + "=";
var ca = document.cookie.split(";");
for(var i=0;i < ca.length;i++)
{
var c = ca[i];
while (c.charAt(0)==" ") c = c.substring(1,c.length);
if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
}
return null;
}
function resizeText(increment) {
if (document.body.style.fontSize == "") {
document.body.style.fontSize = "15px";
}
size = parseFloat(document.body.style.fontSize)
if (increment > 0) {
if (size < 25) {
document.body.style.fontSize = parseFloat(document.body.style.fontSize) + increment + "px";
$('.dropdown-menu').css('fontSize', document.body.style.fontSize);
$('h1 ,h2 ,h3, h4, h5 ,h6').each(function(index,value) {
$(this).css('fontSize', parseFloat($(this).css('fontSize')) + increment + 'px');
});
}
} else if(increment < 0){
if (size > 10) {
document.body.style.fontSize = parseFloat(document.body.style.fontSize) + increment + "px";
$('.dropdown-menu').css('fontSize', document.body.style.fontSize);
$('h1 ,h2 ,h3, h4, h5 ,h6').each(function(index,value) {
$(this).css('fontSize', parseFloat($(this).css('fontSize')) + increment + 'px');
});
}
}
else{
size = parseFloat(document.body.style.fontSize);
document.body.style.fontSize = '15px';
$('.dropdown-menu').css('fontSize', document.body.style.fontSize);
$('h1 ,h2 ,h3, h4, h5 ,h6').each(function(index,value) {
$(this).css('fontSize', parseFloat($(this).css('fontSize')) + increment + 'px');
});
}
createCookie('fontSize', parseFloat(document.body.style.fontSize), 365);
}
function changeContrast() {
if (readCookie('contrast') == null || readCookie('contrast') == "false") {
createCookie('contrast',"true",0);
} else {
createCookie('contrast',"false",0);
}
Contrast();
}
function Contrast() {
contrast_c = readCookie('contrast');
if (contrast_c == null || contrast_c != "true"){
$('body').addClass('contraste');
$('.barra-brasil').addClass('contraste');
$('.search-bar').addClass('contraste');
$('.search-bar').css('border-top','2px solid white');
$('#menu-bar').addClass('menu-bar-contrast');
$('.object-vertical .panel').addClass('contraste');
$('.navbar').addClass('contraste');
$('.well').addClass('contraste');
}else {
$('body').removeClass('contraste');
$('.barra-brasil').removeClass('contraste');
$('.search-bar').removeClass('contraste');
$('.search-bar').css('border-top','none');
$('#menu-bar').removeClass('menu-bar-contrast');
$('.object-vertical .panel').removeClass('contraste');
$('.navbar').removeClass('contraste');
$('.well').removeClass('contraste');
}
}
$.fn.select2.amd.require(
["select2/core", "select2/utils", "select2/compat/matcher"],
function (Select2, Utils, oldMatcher) {
var $basicMultiple = $(".js-example-basic-multiple");
var $limitMultiple = $(".js-example-basic-multiple-limit");
$basicMultiple.select2();
$basicMultiple.select2({ width: '80%' });
$limitMultiple.select2({
maximumSelectionLength: 2
});
});
//= require_tree ./application
\ No newline at end of file
app/assets/javascripts/application/accessibility.js 0 → 100644
+ 107
− 0
View file @ 10866bf0
//// font size
var fontSize = function() {
var elements = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', '.btn'],
elements_length = elements.length,
elements_size = {};
// get elements size with jquery after document ready
$(document).ready(function() {
for (var i = 0; i < elements_length; i++) {
elements_size[elements[i]] = $(elements[i]).css('fontSize');
}
});
// init
size_c = readCookie('fontSize');
if (size_c != null) {
$(document).ready(function() {
reloadFontSize(size_c);
});
}
function reloadFontSize(size) {
var i = 0;
size = (parseFloat(size) / 10) + 1;
// change body font size
$('body').css('fontSize', (size * 100) + '%', 'important');
// change custom elements
for (i; i < elements_length; i++) {
$(elements[i]).css('fontSize', (parseFloat(elements_size[elements[i]]) * size) + "px", 'important');
}
}
return {
resizeText: function(increment) {
var size = parseFloat(readCookie('fontSize'));
increment = parseFloat(increment);
if (increment === 0) size = 0;
else if (((size > -6) && (increment < 0)) || ((size < 7) && (increment > 0))) {
size = size + increment;
};
reloadFontSize(size);
createCookie('fontSize', size, 365);
}
};
}
//// contrast
var contrast = function() {
var contrast_elements = 'body, .barra-brasil, .search-bar, .learning-object-vertical .panel, .navbar, .well';
// init
$(document).ready(function() {
run();
});
function run() {
var contrast_c = readCookie('contrast');
if (contrast_c == null || contrast_c != "true") {
$(contrast_elements).removeClass('contraste');
$('.search-bar').css('border-top','none');
$('#menu-bar').removeClass('menu-bar-contrast');
}
else {
$(contrast_elements).addClass('contraste');
$('.search-bar').css('border-top','2px solid white');
$('#menu-bar').addClass('menu-bar-contrast');
}
}
return {
change: function() {
(readCookie('contrast') == "true") ? createCookie('contrast',"false",0) : createCookie('contrast',"true",0);
run();
}
};
}
//// cookies
//source: http://www.linhadecodigo.com.br/artigo/1615/acessibilidade-aumentando-e-diminuindo-tamanho-de-letra-em-seu-site.aspx
function createCookie(name,value,days) {
if (days) {
var date = new Date();
date.setTime(date.getTime()+(days*24*60*60*1000));
var expires = "; expires="+date.toGMTString();
} else var expires = "";
document.cookie = name+"="+value+expires+"; path=/";
}
function readCookie(name) {
var nameEQ = name + "=";
var ca = document.cookie.split(";");
for (var i=0;i < ca.length;i++) {
var c = ca[i];
while (c.charAt(0)==" ") c = c.substring(1,c.length);
if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
}
return null;
}
// define global variables
var fontSize = fontSize();
var contrast = contrast();
app/assets/javascripts/application/collections.coffee 0 → 100644
+ 8
− 0
View file @ 10866bf0
$ ->
$('#create_collection_popover').popover
html: true
content: ->
$('#create_collection_popover_content').html()
title: ->
$('#create_collection_popover_title').html()
return
\ No newline at end of file
app/assets/javascripts/application/columns.js 0 → 100644
+ 24
− 0
View file @ 10866bf0
$(document).ready(function() {
$(".learning-object-columns").each(function() {
var html = '',
i = 1;
$("> div", this).each(function () {
if (i == 2) {
html = '<div class="col-md-6"><div class="row"><div class="col-md-3">&nbsp;</div><div class="col-md-6">';
// TODO: find a way to not remove wrapper div
html += $(this).clone().wrap('<div>').parent().html();
html += '</div><div class="col-md-3">&nbsp;</div></div></div>';
$(this).replaceWith(html);
i = 0;
}
else {
$(this).wrap('<div class="col-md-3"></div>');
i += 1;
}
});
});
});
app/assets/javascripts/application/learning_objects.coffee 0 → 100644
+ 8
− 0
View file @ 10866bf0
$ ->
$('.add_to_collection').popover
html: true
content: ->
$('#collections_list_popover').html()
title: ->
$('#collections_list_popover_title').html()
return
\ No newline at end of file
app/assets/stylesheets/application.scss
+ 37
− 21
View file @ 10866bf0
......@@ -18,6 +18,8 @@
@import "select2";
@import "select2-bootstrap";
$header-blue: #1676bc;
//// HTML/BODY
html,
body {
......@@ -25,7 +27,7 @@ body {
padding:0;
height:100%;
font-size: 15px;
font-size: 100%;
font-family: 'Roboto', "Helvetica Neue", Helvetica, Arial, sans-serif;
}
......@@ -50,9 +52,6 @@ a, a:focus, a:hover {
//// HEADER
header {
border: 0;
border-bottom: 1px;
border-style: solid;
border-color: #cececd;
margin-bottom: 16px;
a, a:focus, a:hover {
......@@ -84,15 +83,27 @@ header {
margin: 0px;
// logo
.logo-text {
.logo-container {
text-align: left;
}
.logo {
margin-top: 10px;
padding: 0px;
font-size: 24px;
// font-size: 24px;
font-weight: bold;
text-align: center;
float: left;
width: 165px;
h3 {
margin-top: 10px;
}
a {
color: #FFF;
}
}
.logo-image {
width: 100px;
}
// accessibility
.search-accessibility {
margin-top: 25px;
......@@ -142,17 +153,15 @@ header {
// user info
.status-text {
margin-top: 20px;
font-size: 20px;
// font-size: 20px;
text-align: right;
.circular-image {
width: 60px;
height: 60px;
border-radius: 50%;
h2, h4 {
margin-top: 5px;
}
.media-heading {
font-size: 32px;
// font-size: 32px;
a {
color: #FFF;
}
......@@ -173,20 +182,32 @@ header {
.nav {
height: 50px;
h3 {
margin-top: 13px;
}
.nav-button {
min-width: 140px;
min-width: 130px;
height: 100%;
font-size: 20px;
padding-left: 15px;
padding-right: 10px;
// font-size: 20px;
color: #343D3E;
font-weight: 500 !important;
a { color: #000; }
a {
@extend h3;
padding: 0;
color: #343D3E;
}
}
.nav-button-first {
a { padding-left: 0px !important; }
padding-left: 0 !important;
}
.divider {
width: 2px;
margin-left: 3px;
height: 100%;
background-color: #FFF;
}
......@@ -225,11 +246,6 @@ footer {
}
}
//// partial OBJECT
.object-horizontal {
}
.starRating:not(old){
display : inline-block;
width : 7.5em;
......
app/assets/stylesheets/application/learning_objects.scss 0 → 100644
+ 13
− 0
View file @ 10866bf0
.learning-object-horizontal, .learning-object-vertical {
margin-bottom: 20px;
.panel-body {
padding: 0 !important;
margin-top: 3px;
}
.media-heading {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
app/assets/stylesheets/application/search.scss
+ 5
− 0
View file @ 10866bf0
.search-sidebar {
margin-top: 40px;
.dropdown-element {
width: 95%;
margin-left: 3%;
}
}
.select2-container {
......
app/assets/stylesheets/application/users.scss 0 → 100644
+ 25
− 0
View file @ 10866bf0
$header-blue: #1676bc;
.user-image {
width: 60px;
height: 60px;
border-radius: 50%;
}
.user-header {
background-color: #e7e7e8;
width: 100%;
min-height: 100px;
padding: 15px;
.right-column {
text-align: right;
.btn {
background-color: $header-blue;
color: white;
border: 0px;
min-width: 150px;
}
}
}
app/assets/stylesheets/application/welcome.scss
+ 5
− 2
View file @ 10866bf0
......@@ -15,7 +15,6 @@ $carousel_size: 400px;
.carousel {
height: $carousel_size;
margin-bottom: 60px;
h1{
background-color: rgba(37, 68, 32, 0.75);
}
......@@ -27,6 +26,9 @@ $carousel_size: 400px;
.carousel h1 {
background-color: rgba(0, 0, 0, 0.75);
}
.carousel ol {
background-color: rgba(0, 0, 0, 0.10);
}
.carousel-caption {
z-index: 10;
......@@ -41,7 +43,8 @@ $carousel_size: 400px;
top: 0;
left: 0;
min-width: 100%;
height: $carousel_size;
height: 400px !important;
}
.carousel-indicators li {
......
app/assets/stylesheets/learning_objects.scss deleted 100644 → 0
+ 0
− 3
View file @ 534db87f
// Place all the styles related to the LearningObjects controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
app/assets/stylesheets/edges.scss → app/assets/stylesheets/management/carousel.scss
+ 1
− 1
View file @ 10866bf0
// Place all the styles related to the Edges controller here.
// Place all the styles related to the management/carousel controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
app/assets/stylesheets/registrations.scss deleted 100644 → 0
+ 0
− 3
View file @ 534db87f
// Place all the styles related to the registrations controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
app/assets/stylesheets/university.scss deleted 100644 → 0
+ 0
− 3
View file @ 534db87f
// Place all the styles related to the university controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
app/assets/stylesheets/users.scss deleted 100644 → 0
+ 0
− 3
View file @ 534db87f
// Place all the styles related to the users controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment