修改了首页、头部、尾部页面，但是颜色显示不对，js文件无效，待改
This commit is contained in:
Sylor-huang
parent
5dd25766ef
commit
7a67f1de31
16
Gemfile.lock
16
Gemfile.lock
|
|
@ -41,7 +41,7 @@ GEM
|
|||
bootstrap-will_paginate (0.0.10)
|
||||
will_paginate
|
||||
builder (3.2.3)
|
||||
byebug (9.1.0)
|
||||
byebug (10.0.0)
|
||||
coderay (1.1.2)
|
||||
coffee-rails (4.1.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
|
|
@ -56,7 +56,7 @@ GEM
|
|||
execjs (2.7.0)
|
||||
faker (1.4.2)
|
||||
i18n (~> 0.5)
|
||||
ffi (1.9.18)
|
||||
ffi (1.9.23)
|
||||
font-awesome-rails (4.7.0.3)
|
||||
railties (>= 3.2, < 5.2)
|
||||
formatador (0.2.5)
|
||||
|
|
@ -74,7 +74,7 @@ GEM
|
|||
guard-minitest (2.3.1)
|
||||
guard (~> 2.0)
|
||||
minitest (>= 3.0)
|
||||
i18n (0.9.3)
|
||||
i18n (0.9.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jbuilder (2.7.0)
|
||||
activesupport (>= 4.2.0)
|
||||
|
|
@ -89,7 +89,7 @@ GEM
|
|||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
rb-inotify (~> 0.9, >= 0.9.7)
|
||||
ruby_dep (~> 1.2)
|
||||
loofah (2.1.1)
|
||||
loofah (2.2.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
lumberjack (1.0.12)
|
||||
|
|
@ -101,7 +101,7 @@ GEM
|
|||
rails (>= 2.3.3)
|
||||
mini_mime (1.0.0)
|
||||
mini_portile2 (2.3.0)
|
||||
minitest (5.11.1)
|
||||
minitest (5.11.3)
|
||||
minitest-reporters (1.0.5)
|
||||
ansi
|
||||
builder
|
||||
|
|
@ -110,7 +110,7 @@ GEM
|
|||
multi_json (1.13.1)
|
||||
mysql2 (0.4.10)
|
||||
nenv (0.3.0)
|
||||
nokogiri (1.8.1)
|
||||
nokogiri (1.8.2)
|
||||
mini_portile2 (~> 2.3.0)
|
||||
notiffany (0.1.1)
|
||||
nenv (~> 0.1)
|
||||
|
|
@ -193,9 +193,9 @@ GEM
|
|||
turbolinks (5.1.0)
|
||||
turbolinks-source (~> 5.1)
|
||||
turbolinks-source (5.1.0)
|
||||
tzinfo (1.2.4)
|
||||
tzinfo (1.2.5)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (4.1.4)
|
||||
uglifier (4.1.6)
|
||||
execjs (>= 0.3.0, < 3)
|
||||
will_paginate (3.0.7)
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 9.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
|
@ -10,8 +10,7 @@
|
|||
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
|
||||
// about supported directives.
|
||||
//
|
||||
//= require jquery
|
||||
//= require jquery_ujs
|
||||
//= require turbolinks
|
||||
//= require bootstrap.min
|
||||
// = require jquery3
|
||||
// = require jquery_ujs
|
||||
// = require turbolinks
|
||||
//= require_tree .
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,228 +0,0 @@
|
|||
/*
|
||||
*
|
||||
* Copyright (c) 2014 Daniele Lenares (https://github.com/Ryuk87)
|
||||
* Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
|
||||
* and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
|
||||
*
|
||||
* Version 0.5.1
|
||||
*
|
||||
*/
|
||||
(function ( $ ) {
|
||||
|
||||
$.goup = function(user_params) {
|
||||
|
||||
/* Default Params */
|
||||
var params = $.extend({
|
||||
location : 'right',
|
||||
locationOffset : 20,
|
||||
bottomOffset : 10,
|
||||
containerRadius : 10,
|
||||
containerClass : 'goup-container',
|
||||
arrowClass : 'goup-arrow',
|
||||
alwaysVisible : false,
|
||||
trigger: 500,
|
||||
entryAnimation : 'fade',
|
||||
goupSpeed : 'slow',
|
||||
hideUnderWidth : 500,
|
||||
containerColor : '#03A8A8',
|
||||
arrowColor : '#fff',
|
||||
title : '返回顶部',
|
||||
titleAsText : false,
|
||||
titleAsTextClass : 'goup-text'
|
||||
}, user_params);
|
||||
/* */
|
||||
|
||||
|
||||
$('body').append('<div style="display:none" class="'+params.containerClass+'"></div>');
|
||||
var container = $('.'+params.containerClass);
|
||||
$(container).html('<div class="'+params.arrowClass+'"></div>');
|
||||
var arrow = $('.'+params.arrowClass);
|
||||
|
||||
/* Parameters check */
|
||||
var location = params.location;
|
||||
if (location != 'right' && location != 'left') {
|
||||
location = 'right';
|
||||
}
|
||||
|
||||
var locationOffset = params.locationOffset;
|
||||
if (locationOffset < 0) {
|
||||
locationOffset = 0;
|
||||
}
|
||||
|
||||
var bottomOffset = params.bottomOffset;
|
||||
if (bottomOffset < 0) {
|
||||
bottomOffset = 0;
|
||||
}
|
||||
|
||||
var containerRadius = params.containerRadius
|
||||
if (containerRadius < 0) {
|
||||
containerRadius = 0;
|
||||
}
|
||||
|
||||
var trigger = params.trigger;
|
||||
if (trigger < 0) {
|
||||
trigger = 0;
|
||||
}
|
||||
|
||||
var hideUnderWidth = params.hideUnderWidth;
|
||||
if (hideUnderWidth < 0) {
|
||||
hideUnderWidth = 0;
|
||||
}
|
||||
|
||||
var checkColor = /(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i;
|
||||
if (checkColor.test(params.containerColor)) {
|
||||
var containerColor = params.containerColor;
|
||||
} else {
|
||||
var containerColor = '#000';
|
||||
}
|
||||
if (checkColor.test(params.arrowColor)) {
|
||||
var arrowColor = params.arrowColor;
|
||||
} else {
|
||||
var arrowColor = '#fff';
|
||||
}
|
||||
|
||||
if (params.title === '') {
|
||||
params.titleAsText = false;
|
||||
}
|
||||
/* */
|
||||
|
||||
/* Container Style */
|
||||
var containerStyle = {};
|
||||
containerStyle = {
|
||||
position : 'fixed',
|
||||
width : 40,
|
||||
height : 40,
|
||||
background : containerColor,
|
||||
cursor: 'pointer'
|
||||
};
|
||||
containerStyle['bottom'] = bottomOffset;
|
||||
containerStyle[location] = locationOffset;
|
||||
containerStyle['border-radius'] = containerRadius;
|
||||
|
||||
$(container).css(containerStyle);
|
||||
if (!params.titleAsText) {
|
||||
$(container).attr('title', params.title);
|
||||
} else {
|
||||
$('body').append('<div class="'+params.titleAsTextClass+'">'+params.title+'</div>');
|
||||
var textContainer = $('.'+params.titleAsTextClass);
|
||||
$(textContainer).attr('style', $(container).attr('style'));
|
||||
$(textContainer).css('background','transparent')
|
||||
.css('width',80)
|
||||
.css('height','auto')
|
||||
.css('text-align','center')
|
||||
.css(location,locationOffset - 20);
|
||||
var containerNewBottom = $(textContainer).height() + 10;
|
||||
$(container).css('bottom', '+='+containerNewBottom+'px');
|
||||
}
|
||||
|
||||
|
||||
/* Arrow Style */
|
||||
var arrowStyle = {};
|
||||
arrowStyle = {
|
||||
width : 0,
|
||||
height : 0,
|
||||
margin : '0 auto',
|
||||
'padding-top' : 13,
|
||||
'border-style' : 'solid',
|
||||
'border-width' : '0 10px 10px 10px',
|
||||
'border-color' : 'transparent transparent '+arrowColor+' transparent'
|
||||
};
|
||||
$(arrow).css(arrowStyle);
|
||||
/* */
|
||||
|
||||
|
||||
|
||||
/* Trigger Hide under a certain width */
|
||||
var isHidden = false;
|
||||
$(window).resize(function(){
|
||||
if ($(window).outerWidth() <= hideUnderWidth) {
|
||||
isHidden = true;
|
||||
do_animation($(container), 'hide', params.entryAnimation);
|
||||
if (textContainer)
|
||||
do_animation($(textContainer), 'hide', params.entryAnimation);
|
||||
} else {
|
||||
isHidden = false;
|
||||
$(window).trigger('scroll');
|
||||
}
|
||||
});
|
||||
/* If i load the page under a certain width, i don't have the event 'resize' */
|
||||
if ($(window).outerWidth() <= hideUnderWidth) {
|
||||
isHidden = true;
|
||||
$(container).hide();
|
||||
if (textContainer)
|
||||
$(textContainer).hide();
|
||||
}
|
||||
|
||||
|
||||
/* Trigger show event */
|
||||
if (!params.alwaysVisible) {
|
||||
$(window).scroll(function(){
|
||||
if ($(window).scrollTop() >= trigger && !isHidden) {
|
||||
do_animation($(container), 'show', params.entryAnimation);
|
||||
if (textContainer)
|
||||
do_animation($(textContainer), 'show', params.entryAnimation);
|
||||
}
|
||||
|
||||
if ($(window).scrollTop() < trigger && !isHidden) {
|
||||
do_animation($(container), 'hide', params.entryAnimation);
|
||||
if (textContainer)
|
||||
do_animation($(textContainer), 'hide', params.entryAnimation);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
do_animation($(container), 'show', params.entryAnimation);
|
||||
if (textContainer)
|
||||
do_animation($(textContainer), 'show', params.entryAnimation);
|
||||
}
|
||||
/* If i load the page and the scroll is over the trigger, i don't have immediately the event 'scroll' */
|
||||
if ($(window).scrollTop() >= trigger && !isHidden) {
|
||||
do_animation($(container), 'show', params.entryAnimation);
|
||||
if (textContainer)
|
||||
do_animation($(textContainer), 'show', params.entryAnimation);
|
||||
}
|
||||
|
||||
/* Click event */
|
||||
$(container).on('click', function(){
|
||||
$('html,body').animate({ scrollTop: 0 }, params.goupSpeed);
|
||||
return false;
|
||||
});
|
||||
|
||||
$(textContainer).on('click', function(){
|
||||
$('html,body').animate({ scrollTop: 0 }, params.goupSpeed);
|
||||
return false;
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
/* Private function for the animation */
|
||||
function do_animation(obj, type, animation) {
|
||||
if (type == 'show') {
|
||||
switch(animation) {
|
||||
case 'fade':
|
||||
obj.fadeIn();
|
||||
break;
|
||||
|
||||
case 'slide':
|
||||
obj.slideDown();
|
||||
break;
|
||||
|
||||
default:
|
||||
obj.fadeIn();
|
||||
}
|
||||
} else {
|
||||
switch(animation) {
|
||||
case 'fade':
|
||||
obj.fadeOut();
|
||||
break;
|
||||
|
||||
case 'slide':
|
||||
obj.slideUp();
|
||||
break;
|
||||
|
||||
default:
|
||||
obj.fadeOut();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}( jQuery ));
|
||||
|
|
@ -140,8 +140,8 @@ var check1=[false, false, false, false, false];
|
|||
function success(Obj, counter) {
|
||||
Obj.parent().parent().removeClass('has-error').addClass('has-success');
|
||||
$('.tips').eq(counter).hide();
|
||||
$('.glyphicon-ok').eq(counter).hide();
|
||||
$('.glyphicon-remove').eq(counter).hide();
|
||||
$('.fa-check').eq(counter).hide();
|
||||
$('.fa-remove').eq(counter).hide();
|
||||
check[counter] = true;
|
||||
|
||||
}
|
||||
|
|
@ -149,8 +149,8 @@ function success(Obj, counter) {
|
|||
// 校验失败函数
|
||||
function fail(Obj, counter, msg) {
|
||||
Obj.parent().parent().removeClass('has-success').addClass('has-error');
|
||||
$('.glyphicon-remove').eq(counter).hide();
|
||||
$('.glyphicon-ok').eq(counter).hide();
|
||||
$('.fa-remove').eq(counter).hide();
|
||||
$('.fa-check').eq(counter).hide();
|
||||
$('.tips').eq(counter).text(msg).show();
|
||||
check[counter] = false;
|
||||
}
|
||||
|
|
@ -159,8 +159,8 @@ function fail(Obj, counter, msg) {
|
|||
function success1(Obj, counter) {
|
||||
Obj.parent().parent().removeClass('has-error').addClass('has-success');
|
||||
$('.email-register .tips').eq(counter).hide();
|
||||
$('.email-register .glyphicon-ok').eq(counter).hide();
|
||||
$('.email-register .glyphicon-remove').eq(counter).hide();
|
||||
$('.email-register .fa-check').eq(counter).hide();
|
||||
$('.email-register .fa-remove').eq(counter).hide();
|
||||
check1[counter] = true;
|
||||
|
||||
}
|
||||
|
|
@ -168,14 +168,13 @@ function success1(Obj, counter) {
|
|||
// 校验失败函数
|
||||
function fail1(Obj, counter, msg) {
|
||||
Obj.parent().parent().removeClass('has-success').addClass('has-error');
|
||||
$('.email-register .glyphicon-remove').eq(counter).hide();
|
||||
$('.email-register .glyphicon-ok').eq(counter).hide();
|
||||
$('.email-register .fa-remove').eq(counter).hide();
|
||||
$('.email-register .fa-check').eq(counter).hide();
|
||||
$('.email-register .tips').eq(counter).text(msg).show();
|
||||
check1[counter] = false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 用户名匹配
|
||||
$('.registerBox .mobile_register').find('input').eq(0).change(function() {
|
||||
if (regUsername.test($(this).val())) {
|
||||
|
|
@ -277,8 +276,8 @@ $('.mobile_register #submit').click(function(e) {
|
|||
$('.mobile_register #reset').click(function() {
|
||||
$('.registerBox').find('input').slice(0, 4).parent().parent().removeClass('has-error has-success');
|
||||
$('.tips').hide();
|
||||
$('.glyphicon-ok').hide();
|
||||
$('.glyphicon-remove').hide();
|
||||
$('.fa-check').hide();
|
||||
$('.fa-remove').hide();
|
||||
check = [false, false, false, false];
|
||||
});
|
||||
|
||||
|
|
@ -422,8 +421,8 @@ $('.email-register #submit').click(function(e) {
|
|||
$('.email-register #reset').click(function() {
|
||||
$('.email-register').find('input').slice(0, 5).parent().parent().removeClass('has-error has-success');
|
||||
$('.tips').hide();
|
||||
$('.glyphicon-ok').hide();
|
||||
$('.glyphicon-remove').hide();
|
||||
$('.fa-check').hide();
|
||||
$('.fa-remove').hide();
|
||||
check1 = [false, false, false, false, false];
|
||||
});
|
||||
|
||||
|
|
@ -484,8 +483,8 @@ var pay_money = /^([1-9]\d*|0)(\.\d{1})?$/
|
|||
function success2(Obj, counter) {
|
||||
Obj.parent().parent().removeClass('has-error').addClass('has-success');
|
||||
$('#same-questions .tips').eq(counter).hide();
|
||||
$('#same-questions .glyphicon-ok').eq(counter).hide();
|
||||
$('#same-questions .glyphicon-remove').eq(counter).hide();
|
||||
$('#same-questions .fa-check').eq(counter).hide();
|
||||
$('#same-questions .fa-remove').eq(counter).hide();
|
||||
check[counter] = true;
|
||||
|
||||
}
|
||||
|
|
@ -493,8 +492,8 @@ function success2(Obj, counter) {
|
|||
// 校验失败函数
|
||||
function fail2(Obj, counter, msg) {
|
||||
Obj.parent().parent().removeClass('has-success').addClass('has-error');
|
||||
$('#same-questions .glyphicon-remove').eq(counter).hide();
|
||||
$('#same-questions .glyphicon-ok').eq(counter).hide();
|
||||
$('#same-questions .fa-remove').eq(counter).hide();
|
||||
$('#same-questions .fa-check').eq(counter).hide();
|
||||
$('#same-questions .tips').eq(counter).text(msg).show();
|
||||
check[counter] = false;
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -55,6 +55,7 @@ nav.bootsnav .header-top {
|
|||
.fa-angle-double-right{
|
||||
font-size:24px !important;
|
||||
color:#757575 ;
|
||||
line-height: 32px !important;
|
||||
}
|
||||
.fa:hover,
|
||||
.fa:active{
|
||||
|
|
|
|||
|
|
@ -4326,7 +4326,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
|||
.navbar-nav > li > a {
|
||||
padding-top: 10px;
|
||||
padding-bottom: 10px;
|
||||
line-height: 30px;
|
||||
line-height: 20px;
|
||||
}
|
||||
@media (max-width: 767px) {
|
||||
.navbar-nav .open .dropdown-menu {
|
||||
|
|
|
|||
|
|
@ -1,205 +1,205 @@
|
|||
// encoding: utf-8
|
||||
// "bootstrap-sprockets" must be imported before "bootstrap" and "bootstrap/variables"
|
||||
@import "bootstrap";
|
||||
@import "public";
|
||||
|
||||
@font-face {
|
||||
font-family: 'HDVPeace';
|
||||
src: url('/assets/glyphicons-halflings-regular');
|
||||
src: url('/assets/glyphicons-halflings-regular') format('eot'),
|
||||
url('/assets/glyphicons-halflings-regular') format('woff'),
|
||||
url('/assets/glyphicons-halflings-regular') format('woff2'),
|
||||
url('/assets/glyphicons-halflings-regular') format('svg');
|
||||
}
|
||||
|
||||
// header
|
||||
.header_top {
|
||||
margin: 0px;
|
||||
height: 60px;
|
||||
}
|
||||
|
||||
|
||||
/* GLOBAL STYLES
|
||||
-------------------------------------------------- */
|
||||
/* Padding below the footer and lighter body text */
|
||||
|
||||
//body {
|
||||
// nin-height: 2000px;
|
||||
// padding-top: 50px;
|
||||
// color: #5a5a5a;
|
||||
//// encoding: utf-8
|
||||
//// "bootstrap-sprockets" must be imported before "bootstrap" and "bootstrap/variables"
|
||||
//@import "bootstrap";
|
||||
//@import "public";
|
||||
//
|
||||
//@font-face {
|
||||
// font-family: 'HDVPeace';
|
||||
// src: url('/assets/glyphicons-halflings-regular');
|
||||
// src: url('/assets/glyphicons-halflings-regular') format('eot'),
|
||||
// url('/assets/glyphicons-halflings-regular') format('woff'),
|
||||
// url('/assets/glyphicons-halflings-regular') format('woff2'),
|
||||
// url('/assets/glyphicons-halflings-regular') format('svg');
|
||||
//}
|
||||
//
|
||||
//// header
|
||||
//.header_top {
|
||||
// margin: 0px;
|
||||
// height: 60px;
|
||||
//}
|
||||
//
|
||||
//
|
||||
///* GLOBAL STYLES
|
||||
//-------------------------------------------------- */
|
||||
///* Padding below the footer and lighter body text */
|
||||
//
|
||||
////body {
|
||||
//// nin-height: 2000px;
|
||||
//// padding-top: 50px;
|
||||
//// color: #5a5a5a;
|
||||
////}
|
||||
//
|
||||
///* CUSTOMIZE THE NAVBAR
|
||||
//-------------------------------------------------- */
|
||||
//
|
||||
///* mixins, variables, etc. */
|
||||
//
|
||||
//$gray-medium-light: #eaeaea;
|
||||
//$state-danger-text: #eaeaea;
|
||||
//
|
||||
//@mixin box_sizing {
|
||||
// -moz-box-sizing: border-box;
|
||||
// -webkit-box-sizing: border-box;
|
||||
// box-sizing: border-box;
|
||||
//}
|
||||
//
|
||||
//.debug_dump {
|
||||
// clear: both;
|
||||
// float: left;
|
||||
// width: 100%;
|
||||
// margin-top: 45px;
|
||||
// @include box_sizing;
|
||||
//}
|
||||
//
|
||||
////错误信息提示
|
||||
//#error_explanation {
|
||||
// color: 红色;
|
||||
// ul {
|
||||
// color: 红色;
|
||||
// margin: 0 0 30px 0;
|
||||
// }
|
||||
//}
|
||||
//
|
||||
//.field_with_errors {
|
||||
// @extend .has-error;
|
||||
// .form-control {
|
||||
// color: $state-danger-text;
|
||||
// }
|
||||
//}
|
||||
//
|
||||
///* Special class on .container surrounding .navbar, used for positioning it into place. */
|
||||
//.navbar-wrapper {
|
||||
// position: absolute;
|
||||
// top: 0;
|
||||
// right: 0;
|
||||
// left: 0;
|
||||
// z-index: 20;
|
||||
//}
|
||||
//
|
||||
///* Flip around the padding for proper display in narrow viewports */
|
||||
//.navbar-wrapper > .container {
|
||||
// padding-right: 0;
|
||||
// padding-left: 0;
|
||||
//}
|
||||
//.navbar-wrapper .navbar {
|
||||
// padding-right: 15px;
|
||||
// padding-left: 15px;
|
||||
//}
|
||||
//.navbar-wrapper .navbar .container {
|
||||
// width: auto;
|
||||
//}
|
||||
//
|
||||
//
|
||||
///* CUSTOMIZE THE CAROUSEL
|
||||
//-------------------------------------------------- */
|
||||
//
|
||||
///* Carousel base class */
|
||||
//.carousel {
|
||||
// height: 500px;
|
||||
// margin-bottom: 60px;
|
||||
//}
|
||||
///* Since positioning the image, we need to help out the caption */
|
||||
//.carousel-caption {
|
||||
// z-index: 10;
|
||||
//}
|
||||
//
|
||||
///* Declare heights because of positioning of img element */
|
||||
//.carousel .item {
|
||||
// height: 500px;
|
||||
// background-color: #777;
|
||||
//}
|
||||
//.carousel-inner > .item > img {
|
||||
// position: absolute;
|
||||
// top: 0;
|
||||
// left: 0;
|
||||
// min-width: 100%;
|
||||
// height: 500px;
|
||||
//}
|
||||
//
|
||||
//
|
||||
///* MARKETING CONTENT
|
||||
//-------------------------------------------------- */
|
||||
//
|
||||
///* Center align the text within the three columns below the carousel */
|
||||
//.marketing .col-lg-4 {
|
||||
// margin-bottom: 20px;
|
||||
// text-align: center;
|
||||
//}
|
||||
//.marketing h2 {
|
||||
// font-weight: normal;
|
||||
//}
|
||||
//.marketing .col-lg-4 p {
|
||||
// margin-right: 10px;
|
||||
// margin-left: 10px;
|
||||
//}
|
||||
//
|
||||
//
|
||||
///* Featurettes
|
||||
//------------------------- */
|
||||
//
|
||||
//.featurette-divider {
|
||||
// margin: 80px 0; /* Space out the Bootstrap <hr> more */
|
||||
//}
|
||||
//
|
||||
///* Thin out the marketing headings */
|
||||
//.featurette-heading {
|
||||
// font-weight: 300;
|
||||
// line-height: 1;
|
||||
// letter-spacing: -1px;
|
||||
//}
|
||||
//
|
||||
//
|
||||
///* RESPONSIVE CSS
|
||||
//-------------------------------------------------- */
|
||||
//
|
||||
//@media (min-width: 768px) {
|
||||
// /* Navbar positioning foo */
|
||||
// .navbar-wrapper {
|
||||
// margin-top: 20px;
|
||||
// }
|
||||
// .navbar-wrapper .container {
|
||||
// padding-right: 15px;
|
||||
// padding-left: 15px;
|
||||
// }
|
||||
// .navbar-wrapper .navbar {
|
||||
// padding-right: 0;
|
||||
// padding-left: 0;
|
||||
// }
|
||||
//
|
||||
// /* The navbar becomes detached from the top, so we round the corners */
|
||||
// .navbar-wrapper .navbar {
|
||||
// border-radius: 4px;
|
||||
// }
|
||||
//
|
||||
// /* Bump up size of carousel content */
|
||||
// .carousel-caption p {
|
||||
// margin-bottom: 20px;
|
||||
// font-size: 21px;
|
||||
// line-height: 1.4;
|
||||
// }
|
||||
//
|
||||
// .featurette-heading {
|
||||
// font-size: 50px;
|
||||
// }
|
||||
//}
|
||||
//
|
||||
//@media (min-width: 992px) {
|
||||
// .featurette-heading {
|
||||
// margin-top: 120px;
|
||||
// }
|
||||
//}
|
||||
//
|
||||
// //登录记住框样式
|
||||
//.checkbox {
|
||||
// margin-top: -10px;
|
||||
// margin-bottom: 10px;
|
||||
// span {
|
||||
// margin-left: 20px;
|
||||
// font-weight: normal;
|
||||
// }
|
||||
//}
|
||||
//
|
||||
//#session_remember_me {
|
||||
// width: auto;
|
||||
// margin-left: 0;
|
||||
//}
|
||||
|
||||
/* CUSTOMIZE THE NAVBAR
|
||||
-------------------------------------------------- */
|
||||
|
||||
/* mixins, variables, etc. */
|
||||
|
||||
$gray-medium-light: #eaeaea;
|
||||
$state-danger-text: #eaeaea;
|
||||
|
||||
@mixin box_sizing {
|
||||
-moz-box-sizing: border-box;
|
||||
-webkit-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.debug_dump {
|
||||
clear: both;
|
||||
float: left;
|
||||
width: 100%;
|
||||
margin-top: 45px;
|
||||
@include box_sizing;
|
||||
}
|
||||
|
||||
//错误信息提示
|
||||
#error_explanation {
|
||||
color: 红色;
|
||||
ul {
|
||||
color: 红色;
|
||||
margin: 0 0 30px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.field_with_errors {
|
||||
@extend .has-error;
|
||||
.form-control {
|
||||
color: $state-danger-text;
|
||||
}
|
||||
}
|
||||
|
||||
/* Special class on .container surrounding .navbar, used for positioning it into place. */
|
||||
.navbar-wrapper {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
left: 0;
|
||||
z-index: 20;
|
||||
}
|
||||
|
||||
/* Flip around the padding for proper display in narrow viewports */
|
||||
.navbar-wrapper > .container {
|
||||
padding-right: 0;
|
||||
padding-left: 0;
|
||||
}
|
||||
.navbar-wrapper .navbar {
|
||||
padding-right: 15px;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.navbar-wrapper .navbar .container {
|
||||
width: auto;
|
||||
}
|
||||
|
||||
|
||||
/* CUSTOMIZE THE CAROUSEL
|
||||
-------------------------------------------------- */
|
||||
|
||||
/* Carousel base class */
|
||||
.carousel {
|
||||
height: 500px;
|
||||
margin-bottom: 60px;
|
||||
}
|
||||
/* Since positioning the image, we need to help out the caption */
|
||||
.carousel-caption {
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
/* Declare heights because of positioning of img element */
|
||||
.carousel .item {
|
||||
height: 500px;
|
||||
background-color: #777;
|
||||
}
|
||||
.carousel-inner > .item > img {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
min-width: 100%;
|
||||
height: 500px;
|
||||
}
|
||||
|
||||
|
||||
/* MARKETING CONTENT
|
||||
-------------------------------------------------- */
|
||||
|
||||
/* Center align the text within the three columns below the carousel */
|
||||
.marketing .col-lg-4 {
|
||||
margin-bottom: 20px;
|
||||
text-align: center;
|
||||
}
|
||||
.marketing h2 {
|
||||
font-weight: normal;
|
||||
}
|
||||
.marketing .col-lg-4 p {
|
||||
margin-right: 10px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
|
||||
/* Featurettes
|
||||
------------------------- */
|
||||
|
||||
.featurette-divider {
|
||||
margin: 80px 0; /* Space out the Bootstrap <hr> more */
|
||||
}
|
||||
|
||||
/* Thin out the marketing headings */
|
||||
.featurette-heading {
|
||||
font-weight: 300;
|
||||
line-height: 1;
|
||||
letter-spacing: -1px;
|
||||
}
|
||||
|
||||
|
||||
/* RESPONSIVE CSS
|
||||
-------------------------------------------------- */
|
||||
|
||||
@media (min-width: 768px) {
|
||||
/* Navbar positioning foo */
|
||||
.navbar-wrapper {
|
||||
margin-top: 20px;
|
||||
}
|
||||
.navbar-wrapper .container {
|
||||
padding-right: 15px;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.navbar-wrapper .navbar {
|
||||
padding-right: 0;
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
/* The navbar becomes detached from the top, so we round the corners */
|
||||
.navbar-wrapper .navbar {
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
/* Bump up size of carousel content */
|
||||
.carousel-caption p {
|
||||
margin-bottom: 20px;
|
||||
font-size: 21px;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.featurette-heading {
|
||||
font-size: 50px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 992px) {
|
||||
.featurette-heading {
|
||||
margin-top: 120px;
|
||||
}
|
||||
}
|
||||
|
||||
//登录记住框样式
|
||||
.checkbox {
|
||||
margin-top: -10px;
|
||||
margin-bottom: 10px;
|
||||
span {
|
||||
margin-left: 20px;
|
||||
font-weight: normal;
|
||||
}
|
||||
}
|
||||
|
||||
#session_remember_me {
|
||||
width: auto;
|
||||
margin-left: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,15 +22,6 @@
|
|||
line-height:1.5;
|
||||
}
|
||||
|
||||
/*login页面头部内容*/
|
||||
@media (min-width: 500px) {
|
||||
.login{
|
||||
right:0 !important;
|
||||
width:84%;
|
||||
left:8%;
|
||||
}
|
||||
}
|
||||
|
||||
.login .modal-header .fa-home{
|
||||
font-size:16px !important;
|
||||
color: #cccccc;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -8,7 +8,7 @@ module ApplicationHelper
|
|||
# html_title 'Foo', 'Bar'
|
||||
# html_title # => 'Foo - Bar - My Project - Uask'
|
||||
def html_title(*args)
|
||||
base_title = "优答让创新更美好"
|
||||
base_title = "优答-专业的IT编程付费问答"
|
||||
if args.empty?
|
||||
title = @html_title || []
|
||||
title << params[:controller]
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,79 +1,181 @@
|
|||
<footer id="footer">
|
||||
<div id="sidebar-footer" class="footer-bg footer-widgets widget-area" role="complementary">
|
||||
<div class="container">
|
||||
<div class="sidebar-column col-md-4">
|
||||
<aside id="text-3" class="widget widget_text">
|
||||
<div class="textwidget">
|
||||
<p>
|
||||
<a href="https://itunes.apple.com/gb/app/litta/id1230895606?mt=8" target="_blank" rel="noopener"><img src="http://litta.co/wp-content/uploads/2017/06/App-Store-Icon-300x104.png" width="200"></a>
|
||||
</p>
|
||||
</div>
|
||||
</aside>
|
||||
</div>
|
||||
<footer class="footer footer-fixed-bottom ">
|
||||
<div class="container">
|
||||
<div class="row hidden-xs">
|
||||
<dl class="col-sm-2 site-link">
|
||||
<dt>网站相关</dt>
|
||||
<dd><a href="/rules" target="_blank">网站制度</a></dd>
|
||||
<dd><a href="/credit" target="_blank">信用点</a></dd>
|
||||
<dd><a href="/ranking" target="_blank">排行榜</a></dd>
|
||||
<dd><a href="/markdown" target="_blank">编辑器语法</a></dd>
|
||||
<dd><a href="/maps" target="_blank">网站导航</a></dd>
|
||||
</dl>
|
||||
<dl class="col-sm-2 site-link">
|
||||
<dt>联系合作</dt>
|
||||
<dd><a href="/about" target="_blank">关于我们</a></dd>
|
||||
<dd><a href="/contact" target="_blank">联系我们</a></dd>
|
||||
<dd><a href="/hiring" target="_blank">加入我们</a></dd>
|
||||
<dd><a href="/link" target="_blank">合作伙伴</a></dd>
|
||||
<dd><a href="/suggestion" target="_blank">投诉建议</a></dd>
|
||||
</dl>
|
||||
<dl class="col-sm-2 site-link">
|
||||
<dt>友情链接</dt>
|
||||
<dd><a href="http://ask.csdn.net/" target="_blank">CSDN</a> </dd>
|
||||
<dd><a href="https://segmentfault.com/" target="_blank">Segmentfault</a></dd>
|
||||
<dd><a href="https://stackoverflow.com" target="_blank">Stackoverflow</a></dd>
|
||||
<dd><a href="https://zhihu.com/" target="_blank">知乎</a></dd>
|
||||
</dl>
|
||||
<dl class="col-sm-2 site-link">
|
||||
<dt>特色栏目</dt>
|
||||
<dd><a href="/legal" target="_blank">法律援助</a></dd>
|
||||
<dd><a href="/trial" target="_blank">仲裁中心</a></dd>
|
||||
<dd><a href="/oldgoods" target="_blank">二手交易区</a></dd>
|
||||
<dd><a href="/mywish" target="_blank">许愿池</a></dd>
|
||||
</dl>
|
||||
<dl class="col-sm-2 site-link">
|
||||
<dt>运营状况</dt>
|
||||
<dd><a>注册人数：<span class="all-num">116,123,450</span></a></dd>
|
||||
<dd class="all-people"><a >在线人数：<span class="all-num">123,450</span></a></dd>
|
||||
<dd><a>今日问题数：<span class="all-num">123,450</span></a></dd>
|
||||
<dd><a>昨日问题数：<span class="all-num">123,450</span></a></dd>
|
||||
<dd><a>待解答问题数：<span class="all-num">123,450</span></a></dd>
|
||||
|
||||
<div class="sidebar-column col-md-4">
|
||||
<aside id="text-2" class="widget widget_text">
|
||||
<div class="textwidget">
|
||||
<p>Educoder</p>
|
||||
<p>Educoder start up was born in London 2017</p>
|
||||
<p>Email :
|
||||
<a href="mailto:hi@litta.co">635995834@qq.com </a>
|
||||
</p>
|
||||
<p>Phone :
|
||||
<a href="tel:+442081334104">+86 153 8808 3362</a>
|
||||
</p>
|
||||
<p>Whatsapp / Text:
|
||||
<a href="tel:+44%207380%20298654" target="_blank" rel="noopener">+447380 298654</a>
|
||||
</p>
|
||||
<p>© 2016 company, Inc. · <a href="#">Rrivacy</a> · <a href="#">Terms</a></p>
|
||||
</div>
|
||||
</aside>
|
||||
</div>
|
||||
|
||||
<div class="sidebar-column col-md-4">
|
||||
<aside id="yikes_easy_mc_widget-2" class="widget widget_yikes_easy_mc_widget">
|
||||
<h3 style="text-transform: uppercase;color: #c5c5c5;line-height: normal;margin: 5px 0 0;font-weight:600;padding-bottom:24px;font-size:16px;" class="widget-title">subscribe to our email newsletter</h3>
|
||||
<section id="yikes-mailchimp-container-1" class="yikes-mailchimp-container yikes-mailchimp-container-1 ">
|
||||
<form id="subcribe-1" class="yikes-easy-mc-form yikes-easy-mc-form-1 " action="" method="POST" data-attr-form-id="1">
|
||||
|
||||
<label for="EMAIL" class="EMAIL-label yikes-mailchimp-field-required ">
|
||||
|
||||
<!-- dictate label visibility -->
|
||||
<span class="EMAIL-label">
|
||||
Email Address </span>
|
||||
|
||||
<!-- Description Above -->
|
||||
|
||||
<input id="yikes-easy-mc-form-1-EMAIL" name="EMAIL" placeholder="" class="yikes-easy-mc-email " required="required" value="" type="email">
|
||||
|
||||
<!-- Description Below -->
|
||||
|
||||
</label>
|
||||
|
||||
<!-- Honeypot Trap -->
|
||||
<input name="yikes-mailchimp-honeypot" id="yikes-mailchimp-honeypot" value="" type="hidden">
|
||||
|
||||
<!-- List ID -->
|
||||
<input name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id" value="d444243e34" type="hidden">
|
||||
|
||||
<!-- The form that is being submitted! Used to display error/success messages above the correct form -->
|
||||
<input name="yikes-mailchimp-submitted-form" id="yikes-mailchimp-submitted-form" value="1" type="hidden">
|
||||
|
||||
<!-- Submit Button -->
|
||||
<button type="submit" class="yikes-easy-mc-submit-button yikes-easy-mc-submit-button-1 btn btn-primary "> <span class="yikes-mailchimp-submit-button-span-text">sign me up</span></button>
|
||||
<!-- Nonce Security Check -->
|
||||
<input id="yikes_easy_mc_new_subscriber" name="yikes_easy_mc_new_subscriber" value="3f79cb93c4" type="hidden"><input name="_wp_http_referer" value="/" type="hidden">
|
||||
</form>
|
||||
<!-- MailChimp Form generated by Easy Forms for MailChimp v6.3.20 (https://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/) -->
|
||||
|
||||
</section>
|
||||
</aside>
|
||||
</dl>
|
||||
<div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="foot-info">
|
||||
Copyright © 2011-2017 优答-UDask.com. 当前呈现版本 17.06.16<br>
|
||||
<a href="http://www.miibeian.gov.cn/" rel="nofollow">鄂ICP备 15005796号-2</a>
|
||||
<a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=33010602002000" rel="nofollow">鄂公网安备 33010602002000号</a>
|
||||
<span class="ml5">湖北优答网络科技有限公司版权所有</span><br>
|
||||
<span>除特别说明外，用户内容均采用 <a rel="license" target="_blank" href="https://creativecommons.org/licenses/by-nc-nd/4.0/">知识共享署名-非商业性使用-禁止演绎 4.0 国际许可协议</a> 进行许可</span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!--<div class="container">-->
|
||||
<!--<p class="pull-right"><a href="#">Back to top</a></p>-->
|
||||
</footer>
|
||||
<script type="text/javascript">
|
||||
$(function(){
|
||||
$("#editor-zh").markdown({language:'zh'})
|
||||
})
|
||||
</script>
|
||||
<script type="text/javascript">
|
||||
$(function () {
|
||||
//比较简洁，细节可自行完善
|
||||
$('#uploadSubmit').click(function () {
|
||||
var data = new FormData($('#uploadForm')[0]);
|
||||
$.ajax({
|
||||
url: 'xxx/xxx',
|
||||
type: 'POST',
|
||||
data: data,
|
||||
async: false,
|
||||
cache: false,
|
||||
contentType: false,
|
||||
processData: false,
|
||||
success: function (data) {
|
||||
console.log(data);
|
||||
if(data.status){
|
||||
console.log('upload success');
|
||||
}else{
|
||||
console.log(data.message);
|
||||
}
|
||||
},
|
||||
error: function (data) {
|
||||
console.log(data.status);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
})
|
||||
</script>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function () {
|
||||
$.goup({
|
||||
trigger: 20,
|
||||
bottomOffset:30,
|
||||
locationOffset: 20,
|
||||
title: '返回顶部',
|
||||
titleAsText: true
|
||||
});
|
||||
});</script>
|
||||
|
||||
|
||||
<!--<footer id="footer">-->
|
||||
<!--<div id="sidebar-footer" class="footer-bg footer-widgets widget-area" role="complementary">-->
|
||||
<!--<div class="container">-->
|
||||
<!--<div class="sidebar-column col-md-4">-->
|
||||
<!--<aside id="text-3" class="widget widget_text">-->
|
||||
<!--<div class="textwidget">-->
|
||||
<!--<p>-->
|
||||
<!--<a href="https://itunes.apple.com/gb/app/litta/id1230895606?mt=8" target="_blank" rel="noopener"><img src="http://litta.co/wp-content/uploads/2017/06/App-Store-Icon-300x104.png" width="200"></a>-->
|
||||
<!--</p>-->
|
||||
<!--</div>-->
|
||||
<!--</aside>-->
|
||||
<!--</div>-->
|
||||
|
||||
<!--<div class="sidebar-column col-md-4">-->
|
||||
<!--<aside id="text-2" class="widget widget_text">-->
|
||||
<!--<div class="textwidget">-->
|
||||
<!--<p>Educoder</p>-->
|
||||
<!--<p>Educoder start up was born in London 2017</p>-->
|
||||
<!--<p>Email :-->
|
||||
<!--<a href="mailto:hi@litta.co">635995834@qq.com </a>-->
|
||||
<!--</p>-->
|
||||
<!--<p>Phone :-->
|
||||
<!--<a href="tel:+442081334104">+86 153 8808 3362</a>-->
|
||||
<!--</p>-->
|
||||
<!--<p>Whatsapp / Text: -->
|
||||
<!--<a href="tel:+44%207380%20298654" target="_blank" rel="noopener">+447380 298654</a>-->
|
||||
<!--</p>-->
|
||||
<!--<p>© 2016 company, Inc. · <a href="#">Rrivacy</a> · <a href="#">Terms</a></p>-->
|
||||
<!--</div>-->
|
||||
<!--</aside>-->
|
||||
<!--</div>-->
|
||||
|
||||
<!--<div class="sidebar-column col-md-4">-->
|
||||
<!--<aside id="yikes_easy_mc_widget-2" class="widget widget_yikes_easy_mc_widget">-->
|
||||
<!--<h3 style="text-transform: uppercase;color: #c5c5c5;line-height: normal;margin: 5px 0 0;font-weight:600;padding-bottom:24px;font-size:16px;" class="widget-title">subscribe to our email newsletter</h3>-->
|
||||
<!--<section id="yikes-mailchimp-container-1" class="yikes-mailchimp-container yikes-mailchimp-container-1 ">-->
|
||||
<!--<form id="subcribe-1" class="yikes-easy-mc-form yikes-easy-mc-form-1 " action="" method="POST" data-attr-form-id="1">-->
|
||||
|
||||
<!--<label for="EMAIL" class="EMAIL-label yikes-mailchimp-field-required ">-->
|
||||
|
||||
<!--<!– dictate label visibility –>-->
|
||||
<!--<span class="EMAIL-label">-->
|
||||
<!--Email Address </span>-->
|
||||
|
||||
<!--<!– Description Above –>-->
|
||||
|
||||
<!--<input id="yikes-easy-mc-form-1-EMAIL" name="EMAIL" placeholder="" class="yikes-easy-mc-email " required="required" value="" type="email">-->
|
||||
|
||||
<!--<!– Description Below –>-->
|
||||
|
||||
<!--</label>-->
|
||||
|
||||
<!--<!– Honeypot Trap –>-->
|
||||
<!--<input name="yikes-mailchimp-honeypot" id="yikes-mailchimp-honeypot" value="" type="hidden">-->
|
||||
|
||||
<!--<!– List ID –>-->
|
||||
<!--<input name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id" value="d444243e34" type="hidden">-->
|
||||
|
||||
<!--<!– The form that is being submitted! Used to display error/success messages above the correct form –>-->
|
||||
<!--<input name="yikes-mailchimp-submitted-form" id="yikes-mailchimp-submitted-form" value="1" type="hidden">-->
|
||||
|
||||
<!--<!– Submit Button –>-->
|
||||
<!--<button type="submit" class="yikes-easy-mc-submit-button yikes-easy-mc-submit-button-1 btn btn-primary "> <span class="yikes-mailchimp-submit-button-span-text">sign me up</span></button>-->
|
||||
<!--<!– Nonce Security Check –>-->
|
||||
<!--<input id="yikes_easy_mc_new_subscriber" name="yikes_easy_mc_new_subscriber" value="3f79cb93c4" type="hidden"><input name="_wp_http_referer" value="/" type="hidden">-->
|
||||
<!--</form>-->
|
||||
<!--<!– MailChimp Form generated by Easy Forms for MailChimp v6.3.20 (https://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/) –>-->
|
||||
|
||||
<!--</section>-->
|
||||
<!--</aside>-->
|
||||
<!--</div>-->
|
||||
<!--</div>-->
|
||||
<!--</div>-->
|
||||
<!--<!–<div class="container">–>-->
|
||||
<!--<!–<p class="pull-right"><a href="#">Back to top</a></p>–>-->
|
||||
|
||||
</footer>
|
||||
<!--<!–</div>–>-->
|
||||
|
||||
<!--</footer>-->
|
||||
|
|
@ -79,6 +79,7 @@
|
|||
<!-- 注册登录-->
|
||||
<div class="login-rigster text-right">
|
||||
<!--登录-->
|
||||
<!--判断登录成功后显示的页面-->
|
||||
<% if logged? %>
|
||||
<div class="after_login">
|
||||
<ul class="members list-inline " >
|
||||
|
|
@ -138,7 +139,6 @@
|
|||
<span class="sr-only">私信</span><span id="letterCount" class="fa fa-envelope-o"> 已收私信</span>
|
||||
<span class="badge">35</span>
|
||||
</a>
|
||||
|
||||
</div>
|
||||
<hr>
|
||||
<div class="container-content">
|
||||
|
|
@ -183,6 +183,7 @@
|
|||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<!--判断用户未登录时显示的页面-->
|
||||
<% else %>
|
||||
<ul class="login_opt list-inline hidden-xs hidden-sm">
|
||||
<li>
|
||||
|
|
@ -191,9 +192,6 @@
|
|||
</li>
|
||||
</ul>
|
||||
<% end %>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- Start Side Menu -->
|
||||
|
|
@ -222,8 +220,8 @@
|
|||
</div>
|
||||
<div class="clearfix"></div>
|
||||
<!-- End Side Menu -->
|
||||
<!-- tag Menu -->
|
||||
</nav>
|
||||
<!--注册登录模态框-->
|
||||
</div>
|
||||
<div class="modal fade login animated" id="loginModal">
|
||||
<div class="modal-dialog login ">
|
||||
|
|
@ -244,7 +242,7 @@
|
|||
<a class="circle weixin" href="/auth/github"> <i class="fa fa-weixin" title="微信登录" aria-hidden="true"></i> </a>
|
||||
<a class="circle qq" href="/auth/github"> <i class="fa fa-qq" title="QQ登录" aria-hidden="true"></i> </a>
|
||||
<a class="circle weibo" href="/auth/github"> <i class="fa fa-weibo" title="微博登录" aria-hidden="true"></i> </a>
|
||||
<a class="circle zhihu" href="/auth/github"> <img src="<% image_path("zhihu.svg") %>" alt="知乎登录" /> </a>
|
||||
<a class="circle zhihu" href="/auth/github"> <img src="<%= image_path("zhihu.svg") %>" alt="知乎登录" /> </a>
|
||||
<a class="circle github" href="/auth/github"> <i class="fa fa-github" title="github登录" aria-hidden="true"></i> </a>
|
||||
<a id="google_login" class="circle google" href="/auth/google_oauth2"> <i class="fa fa-google fa-fw" title="google登录" aria-hidden="true"></i> </a>
|
||||
<a id="facebook_login" class="circle facebook " href="/auth/facebook"> <i class="fa fa-facebook fa-fw" title="facebook登录" aria-hidden="true"></i> </a>
|
||||
|
|
@ -261,13 +259,13 @@
|
|||
<form method="post" action="index.html" accept-charset="UTF-8">
|
||||
<label for="username" class="control-label">账户</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><span class="glyphicon glyphicon-user"></span></span>
|
||||
<span class="input-group-addon"><span class="fa fa-user fa-lg"></span></span>
|
||||
<input id="username" name="username" class="form-control" placeholder="账户名/邮箱/手机号" maxlength="20" type="text" />
|
||||
</div>
|
||||
<label class="control-label">密码</label>
|
||||
<span class="pull-right"><a href="/">忘记密码？</a></span>
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><span class="glyphicon glyphicon-lock"></span></span>
|
||||
<span class="input-group-addon"><span class="fa fa-lock fa-lg"></span></span>
|
||||
<input id="password" name="password" class="form-control" placeholder="请输入密码" maxlength="20" type="password" />
|
||||
</div>
|
||||
<div class="form-group clearfix">
|
||||
|
|
@ -285,7 +283,7 @@
|
|||
<div class="login-line hidden-xs hidden-sm"></div>
|
||||
<!-- 注册框-->
|
||||
<div class="box col-md-4 col-md-pull-3 col-sm-12 registerBox">
|
||||
<h4 class="user-register"><span class="glyphicon glyphicon-flag" aria-hidden="true"></span> 新用户注册</h4>
|
||||
<h4 class="user-register"><span class="fa fa-flag" aria-hidden="true"></span> 新用户注册</h4>
|
||||
<div class="form registerbox-content">
|
||||
<form method="post" action="/" autocomplete="off">
|
||||
|
||||
|
|
@ -305,39 +303,39 @@
|
|||
<div class="form-group has-feedback">
|
||||
<label for="username">用户名</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><span class="glyphicon glyphicon-user"></span></span>
|
||||
<span class="input-group-addon"><span class="fa fa-user fa-lg"></span></span>
|
||||
<input id="username" name="name" class="form-control" placeholder="请输入用户名" maxlength="20" type="text">
|
||||
</div>
|
||||
<span class="tips"></span>
|
||||
<span class=" glyphicon glyphicon-remove form-control-feedback"></span>
|
||||
<span class="glyphicon glyphicon-ok form-control-feedback"></span>
|
||||
<span class=" fa fa-remove form-control-feedback"></span>
|
||||
<span class="fa fa-check form-control-feedback"></span>
|
||||
</div>
|
||||
<div class="form-group has-feedback">
|
||||
<label for="phoneNum">手机号码</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><span class="glyphicon glyphicon-phone"></span></span>
|
||||
<span class="input-group-addon"><span class="fa fa-phone fa-lg"></span></span>
|
||||
<input id="phoneNum" name="phoneNum" class="form-control" placeholder="请输入手机号码" maxlength="11" type="text">
|
||||
</div>
|
||||
<span class="tips"></span>
|
||||
<span class="glyphicon glyphicon-remove form-control-feedback"></span>
|
||||
<span class="glyphicon glyphicon-ok form-control-feedback"></span>
|
||||
<span class="fa fa-remove form-control-feedback"></span>
|
||||
<span class="fa fa-check form-control-feedback"></span>
|
||||
</div>
|
||||
<div class="form-group has-feedback">
|
||||
<label for="idcode-btn">短信校验码</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><span class="glyphicon glyphicon-qrcode"></span></span>
|
||||
<span class="input-group-addon"><span class="fa fa-qrcode fa-lg"></span></span>
|
||||
<input id="idcode-btn" class="form-control" placeholder="请输入校验码" maxlength="4" type="text">
|
||||
<span class="input-group-btn"><button type="button" id="loadingButton" class="btn btn-primary" autocomplete="off">获取校验码</button></span>
|
||||
</div>
|
||||
<span class="tips"></span>
|
||||
<span class="glyphicon glyphicon-remove form-control-feedback"></span>
|
||||
<span class="glyphicon glyphicon-ok form-control-feedback"></span>
|
||||
<span class="fa fa-remove form-control-feedback"></span>
|
||||
<span class="fa fa-check form-control-feedback"></span>
|
||||
|
||||
</div>
|
||||
<div class="form-group has-feedback">
|
||||
<label for="idcode-btn">验证码</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><span class="glyphicon glyphicon-qrcode"></span></span>
|
||||
<span class="input-group-addon"><span class="fa fa-qrcode fa-lg"></span></span>
|
||||
<input id="idcodes-btn" class="form-control" placeholder="请输入验证码" value="" maxlength="4" type="text" />
|
||||
<div class="input-group-btn" id="idcode">
|
||||
<div id="ehong-code" class="ehong-idcode-val ehong-idcode-val0" href="#" onblur="return false" onfocus="return false" oncontextmenu="return false" onclick="$.idcode.setCode()">
|
||||
|
|
@ -349,8 +347,8 @@
|
|||
</div>
|
||||
</div>
|
||||
<span class="tips"></span>
|
||||
<span class="glyphicon glyphicon-remove form-control-feedback"></span>
|
||||
<span class="glyphicon glyphicon-ok form-control-feedback"></span>
|
||||
<span class="fa fa-remove form-control-feedback"></span>
|
||||
<span class="fa fa-check form-control-feedback"></span>
|
||||
</div>
|
||||
<div class="row regist-reset">
|
||||
<!--注册按钮-->
|
||||
|
|
@ -369,43 +367,43 @@
|
|||
<div class="form-group has-feedback">
|
||||
<label for="username">用户名</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><span class="glyphicon glyphicon-user"></span></span>
|
||||
<span class="input-group-addon"><span class="fa fa-user fa-lg"></span></span>
|
||||
<input id="username" name="name" class="form-control" placeholder="请输入用户名" maxlength="20" type="text">
|
||||
</div>
|
||||
<span class="tips"></span>
|
||||
<span class=" glyphicon glyphicon-remove form-control-feedback"></span>
|
||||
<span class="glyphicon glyphicon-ok form-control-feedback"></span>
|
||||
<span class=" fa fa-remove form-control-feedback"></span>
|
||||
<span class="fa fa-check form-control-feedback"></span>
|
||||
</div>
|
||||
<div class="form-group has-feedback">
|
||||
<label for="email" class="control-label">邮箱账号</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><span class="glyphicon glyphicon-envelope"></span></span>
|
||||
<span class="input-group-addon"><span class="fa fa-envelope fa-lg"></span></span>
|
||||
<input id="email" name="email" class="form-control" placeholder="ask@udask.com" maxlength="20" type="email" />
|
||||
</div>
|
||||
<span class="tips"></span>
|
||||
<span class="glyphicon glyphicon-remove form-control-feedback"></span>
|
||||
<span class="glyphicon glyphicon-ok form-control-feedback"></span></div>
|
||||
<span class="fa fa-remove form-control-feedback"></span>
|
||||
<span class="fa fa-check form-control-feedback"></span></div>
|
||||
<div class="form-group has-feedback">
|
||||
<label for="password" class="control-label">密码</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><span class="glyphicon glyphicon-lock"></span></span>
|
||||
<span class="input-group-addon"><span class="fa fa-lock fa-lg"></span></span>
|
||||
<input id="password" name="password" class="form-control" placeholder="请输入密码" maxlength="20" type="password" />
|
||||
</div>
|
||||
<span class="tips"></span>
|
||||
<span class="glyphicon glyphicon-remove form-control-feedback"></span>
|
||||
<span class="glyphicon glyphicon-ok form-control-feedback"></span></div>
|
||||
<span class="fa fa-remove form-control-feedback"></span>
|
||||
<span class="fa fa-check form-control-feedback"></span></div>
|
||||
<div class="form-group has-feedback">
|
||||
<label for="password" class="control-label">确认密码</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><span class="glyphicon glyphicon-lock"></span></span>
|
||||
<span class="input-group-addon"><span class="fa fa-lock fa-lg"></span></span>
|
||||
<input id="password" class="form-control" placeholder="请再次输入密码" maxlength="20" type="password" />
|
||||
</div> <span class="tips"></span>
|
||||
<span class="glyphicon glyphicon-remove form-control-feedback"></span>
|
||||
<span class="glyphicon glyphicon-ok form-control-feedback"></span></div>
|
||||
<span class="fa fa-remove form-control-feedback"></span>
|
||||
<span class="fa fa-check form-control-feedback"></span></div>
|
||||
<div class="form-group has-feedback">
|
||||
<label for="idcode-btn">验证码</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><span class="glyphicon glyphicon-qrcode"></span></span>
|
||||
<span class="input-group-addon"><span class="fa fa-qrcode fa-lg"></span></span>
|
||||
<input id="idcodes-btns" class="form-control" placeholder="请输入验证码" value="" maxlength="4" type="text" />
|
||||
<div class="input-group-btn" id="idcodes">
|
||||
<div id="ehong-code" class="ehong-idcode-val ehong-idcode-val0" href="#" onblur="return false" onfocus="return false" oncontextmenu="return false" onclick="$.idcodes.setCode()">
|
||||
|
|
@ -417,8 +415,8 @@
|
|||
</div>
|
||||
</div>
|
||||
<span class="tips"></span>
|
||||
<span class="glyphicon glyphicon-remove form-control-feedback"></span>
|
||||
<span class="glyphicon glyphicon-ok form-control-feedback"></span>
|
||||
<span class="fa fa-remove form-control-feedback"></span>
|
||||
<span class="fa fa-check form-control-feedback"></span>
|
||||
</div>
|
||||
<div class="row regist-reset">
|
||||
<!--注册按钮-->
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title><%= h html_title %></title>
|
||||
<title><%= html_title %></title>
|
||||
<title><%= provide html_title %></title>
|
||||
<meta name="description" content="为所有初级成长的、热爱计算机的、热爱编程的、热爱互联网的、热爱一切关于计算机的人员提供一个高质量的、时效保证的、专业的付费技术交流问答平台， 与所有高阶开发者一起学习、交流与成长，创造属于21世纪全员编程的时代！">
|
||||
<meta name="keywords" content="优答,udask,程序员之家,IT技术社区,编程社区,付费问答,编程语言问答,程序员招聘,程序员,编程,代码">
|
||||
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
|
||||
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
|
||||
<link rel="shortcut icon" href="<%= image_path("favicon.ico") %>" />
|
||||
<%= csrf_meta_tags %>
|
||||
<!--[if lt IE 9]>
|
||||
<!--<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/r29/html5.min.js">-->
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue