Fixes some classes for foundation 6
This commit is contained in:
@@ -368,7 +368,6 @@ header {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.subnavigation {
|
.subnavigation {
|
||||||
padding-bottom: $line-height;
|
|
||||||
|
|
||||||
@media (min-width: $small-breakpoint) {
|
@media (min-width: $small-breakpoint) {
|
||||||
background: white;
|
background: white;
|
||||||
@@ -1056,11 +1055,19 @@ table {
|
|||||||
// 13. Social
|
// 13. Social
|
||||||
// - - - - - - - - - - - - - - - - - - - - - - - - -
|
// - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
|
||||||
|
.button.button-twitter,
|
||||||
|
.button.button-facebook,
|
||||||
|
.button.button-google {
|
||||||
|
height: $line-height*2;
|
||||||
|
line-height: $line-height*2;
|
||||||
|
padding: 0;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
.button.button-twitter {
|
.button.button-twitter {
|
||||||
background: #45B0E3;
|
background: #45B0E3;
|
||||||
|
|
||||||
&:before {
|
&:before {
|
||||||
background: #40A2D1;
|
|
||||||
content: "f";
|
content: "f";
|
||||||
font-family: "icons" !important;
|
font-family: "icons" !important;
|
||||||
font-size: rem-calc(24);
|
font-size: rem-calc(24);
|
||||||
@@ -1100,7 +1107,6 @@ table {
|
|||||||
background: #3B5998;
|
background: #3B5998;
|
||||||
|
|
||||||
&:before {
|
&:before {
|
||||||
background: #354F88;
|
|
||||||
content: "A";
|
content: "A";
|
||||||
font-family: "icons" !important;
|
font-family: "icons" !important;
|
||||||
font-size: rem-calc(24);
|
font-size: rem-calc(24);
|
||||||
@@ -1140,7 +1146,6 @@ table {
|
|||||||
background: #DE4C34;
|
background: #DE4C34;
|
||||||
|
|
||||||
&:before {
|
&:before {
|
||||||
background: #CE3E26;
|
|
||||||
content: "B";
|
content: "B";
|
||||||
font-family: "icons" !important;
|
font-family: "icons" !important;
|
||||||
font-size: rem-calc(24);
|
font-size: rem-calc(24);
|
||||||
|
|||||||
@@ -856,7 +856,6 @@
|
|||||||
color: $warning-color;
|
color: $warning-color;
|
||||||
font-size: $small-font-size;
|
font-size: $small-font-size;
|
||||||
line-height: rem-calc(24);
|
line-height: rem-calc(24);
|
||||||
padding-top: rem-calc(6);
|
|
||||||
|
|
||||||
a {
|
a {
|
||||||
color: $warning-color;
|
color: $warning-color;
|
||||||
|
|||||||
@@ -3,30 +3,30 @@
|
|||||||
<% if current_page?(new_user_session_path) %>
|
<% if current_page?(new_user_session_path) %>
|
||||||
|
|
||||||
<% if feature? :twitter_login %>
|
<% if feature? :twitter_login %>
|
||||||
<%= link_to t("omniauth.twitter.sign_in"), user_omniauth_authorize_path(:twitter), class: "button-twitter button radius expand" %>
|
<%= link_to t("omniauth.twitter.sign_in"), user_omniauth_authorize_path(:twitter), class: "button-twitter button expanded" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if feature? :facebook_login %>
|
<% if feature? :facebook_login %>
|
||||||
<%= link_to t("omniauth.facebook.sign_in"), user_omniauth_authorize_path(:facebook), class: "button-facebook button radius expand" %>
|
<%= link_to t("omniauth.facebook.sign_in"), user_omniauth_authorize_path(:facebook), class: "button-facebook button expanded" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if feature? :google_login %>
|
<% if feature? :google_login %>
|
||||||
<%= link_to t("omniauth.google_oauth2.sign_in"), user_omniauth_authorize_path(:google_oauth2), class: "button-google button radius expand" %>
|
<%= link_to t("omniauth.google_oauth2.sign_in"), user_omniauth_authorize_path(:google_oauth2), class: "button-google button expanded" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<hr/>
|
<hr/>
|
||||||
<% elsif current_page?(new_user_registration_path) %>
|
<% elsif current_page?(new_user_registration_path) %>
|
||||||
|
|
||||||
<% if feature? :twitter_login %>
|
<% if feature? :twitter_login %>
|
||||||
<%= link_to t("omniauth.twitter.sign_up"), user_omniauth_authorize_path(:twitter), class: "button-twitter button radius expand" %>
|
<%= link_to t("omniauth.twitter.sign_up"), user_omniauth_authorize_path(:twitter), class: "button-twitter button expanded" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if feature? :facebook_login %>
|
<% if feature? :facebook_login %>
|
||||||
<%= link_to t("omniauth.facebook.sign_up"), user_omniauth_authorize_path(:facebook), class: "button-facebook button radius expand" %>
|
<%= link_to t("omniauth.facebook.sign_up"), user_omniauth_authorize_path(:facebook), class: "button-facebook button expanded" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if feature? :google_login %>
|
<% if feature? :google_login %>
|
||||||
<%= link_to t("omniauth.google_oauth2.sign_up"), user_omniauth_authorize_path(:google_oauth2), class: "button-google button radius expand" %>
|
<%= link_to t("omniauth.google_oauth2.sign_up"), user_omniauth_authorize_path(:google_oauth2), class: "button-google button expanded" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<hr/>
|
<hr/>
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
<div class="small-12 medium-8 large-5 column small-centered margin-top">
|
<div class="small-12 medium-8 large-5 column small-centered margin-top">
|
||||||
<h1>
|
<h1>
|
||||||
<%= link_to root_path do %>
|
<%= link_to root_path do %>
|
||||||
<%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up float-left', size: '96x96', alt: t("layouts.header.logo")) %>
|
<%= image_tag('header_logo_madrid.png', class: 'show-for-medium float-left', size: '96x96', alt: t("layouts.header.logo")) %>
|
||||||
<%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %>
|
<%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</h1>
|
</h1>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<%= link_to t("pages.opendata.go_old"), t("layouts.header.external_link_opendata_url"), target: "_blank", class: "button" %>
|
<%= link_to t("pages.opendata.go_old"), t("layouts.header.external_link_opendata_url"), target: "_blank", class: "button" %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="show-for-medium-up small-12 medium-5 column text-center">
|
<div class="show-for-medium small-12 medium-5 column text-center">
|
||||||
<%= image_tag("icon_home.png", size: "330x240", alt:"", role:"presentation") %>
|
<%= image_tag("icon_home.png", size: "330x240", alt:"", role:"presentation") %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="show-for-medium-up medium-9 column text-center">
|
<div class="show-for-medium medium-9 column text-center">
|
||||||
<%= image_tag("map.jpg", usemap: "#map") %>
|
<%= image_tag("map.jpg", usemap: "#map") %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<%= t("devise_views.users.registrations.edit.back_link") %>
|
<%= t("devise_views.users.registrations.edit.back_link") %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<h1><%= t("devise_views.users.registrations.edit.edit") %></h1>
|
<h2><%= t("devise_views.users.registrations.edit.edit") %></h2>
|
||||||
|
|
||||||
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
|
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
|
||||||
<%= devise_error_messages! %>
|
<%= devise_error_messages! %>
|
||||||
|
|||||||
Reference in New Issue
Block a user