Layout fixes
This commit is contained in:
@@ -1,13 +1,6 @@
|
||||
.container
|
||||
a.btn.btn-navbar data-toggle="collapse" data-target=".nav-collapse"
|
||||
span.icon-bar
|
||||
span.icon-bar
|
||||
span.icon-bar
|
||||
|
||||
ul.nav
|
||||
li[class=(current_page?(controller: '/pages', action: 'home') ? :active : nil)]= link_to find_page('home').try(:menu_text), locale_root_path
|
||||
li[class=(current_page?(controller: '/pages', action: 'show', name: 'about') ? :active : nil)]= link_to find_page('about').try(:menu_text), page_path('about')
|
||||
.nav-collapse.collapse
|
||||
ul.nav
|
||||
- Page.top_menu.each do |page|
|
||||
li[class=(current_page?(controller: '/pages', action: 'show', name: page.name) ? :active : nil)]= link_to page.menu_text, page_path(page.name)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
.row
|
||||
h1 data-t='obtain_token.title' = t('user.obtain_token.title')
|
||||
hr
|
||||
form
|
||||
/form
|
||||
.form-row
|
||||
.form-label
|
||||
label.control-label data-t='attributes.user.email' = User.human_attribute_name(:email)
|
||||
@@ -20,4 +20,4 @@
|
||||
javascript:
|
||||
Qstorage.setItem('auth_token', '#{current_user.authentication_token}');
|
||||
Qstorage.setItem('user_id', '#{current_user.id}');
|
||||
window.location = '#{user_root_path}';
|
||||
window.location = '/index.html';
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
###
|
||||
# This script build a mobile app for the android and ios cordova projects.
|
||||
# If the environment variable TEST_HOST is set it will be used as mobile app host
|
||||
# for all the requests
|
||||
#
|
||||
#
|
||||
###
|
||||
|
||||
require 'fileutils'
|
||||
include FileUtils
|
||||
#rm_rf Rails.root.join('public', 'assets') # now done in ./make_...
|
||||
|
||||
Reference in New Issue
Block a user