coop-cloud-chaos-patchs/timeoverflow
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix various styles

Browse Source
This commit is contained in:
jgutzm@gmail.com
2017-01-20 19:28:46 +01:00
parent 52f7a10ead
commit 87f1ddb348
14 changed files with 70 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby '2.3.1'
ruby '2.3.0'
gem 'rails', '4.2.5.2'
gem 'rails-i18n'

2
Gemfile.lock
View File

@ -405,4 +405,4 @@ RUBY VERSION
ruby 2.3.1p112
BUNDLED WITH
1.13.6
1.11.2

BIN
app/assets/images/home_back.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

BIN
app/assets/images/home_back_overlay.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 935 KiB

64
app/assets/stylesheets/application.css.scss
View File

@ -45,10 +45,6 @@ html {
margin-left: 0.7rem;
}
.navbar-nav .dropdown .material-icons {
display: none;
}
#login-box {
border-radius: 0.3rem;
@ -56,7 +52,7 @@ html {
border: 0;
border-radius: 0.3rem;
margin: 0;
padding: 1rem 3.8rem 2rem 3.8rem;
padding: 1rem 3rem 1.4rem 3rem;
}
form .material-icons {
@ -110,7 +106,7 @@ html {
}
.panel-footer {
padding: 3rem;
padding: 2rem 3rem;
a {
color: $form-a-color;
@ -475,8 +471,8 @@ form .checkbox input[type="checkbox"] {
}
}
.dropdown-menu{
background: none;
border: 0.2rem solid #ffffff;
background: $navs-bg-color;
border: 0.2rem solid $white;
border-top: 0;
border-top-left-radius: 0;
border-top-right-radius: 0;
@ -490,7 +486,7 @@ form .checkbox input[type="checkbox"] {
font-weight: 500;
padding: 0.6rem 1.2rem;
&:hover{
background: none;
background: $menu-drop-hover;
opacity: 0.8;
}
&:focus,
@ -551,7 +547,7 @@ form .checkbox input[type="checkbox"] {
text-align: center;
}
.landing-page, .pages .banner {
.landing-page .content, .pages .banner {
h2 {
color: $white;
font-size: 5.76rem;
@ -568,24 +564,22 @@ form .checkbox input[type="checkbox"] {
margin-top: 1rem;
}
.content {
.btn {
font-size: 2.88rem;
font-weight: 500;
letter-spacing: 0.023rem;
margin-top: 4rem;
padding: 1.5rem 6.2rem;
}
.btn {
font-size: 2.88rem;
font-weight: 500;
letter-spacing: 0.023rem;
margin-top: 4rem;
padding: 1.5rem 6.2rem;
}
.btn-info {
background: $btn-landing;
border: 0;
color: $black;
}
.btn-info {
background: $btn-landing;
border: 0;
color: $black;
}
.btn-info:hover {
background: $btn-landing-hover;
}
.btn-info:hover {
background: $btn-landing-hover;
}
.back-overlay {
@ -599,7 +593,8 @@ form .checkbox input[type="checkbox"] {
font-size: 3.84rem;
font-weight: 600;
letter-spacing: 0.031rem;
margin-top: 4rem;
margin-bottom: 2rem;
margin-top: 3rem;
}
.material-icons {
@ -610,6 +605,8 @@ form .checkbox input[type="checkbox"] {
color: $form-login-gray-text;
font-size: 1.6rem;
font-weight: 400;
margin-bottom: 0rem;
margin-top: 1rem;
}
form .checkbox input[type="checkbox"] {
@ -641,12 +638,12 @@ form .checkbox input[type="checkbox"] {
.unlocks-page, .confirmations-page, .passwords-page {
#login-box form {
border: none;
margin-top: 2rem;
margin-top: 3rem;
padding: 0;
}
#login-box .panel-body {
padding: 3rem;
padding: 3rem 3rem 2rem 3rem;
}
.panel-body h2 {
@ -661,7 +658,7 @@ form .checkbox input[type="checkbox"] {
font-size: 1.6rem;
font-weight: 400;
letter-spacing: -0.028rem;
margin-top: 1.5rem;
margin-top: 1rem;
}
}
@ -674,6 +671,7 @@ form .checkbox input[type="checkbox"] {
font-weight: 600;
letter-spacing: -0.037rem;
margin-bottom: 0;
margin-top: 4rem;
}
h2 span {
@ -748,9 +746,9 @@ form .checkbox input[type="checkbox"] {
}
.banner {
background: image-url('home_back.jpg') no-repeat center center;
background: image-url('home_back_overlay.jpg') no-repeat center center;
background-size: cover;
margin: 7rem 0 4rem 0;
margin: 8rem 0 3rem 0;
padding: 8rem 1rem;
text-align: center;
@ -771,7 +769,7 @@ form .checkbox input[type="checkbox"] {
.empower {
h2 {
margin-bottom: 5rem;
margin-bottom: 4rem;
}
p {

19
app/helpers/application_helper.rb
View File

@ -86,14 +86,15 @@ module ApplicationHelper
end
def get_body_css_class(controller)
case controller
when 'home' then return 'class=landing-page'
when 'sessions' then return 'class=login-page'
when 'pages' then return 'class=pages'
when 'unlocks' then return 'class=unlocks-page'
when 'passwords' then return 'class=passwords-page'
when 'confirmations' then return 'class=confirmations-page'
end
return ""
classes = {
'home' => 'landing-page',
'sessions' => 'login-page',
'pages' => 'pages',
'unlocks' => 'unlocks-page',
'passwords' => 'passwords-page',
'confirmations' => 'confirmations-page'
}
"#{classes[controller]}"
end
end

26
app/helpers/mail_helper.rb
View File

@ -1,15 +1,15 @@
module MailHelper
def js_antispam_email_link(email,linktext)
# http://apidock.com/rails/ActionView/Helpers/UrlHelper/mail_to
user, domain = email.split('@')
# if linktext wasn't specified, throw email address builder into js document.write statement
linktext = "'+'#{user}'+'@'+'#{domain}'+'" if linktext == email
out = "<script language='javascript'>\n"
out += " <!--\n"
out += " string = '#{user}'+'@'+''+'#{domain}';\n"
out += " document.write('<a href='+'m'+'a'+'il'+'to:'+ string +'>#{linktext}</a>'); \n"
out += " //-->\n"
out += "</script>\n"
return out
end
def js_antispam_email_link(email,linktext)
# http://apidock.com/rails/ActionView/Helpers/UrlHelper/mail_to
user, domain = email.split('@')
# if linktext wasn't specified, throw email address builder into js document.write statement
linktext = "'+'#{user}'+'@'+'#{domain}'+'" if linktext == email
out = "<script language='javascript'>\n"
out += " <!--\n"
out += " string = '#{user}'+'@'+''+'#{domain}';\n"
out += " document.write('<a href='+'m'+'a'+'il'+'to:'+ string +'>#{linktext}</a>'); \n"
out += " //-->\n"
out += "</script>\n"
return out
end
end

4
app/views/application/_navbar.html.erb
View File

@ -10,7 +10,11 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<% if current_user && current_organization %>
<a class="navbar-brand" href="<%= organization_path(current_organization) %>">TimeOverflow</a>
<% else %>
<a class="navbar-brand" href="/">TimeOverflow</a>
<% end %>
</div>
</div>
<div class="col-xs-12 col-sm-9 col-md-9 col-lg-9">

2
app/views/application/menus/_language_switcher.html.erb
View File

@ -3,7 +3,7 @@
<div class="dropdown dropdown-language-selector">
<a class="btn btn-default dropdown-toggle language" type="button" id="dropdownLanguage">
<%= t("locales.#{locale}") %>
<b class="caret"></b><i class="material-icons">keyboard_arrow_down</i>
<b class="caret"></b>
</a>
<ul class="dropdown-menu" aria-labelledby="dropdownMenu1" >
<% I18n.available_locales.each do |locale| %>

4
app/views/layouts/application.html.erb
View File

@ -18,12 +18,12 @@
<link href="/favicon.ico" rel="shortcut icon">
<%= stylesheet_link_tag 'libs', media: 'all' %>
<%= stylesheet_link_tag 'application', media: 'all' %>
<%= stylesheet_link_tag 'application', 'http://fonts.googleapis.com/css?family=Work+Sans:400,500,600,700' %>
<%= stylesheet_link_tag 'application', 'https://fonts.googleapis.com/css?family=Work+Sans:400,500,600,700' %>
<%= stylesheet_link_tag 'application', 'https://fonts.googleapis.com/icon?family=Material+Icons' %>
<%= javascript_include_tag 'libs' %>
<%= javascript_include_tag 'application' %>
</head>
<body <%= get_body_css_class(controller.controller_name) %> data-action="<%= params[:controller] %>-<%= params[:action] %>"
<body class="<%= get_body_css_class(controller.controller_name) %>" data-action="<%= params[:controller] %>-<%= params[:action] %>"
ng-app="timeoverflow"
ng-cloak>
<%= render 'navbar' %>

2
app/views/pages/about.html.erb
View File

@ -1,7 +1,7 @@
<div class="container-inner">
<div class="row">
<div class="col-xs-10 col-sm-10 col-md-6 col-lg-6 col-xs-offset-1 col-sm-offset-1 col-md-offset-3 col-lg-offset-3 header">
<h2><%== t("pages.about.title") %></h2>
<h2><%== t("pages.about.title") %><span><%== t("pages.about.title2") %></span></h2>
<h3><%= t("pages.about.subtitle") %></h3>
</div>
</div>

3
config/locales/ca.yml
View File

@ -391,7 +391,8 @@ ca:
pages:
about:
title: "El software disenyat per i per <span>als Bancs de Temps</span>"
title: "El software disenyat per i per"
title2: "als Bancs de Temps"
subtitle: "TimeOverflow és lliure, gratuït i col·laboratiu"
feature-group-1: "Gestió del Banc de Temps amb perfils d'administració"
feature-group-2: "Xarxa social i banca en línia accessible pels membres"

3
config/locales/en.yml
View File

@ -387,7 +387,8 @@ en:
pages:
about:
title: "The software designed by and for <span>Time Banks</span>"
title: "The software designed by and for"
title2: "Time Banks"
subtitle: "TimeOverflow is open source, free and collaborative"
feature-group-1: "Time Bank management with administration roles"
feature-group-2: "Social network and online banking accessible by members"

3
config/locales/es.yml
View File

@ -396,7 +396,8 @@ es:
pages:
about:
title: "El software diseñado por y para <span>los Bancos de Tiempo</span>"
title: "El software diseñado por y para"
title2: "los Bancos de Tiempo"
subtitle: "TimeOverflow es libre, gratuito y colaborativo"
feature-group-1: "Gestión del Banco de Tiempo con perfiles de administración"
feature-group-2: "Red social y banca on-line accesible por los miembros"