Skip to content

M
Moecube Store
Commit 6b54bcd3 authored by 神楽坂玲奈's avatar 神楽坂玲奈
Browse files
Options

decks

parent f98ac004
Show whitespace changes
Inline Side-by-side
Showing with 8926 additions and 116 deletions
assets/images/decks/ygopro.png
View replaced file @ f98ac004 View file @ 6b54bcd3
assets/images/decks/ygopro.png

2.2 KB | W: | H:

assets/images/decks/ygopro.png

920 Bytes | W: | H:

assets/images/decks/ygopro.png
assets/images/decks/ygopro.png
assets/images/decks/ygopro.png
assets/images/decks/ygopro.png
  • 2-up
  • Swipe
  • Onion skin
assets/javascripts/decks.coffee
View file @ 6b54bcd3
...@@ -351,7 +351,7 @@ class CardsController extends Spine.Controller ...@@ -351,7 +351,7 @@ class CardsController extends Spine.Controller
show: (e)-> show: (e)->
decks.show(e) decks.show(e)
template: -> template: ->
$('#search_cards_' + if $('.operate_area').hasClass('text') then 'text' else 'graphic' + '_template') $('#search_cards_' + (if $('.operate_area').hasClass('text') then 'text' else 'graphic') + '_template')
search: (name)-> search: (name)->
Card.fetch_by_name name, (cards)=> Card.fetch_by_name name, (cards)=>
@html @template().tmpl cards @html @template().tmpl cards
......
assets/javascripts/decks.js
View file @ 6b54bcd3
...@@ -764,7 +764,7 @@ ...@@ -764,7 +764,7 @@
}; };
CardsController.prototype.template = function() { CardsController.prototype.template = function() {
return $('#search_cards_' + ($('.operate_area').hasClass('text') ? 'text' : 'graphic' + '_template')); return $('#search_cards_' + ($('.operate_area').hasClass('text') ? 'text' : 'graphic') + '_template');
}; };
CardsController.prototype.search = function(name) { CardsController.prototype.search = function(name) {
...@@ -795,6 +795,7 @@ ...@@ -795,6 +795,7 @@
$("#deck_share_dialog").dialog({ $("#deck_share_dialog").dialog({
modal: true, modal: true,
autoOpen: false, autoOpen: false,
width: 600,
open: function() { open: function() {
$("#deck_url").val(decks.deck().url()); $("#deck_url").val(decks.deck().url());
$("#deck_url")[0].select(); $("#deck_url")[0].select();
...@@ -843,7 +844,7 @@ ...@@ -843,7 +844,7 @@
$("#drop_upload_dialog").dialog('close'); $("#drop_upload_dialog").dialog('close');
return decks.upload(event.dataTransfer.files); return decks.upload(event.dataTransfer.files);
}); });
$(".rename_ope").click(function() { $(".swith").click(function() {
$(".text,.graphic").toggleClass("graphic text"); $(".text,.graphic").toggleClass("graphic text");
return decks.render(); return decks.render();
}); });
......
assets/javascripts/mycard.coffee
View file @ 6b54bcd3
...@@ -6,22 +6,14 @@ $(document).ready -> ...@@ -6,22 +6,14 @@ $(document).ready ->
timeout:7200 timeout:7200
random:1 random:1
#version $.getJSON 'https://api.github.com/repos/zh99998/mycard/downloads?callback=?', (data)->
$.get '/mycard/download.url', (data)-> for download in data.data
if matched = data.match(/mycard-(.*)-win32\.7z/) if v = download.name.match(/mycard-(.*)-win32\.7z/)
$('#download_version').html matched[1] if !version or v[1] > version
version = v[1]
url = download.html_url
if version
$('#download_url').attr 'href', url
$('#download_version').html version
else else
$('#download_version').html '读取失败' $('#download_version').html '读取失败'
\ No newline at end of file
#link
$.getJSON '/links.json', (data)->
for link in data
$('<a />',
href: link.url
rel: "nofollow"
).append($('<img />',
title: link.name
alt: link.name
src: link.logo
)).appendTo('#links')
\ No newline at end of file
assets/javascripts/mycard.js
View file @ 6b54bcd3
...@@ -7,30 +7,25 @@ ...@@ -7,30 +7,25 @@
timeout: 7200, timeout: 7200,
random: 1 random: 1
}); });
$.get('/mycard/download.url', function(data) { return $.getJSON('https://api.github.com/repos/zh99998/mycard/downloads?callback=?', function(data) {
var matched; var download, url, v, version, _i, _len, _ref;
if (matched = data.match(/mycard-(.*)-win32\.7z/)) { _ref = data.data;
return $('#download_version').html(matched[1]); for (_i = 0, _len = _ref.length; _i < _len; _i++) {
download = _ref[_i];
if (v = download.name.match(/mycard-(.*)-win32\.7z/)) {
if (!version || v[1] > version) {
version = v[1];
url = download.html_url;
}
}
}
if (version) {
$('#download_url').attr('href', url);
return $('#download_version').html(version);
} else { } else {
return $('#download_version').html('读取失败'); return $('#download_version').html('读取失败');
} }
}); });
return $.getJSON('/links.json', function(data) {
var link, _i, _len, _results;
_results = [];
for (_i = 0, _len = data.length; _i < _len; _i++) {
link = data[_i];
_results.push($('<a />', {
href: link.url,
rel: "nofollow"
}).append($('<img />', {
title: link.name,
alt: link.name,
src: link.logo
})).appendTo('#links'));
}
return _results;
});
}); });
}).call(this); }).call(this);
assets/stylesheets/decks.less
View file @ 6b54bcd3
...@@ -4,7 +4,7 @@ body{margin:0;padding:0;background:#eee;} ...@@ -4,7 +4,7 @@ body{margin:0;padding:0;background:#eee;}
.floatleft{float:left;} .floatright{float:right;} .floatleft{float:left;} .floatright{float:right;}
.main_div{width:1000px;height:700px;margin:20px auto;border-radius:5px;} .main_div{width:1000px;height:700px;margin:20px auto;border-radius:5px;}
.main_left{width:300px;height:700px;border-radius:5px;} .main_left{width:300px;height:700px;border-radius:5px;}
.main_right{width:700px;height:700px;border-radius:0 5px 5px 0;} .main_right{width:700px;height:700px;border-radius:0 5px 5px 0;position:relative;}
/*左边区域*/ /*左边区域*/
...@@ -15,7 +15,7 @@ body{margin:0;padding:0;background:#eee;} ...@@ -15,7 +15,7 @@ body{margin:0;padding:0;background:#eee;}
a{color:#999999;text-decoration:none;} a{color:#999999;text-decoration:none;}
} }
.attr_name{width:60px;height:14px;padding:0 0 5px 0;margin:0 0 10px 0;color:#FFAD6E;font-size:12px;text-shadow:1px 1px 2px #eeeeee;border-bottom:1px dashed #cccccc;}//text-align:right; .attr_name{width:60px;height:14px;padding:0 0 5px 0;margin:0 0 10px 0;color:#FFAD6E;font-size:12px;text-shadow:1px 1px 2px #eeeeee;border-bottom:1px dashed #cccccc;}//text-align:right;
.attr_real{width:75px;height:14px;padding:0 0 5px 0;margin:0 0 10px 0;color:thead_bg#999999;font-size:12px;text-shadow:1px 1px 2px #eeeeee;border-bottom:1px dashed #cccccc;} .attr_real{width:75px;height:14px;padding:0 0 5px 0;margin:0 0 10px 0;color:thead_bg#999999;font-size:12px;text-shadow:1px 1px 2px #eeeeee;border-bottom:1px dashed #cccccc;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;}
.bottom_button_active{height:auto;width:auto;padding:8px 10px;margin:-1px 0 0 10px; border-left:1px solid #CCCCCC;border-top:1px solid #ffffff;border-right:1px solid #CCCCCC;border-bottom:1px solid #CCCCCC; font-size:12px;border-radius:0 0 5px 5px;background:#ffffff;} .bottom_button_active{height:auto;width:auto;padding:8px 10px;margin:-1px 0 0 10px; border-left:1px solid #CCCCCC;border-top:1px solid #ffffff;border-right:1px solid #CCCCCC;border-bottom:1px solid #CCCCCC; font-size:12px;border-radius:0 0 5px 5px;background:#ffffff;}
.bottom_button{height:auto;width:auto;padding:8px 10px;margin:-1px 0 0 10px;font-size:12px;border-radius:0 0 5px 5px;cursor:pointer;color:#999999;} .bottom_button{height:auto;width:auto;padding:8px 10px;margin:-1px 0 0 10px;font-size:12px;border-radius:0 0 5px 5px;cursor:pointer;color:#999999;}
.bottom_button:hover{color:#ffffff;background:#CCCCCC;} .bottom_button:hover{color:#ffffff;background:#CCCCCC;}
...@@ -64,7 +64,7 @@ body{margin:0;padding:0;background:#eee;} ...@@ -64,7 +64,7 @@ body{margin:0;padding:0;background:#eee;}
/*表格*/ /*表格*/
.main_area{ .main_area{
width:508px;height:518px;margin:20px 0 0 10px;box-shadow:-2px 3px 5px #eeeeee inset;border-bottom:1px solid #eeeeee;position:relative;overflow:hidden; width:508px;height:443px;margin:20px 0 0 10px;box-shadow:-2px 3px 5px #eeeeee inset;border-bottom:1px solid #eeeeee;position:relative;overflow:hidden;
table{position:absolute; table{position:absolute;
thead{ thead{
tr{ tr{
...@@ -138,6 +138,9 @@ body{margin:0;padding:0;background:#eee;} ...@@ -138,6 +138,9 @@ body{margin:0;padding:0;background:#eee;}
&:hover{cursor:pointer;background:#eee;} &:hover{cursor:pointer;background:#eee;}
} }
} }
.swith{display:block;height:12px;width:14px;float:left;background:url(/assets/images/decks/switch.png) -25px 0 no-repeat;margin:5px 0 0 5px;cursor:pointer;}
} }
.select_card{ .select_card{
width:150px;height:55px;padding:5px;border:1px solid #cccccc;background:#F9F9F9;border-radius:6px;margin:12px 0 0 0; width:150px;height:55px;padding:5px;border:1px solid #cccccc;background:#F9F9F9;border-radius:6px;margin:12px 0 0 0;
...@@ -149,6 +152,7 @@ body{margin:0;padding:0;background:#eee;} ...@@ -149,6 +152,7 @@ body{margin:0;padding:0;background:#eee;}
float:left;height:17px;padding:3px 0 0 3px;cursor:pointer;margin:-1px 0 0 3px;-moz-transition: all 0.5s ease-in;-webkit-transition: all 0.5s ease-in; float:left;height:17px;padding:3px 0 0 3px;cursor:pointer;margin:-1px 0 0 3px;-moz-transition: all 0.5s ease-in;-webkit-transition: all 0.5s ease-in;
&:hover{height:23px;padding:0;-moz-transition: all 0.5s ease-in-out;-webkit-transition: all 0.5s ease-in-out;} &:hover{height:23px;padding:0;-moz-transition: all 0.5s ease-in-out;-webkit-transition: all 0.5s ease-in-out;}
} }
/*重命名*/
.rename_ope{ .rename_ope{
float:right;height:17px;cursor:pointer;margin:1px 2px 0 0;-moz-transition: all 0.5s ease-in;-moz-transform: translate(0px) rotate(-180deg);-webkit-transition: all 0.5s ease-in;-webkit-transform: translate(0px) rotate(-180deg); float:right;height:17px;cursor:pointer;margin:1px 2px 0 0;-moz-transition: all 0.5s ease-in;-moz-transform: translate(0px) rotate(-180deg);-webkit-transition: all 0.5s ease-in;-webkit-transform: translate(0px) rotate(-180deg);
&:hover{-moz-transition: all 0.5s ease-in-out;-moz-transform: translate(0px) rotate(180deg);-webkit-transition: all 0.5s ease-in-out;-webkit-transform: translate(0px) rotate(180deg);} &:hover{-moz-transition: all 0.5s ease-in-out;-moz-transform: translate(0px) rotate(180deg);-webkit-transition: all 0.5s ease-in-out;-webkit-transform: translate(0px) rotate(180deg);}
...@@ -164,8 +168,9 @@ body{margin:0;padding:0;background:#eee;} ...@@ -164,8 +168,9 @@ body{margin:0;padding:0;background:#eee;}
&:hover{-moz-transition: all 0.5s ease-in-out;-webkit-transition: all 0.5s ease-in-out;background-position:0 -18px;} &:hover{-moz-transition: all 0.5s ease-in-out;-webkit-transition: all 0.5s ease-in-out;background-position:0 -18px;}
} }
.upload_ope{float:left;height:25px;padding:5px 0 0 5px;cursor:pointer;} .upload_ope{float:left;height:25px;padding:5px 0 0 5px;cursor:pointer;}
.save_ope{float:left;height:25px;padding:5px 0 0 6px;cursor:pointer;} .save_ope{float:left;height:24spx;padding:6px 0 0 6px;cursor:pointer;}
.mycard_ope{float:left;height:25px;padding:5px 0 0 6px;cursor:pointer;} .mycard_ope{float:left;height:24px;padding:6px 0 0 6px;cursor:pointer;
-webkit-filter: grayscale(100%);-moz-filter: grayscale(100%);-ms-filter: grayscale(100%);-o-filter: grayscale(100%);filter: grayscale(100%);filter: gray;}
/* 文字版 */ /* 文字版 */
.search_data.text{ .search_data.text{
...@@ -185,6 +190,7 @@ body{margin:0;padding:0;background:#eee;} ...@@ -185,6 +190,7 @@ body{margin:0;padding:0;background:#eee;}
/* 一个很神奇的现象，float: left不加的话，Jquery-UI的拖拽不好用，加上去之后没法拖到另一个卡组里... */ /* 一个很神奇的现象，float: left不加的话，Jquery-UI的拖拽不好用，加上去之后没法拖到另一个卡组里... */
} }
.swith{display:block;height:12px;width:12px;float:left;background:url(/assets/images/decks/switch.png);margin:5px 0 0 5px;cursor:pointer;}
.select_card{ .select_card{
width:498px;height:35px;padding:5px;border:1px solid #cccccc;background:#F9F9F9;border-radius:6px;margin:10px 0 0 8px; width:498px;height:35px;padding:5px;border:1px solid #cccccc;background:#F9F9F9;border-radius:6px;margin:10px 0 0 8px;
select{width:100px;float:left;border:1px solid #ccc;padding:1px;} select{width:100px;float:left;border:1px solid #ccc;padding:1px;}
...@@ -205,6 +211,7 @@ body{margin:0;padding:0;background:#eee;} ...@@ -205,6 +211,7 @@ body{margin:0;padding:0;background:#eee;}
} }
#deck_side{height:78px;} #deck_side{height:78px;}
#deck_extra{height:78px;} #deck_extra{height:78px;}
} }
.search_data.graphic{width:162px;height:700px;float:right;overflow: hidden; .search_data.graphic{width:162px;height:700px;float:right;overflow: hidden;
.search_frame{ .search_frame{
...@@ -213,7 +220,7 @@ body{margin:0;padding:0;background:#eee;} ...@@ -213,7 +220,7 @@ body{margin:0;padding:0;background:#eee;}
} }
.search_results{line-height:16px;} .search_results{line-height:16px;}
.main_area{ .main_area{
padding:8px 0 0 8px;width:144px;background:#fbfbfb; padding:8px 0 0 8px;width:144px;background:#fbfbfb;height:518px;
&:hover &:hover
{ {
.search_out_textTitle{color:#3366CC;transition:color 0.218s ease 0s;} .search_out_textTitle{color:#3366CC;transition:color 0.218s ease 0s;}
...@@ -256,3 +263,27 @@ body{margin:0;padding:0;background:#eee;} ...@@ -256,3 +263,27 @@ body{margin:0;padding:0;background:#eee;}
.ui-sortable{padding:5px 0 5px 10px;} .ui-sortable{padding:5px 0 5px 10px;}
.drop_upload .ui-dialog-titlebar{ display:none; } .drop_upload .ui-dialog-titlebar{ display:none; }
/*浮层*/
/*.ui-dialog{width:800px;height:800px;}*/
#deck_share_dialog{
position:relative;z-index:99999;font-size:12px;
.float_left{display:block;overflow:hidden;height:200px;width:250px;float:left;padding:20px 0 0 15px;}
.float_right{display:block;overflow:hidden;height:200px;width:250px;float:left;padding:20px 0 0 0;margin:0 0 0 30px;}
fieldset{
height:72px;border-top:1px solid #dddddd;padding:25px 0 0 0;
legend{text-align:center;padding:0 15px;margin:-3px 0 0 0;}
}
img{margin:-10px 0 0 50px;width:150px;height:150px;}
}
/*广告*/
.advertisement{position:absolute;display:block;z-index:999;width:468px;height:60px;border:1px solid #dddddd;bottom:25px;left:8px;background:#F9F9F9;border-radius:6px;text-align:center;line-height:60px;font-weight:bold;color:#999999;font-size:16px;letter-spacing:2px;cursor:pointer;}
assets/stylesheets/mycard.css
View file @ 6b54bcd3
...@@ -7,40 +7,40 @@ ...@@ -7,40 +7,40 @@
padding: 0; padding: 0;
} }
/* line 18, ../../app/assets/stylesheets/mycard.css.scss */
body { body {
background: #244470 url(../images/index/background.png); background: #244470 url(../images/index/background.png);
font-family: "\5FAE\8F6F\96C5\9ED1"; font-family: "\5FAE\8F6F\96C5\9ED1";
} }
/* line 22, ../../app/assets/stylesheets/mycard.css.scss */
a { a {
text-shadow: 1px 1px 1px #0C2549; text-shadow: 1px 1px 1px #0C2549;
text-decoration: none; text-decoration: none;
} }
/* line 26, ../../app/assets/stylesheets/mycard.css.scss */
#nav a { #nav a {
transition: all .3s ease-in-out; transition: all .3s ease-in-out;
text-decoration: none; text-decoration: none;
} }
/* line 30, ../../app/assets/stylesheets/mycard.css.scss */
#nav a:link { #nav a:link {
color: white; color: white;
} }
/* line 33, ../../app/assets/stylesheets/mycard.css.scss */
#nav a:hover { #nav a:hover {
color: white; color: white;
} }
/* line 36, ../../app/assets/stylesheets/mycard.css.scss */
#nav a:visited { #nav a:visited {
color: white; color: white;
} }
/* line 40, ../../app/assets/stylesheets/mycard.css.scss */
#nav { #nav {
width: 900px; width: 900px;
height: 50px; height: 50px;
...@@ -62,7 +62,7 @@ a { ...@@ -62,7 +62,7 @@ a {
background: linear-gradient(#3966ae, #263c7b); background: linear-gradient(#3966ae, #263c7b);
} }
/* line 54, ../../app/assets/stylesheets/mycard.css.scss */
.nav_logo { .nav_logo {
width: 120px; width: 120px;
height: 30px; height: 30px;
...@@ -77,7 +77,7 @@ a { ...@@ -77,7 +77,7 @@ a {
font-size: 24px; font-size: 24px;
} }
/* line 67, ../../app/assets/stylesheets/mycard.css.scss */
.nav_link { .nav_link {
min-width: 60px; min-width: 60px;
height: 30px; height: 30px;
...@@ -91,7 +91,7 @@ a { ...@@ -91,7 +91,7 @@ a {
text-align: center; text-align: center;
} }
/* line 80, ../../app/assets/stylesheets/mycard.css.scss */
#main { #main {
width: 99.99%; width: 99.99%;
height: 310px; height: 310px;
...@@ -102,7 +102,7 @@ a { ...@@ -102,7 +102,7 @@ a {
border-color: #e1e1e1; border-color: #e1e1e1;
} }
/* line 89, ../../app/assets/stylesheets/mycard.css.scss */
#main_sub { #main_sub {
width: 900px; width: 900px;
margin: 0 auto; margin: 0 auto;
...@@ -110,25 +110,25 @@ a { ...@@ -110,25 +110,25 @@ a {
height: 280px; height: 280px;
} }
/* line 95, ../../app/assets/stylesheets/mycard.css.scss */
#information { #information {
width: 390px; width: 390px;
float: left; float: left;
} }
/* line 99, ../../app/assets/stylesheets/mycard.css.scss */
.title { .title {
font-size: 45px; font-size: 45px;
font-weight: bold; font-weight: bold;
font-family: 'Nunito',sans-serif; font-family: 'Nunito',sans-serif;
} }
/* line 104, ../../app/assets/stylesheets/mycard.css.scss */
.subtitle { .subtitle {
font: 30px "\5FAE\8F6F\96C5\9ED1"; font: 30px "\5FAE\8F6F\96C5\9ED1";
} }
/* line 107, ../../app/assets/stylesheets/mycard.css.scss */
.subinc { .subinc {
font-size: 15px; font-size: 15px;
color: #525252; color: #525252;
...@@ -136,7 +136,7 @@ a { ...@@ -136,7 +136,7 @@ a {
margin: 0 0 0 100px; margin: 0 0 0 100px;
} }
/* line 113, ../../app/assets/stylesheets/mycard.css.scss */
#buttons{ #buttons{
margin:0; margin:0;
padding:0; padding:0;
...@@ -146,8 +146,8 @@ a { ...@@ -146,8 +146,8 @@ a {
#download { #download {
width: 200px; width: 200px;
height: 60px; height: 60px;
/*border: rgba(255, 255, 255, 0.3) solid 3px;*/
/*border-radius: 10px;*/
margin: 50px auto 0 50px; margin: 50px auto 0 50px;
display: inline-block; display: inline-block;
color: white; color: white;
...@@ -164,7 +164,7 @@ a { ...@@ -164,7 +164,7 @@ a {
#download_url:hover{ #download_url:hover{
text-shadow: 0px 0px 7px rgba(255, 255, 255, 0.8); text-shadow: 0px 0px 7px rgba(255, 255, 255, 0.8);
} }
/* line 121, ../../app/assets/stylesheets/mycard.css.scss */
.download_active { .download_active {
color: white; color: white;
text-shadow: 0px 0px 5px rgba(255, 255, 255, 0.6); text-shadow: 0px 0px 5px rgba(255, 255, 255, 0.6);
...@@ -187,7 +187,7 @@ a { ...@@ -187,7 +187,7 @@ a {
#download_sublist a:hover{ #download_sublist a:hover{
color:#072847; color:#072847;
} }
/* line 129, ../../app/assets/stylesheets/mycard.css.scss */
.download_information { .download_information {
color: #f1f1f1; color: #f1f1f1;
text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.4); text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.4);
...@@ -196,7 +196,7 @@ a { ...@@ -196,7 +196,7 @@ a {
text-align: center; text-align: center;
} }
/* line 136, ../../app/assets/stylesheets/mycard.css.scss */
#slider { #slider {
clear: both; clear: both;
width: 500px; width: 500px;
...@@ -211,7 +211,7 @@ a { ...@@ -211,7 +211,7 @@ a {
*top: 0; *top: 0;
} }
/* line 148, ../../app/assets/stylesheets/mycard.css.scss */
.show1 { .show1 {
width: 500px; width: 500px;
height: 275px; height: 275px;
...@@ -219,7 +219,7 @@ a { ...@@ -219,7 +219,7 @@ a {
border-radius: 10px; border-radius: 10px;
} }
/* line 155, ../../app/assets/stylesheets/mycard.css.scss */
.show2 { .show2 {
width: 500px; width: 500px;
height: 275px; height: 275px;
...@@ -227,7 +227,7 @@ a { ...@@ -227,7 +227,7 @@ a {
border-radius: 10px; border-radius: 10px;
} }
/* line 162, ../../app/assets/stylesheets/mycard.css.scss */
.show3 { .show3 {
width: 500px; width: 500px;
height: 275px; height: 275px;
...@@ -235,20 +235,20 @@ a { ...@@ -235,20 +235,20 @@ a {
border-radius: 10px; border-radius: 10px;
} }
/* line 169, ../../app/assets/stylesheets/mycard.css.scss */
footer { footer {
width: 900px; width: 900px;
margin: 0 auto; margin: 0 auto;
} }
/* line 173, ../../app/assets/stylesheets/mycard.css.scss */
footer h2 { footer h2 {
font: bold 15px/130% "\5FAE\8F6F\96C5\9ED1"; font: bold 15px/130% "\5FAE\8F6F\96C5\9ED1";
color: #2e2e2e; color: #2e2e2e;
text-shadow: 1px 1px 1px #dedede; text-shadow: 1px 1px 1px #dedede;
} }
/* line 178, ../../app/assets/stylesheets/mycard.css.scss */
#footer1 { #footer1 {
height: 200px; height: 200px;
width: 300px; width: 300px;
...@@ -257,14 +257,14 @@ footer h2 { ...@@ -257,14 +257,14 @@ footer h2 {
float: left; float: left;
} }
/* line 185, ../../app/assets/stylesheets/mycard.css.scss */
#footer1 a { #footer1 a {
font: 12px/130% "\5FAE\8F6F\96C5\9ED1"; font: 12px/130% "\5FAE\8F6F\96C5\9ED1";
color: #2a2a2a; color: #2a2a2a;
text-shadow: 1px 1px 1px #dedede; text-shadow: 1px 1px 1px #dedede;
} }
/* line 190, ../../app/assets/stylesheets/mycard.css.scss */
#footer2 { #footer2 {
height: 200px; height: 200px;
width: 300px; width: 300px;
...@@ -273,7 +273,7 @@ footer h2 { ...@@ -273,7 +273,7 @@ footer h2 {
float: left; float: left;
} }
/* line 197, ../../app/assets/stylesheets/mycard.css.scss */
#footer3 { #footer3 {
width: 280px; width: 280px;
float: left; float: left;
...@@ -281,16 +281,14 @@ footer h2 { ...@@ -281,16 +281,14 @@ footer h2 {
padding-left: 10px; padding-left: 10px;
} }
/* line 203, ../../app/assets/stylesheets/mycard.css.scss */
#footer3 a { #footer3 a {
font: 12px/130% "\5FAE\8F6F\96C5\9ED1"; font: 12px/130% "\5FAE\8F6F\96C5\9ED1";
color: #2a2a2a; color: #2a2a2a;
text-shadow: 1px 1px 1px #dedede; text-shadow: 1px 1px 1px #dedede;
} }
#footer2 img{border:0;}
#footer2 a {margin: 5px 3px 3px 5px;}
#menu sup {position: absolute; top: 5px;} #menu sup {position: absolute; top: 5px;}
\ No newline at end of file
#links img {width: 88px; height: 31px; border:0;}
#links a {margin: 5px 3px 3px 5px;}
\ No newline at end of file
decks/new/index.html
View file @ 6b54bcd3
...@@ -185,6 +185,114 @@ ...@@ -185,6 +185,114 @@
<td>暗</td> <td>暗</td>
<td>测试</td> <td>测试</td>
</tr> </tr>
<tr>
<td>黑羽-疾风之</td>
<td>效果·调整</td>
<td>1300</td>
<td>400</td>
<td>3 ☆</td>
<td>暗</td>
<td>测试</td>
</tr>
<tr>
<td>黑羽-疾风之</td>
<td>效果·调整</td>
<td>1300</td>
<td>400</td>
<td>3 ☆</td>
<td>暗</td>
<td>测试</td>
</tr>
<tr>
<td>黑羽-疾风之</td>
<td>效果·调整</td>
<td>1300</td>
<td>400</td>
<td>3 ☆</td>
<td>暗</td>
<td>测试</td>
</tr>
<tr>
<td>黑羽-疾风之</td>
<td>效果·调整</td>
<td>1300</td>
<td>400</td>
<td>3 ☆</td>
<td>暗</td>
<td>测试</td>
</tr>
<tr>
<td>黑羽-疾风之</td>
<td>效果·调整</td>
<td>1300</td>
<td>400</td>
<td>3 ☆</td>
<td>暗</td>
<td>测试</td>
</tr>
<tr>
<td>黑羽-疾风之</td>
<td>效果·调整</td>
<td>1300</td>
<td>400</td>
<td>3 ☆</td>
<td>暗</td>
<td>测试</td>
</tr>
<tr>
<td>黑羽-疾风之</td>
<td>效果·调整</td>
<td>1300</td>
<td>400</td>
<td>3 ☆</td>
<td>暗</td>
<td>测试</td>
</tr>
<tr>
<td>黑羽-疾风之</td>
<td>效果·调整</td>
<td>1300</td>
<td>400</td>
<td>3 ☆</td>
<td>暗</td>
<td>测试</td>
</tr>
<tr>
<td>黑羽-疾风之</td>
<td>效果·调整</td>
<td>1300</td>
<td>400</td>
<td>3 ☆</td>
<td>暗</td>
<td>测试</td>
</tr>
<tr>
<td>黑羽-疾风之</td>
<td>效果·调整</td>
<td>1300</td>
<td>400</td>
<td>3 ☆</td>
<td>暗</td>
<td>测试</td>
</tr>
<tr>
<td>黑羽-疾风之</td>
<td>效果·调整</td>
<td>1300</td>
<td>400</td>
<td>3 ☆</td>
<td>暗</td>
<td>测试</td>
</tr>
<tr>
<td>黑羽-疾风之</td>
<td>效果·调整</td>
<td>1300</td>
<td>400</td>
<td>3 ☆</td>
<td>暗</td>
<td>测试</td>
</tr>
</tbody> </tbody>
</table> </table>
</script> </script>
...@@ -265,6 +373,7 @@ ...@@ -265,6 +373,7 @@
</div> </div>
</div> </div>
<div class="main_right floatleft line"> <div class="main_right floatleft line">
<div class="advertisement" onclick="window.open('https://docs.google.com/spreadsheet/viewform?formkey=dHg2aWdqb0dJczBRRVBtenZXX24zcEE6MQ')">关于是否在此处添加广告的用户调查</div>
<div class="floatleft search_data graphic"> <div class="floatleft search_data graphic">
<div class="floatleft search_bar"> <div class="floatleft search_bar">
<form id="search"> <form id="search">
...@@ -360,7 +469,8 @@ ...@@ -360,7 +469,8 @@
<option id="name" value="">卡组</option> <option id="name" value="">卡组</option>
</select> </select>
<img class="add_ope" src="/assets/images/decks/add.png" alt="" title="新建"/> <img class="add_ope" src="/assets/images/decks/add.png" alt="" title="新建"/>
<img class="rename_ope" src="/assets/images/decks/rename.png" alt="" title="重命名"/> <!-- <img class="rename_ope" src="/assets/images/decks/rename.png" alt="" title="重命名"/> -->
<div class="swith" style=""></div>
</div> </div>
<div class="select_cardUnder"> <div class="select_cardUnder">
<div class="donwload_out" title="上传"> <div class="donwload_out" title="上传">
...@@ -368,10 +478,11 @@ ...@@ -368,10 +478,11 @@
<input id="deck_load" type="file" tabindex="-1"/> <input id="deck_load" type="file" tabindex="-1"/>
</div> </div>
</div> </div>
<div class="donwload_out" title="分享" id="deck_share"> <a href="#" class="donwload_out" title="下载" id="deck_url_ydk">
<div class="download_inner"></div> <div class="download_inner"></div>
</div> </a>
<a href="#" id="deck_url_ydk"><img class="save_ope" src="/assets/images/decks/save.png" alt="" title="保存"/></a> <!-- <a href="#" id="deck_url_ydk"><img class="save_ope" src="/assets/images/decks/save.png" alt="" title="保存"/></a> -->
<a href="#" id="deck_share"><img class="save_ope" src="/assets/images/decks/share.png" alt="" title="分享"/></a>
<a href="#" id="deck_url_mycard"><img class="mycard_ope" src="/assets/images/decks/ygopro.png" alt="" title="在ygopro中打开 (需要安装mycard)"/></a> <a href="#" id="deck_url_mycard"><img class="mycard_ope" src="/assets/images/decks/ygopro.png" alt="" title="在ygopro中打开 (需要安装mycard)"/></a>
</div> </div>
</div> </div>
...@@ -383,13 +494,14 @@ ...@@ -383,13 +494,14 @@
</div> </div>
</div> </div>
<div id="deck_share_dialog" title="share" style="display: none"> <div id="deck_share_dialog" title="share" style="display: none">
<div class="float_left">
<fieldset> <fieldset>
<legend>URL</legend> <legend align="center">URL</legend>
<input id="deck_url" readonly="readonly"/><br/> <input id="deck_url" readonly="readonly"/>
<button id="deck_url_shorten">shorten</button> <button id="deck_url_shorten" style="margin:0 0 0 5px;">shorten</button>
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>share</legend> <legend align="center">share</legend>
<!-- AddThis Button BEGIN --> <!-- AddThis Button BEGIN -->
<div class="addthis_toolbox addthis_default_style addthis_32x32_style"> <div class="addthis_toolbox addthis_default_style addthis_32x32_style">
<a class="addthis_button_preferred_1"></a> <a class="addthis_button_preferred_1"></a>
...@@ -400,10 +512,13 @@ ...@@ -400,10 +512,13 @@
<a class="addthis_counter addthis_bubble_style"></a> <a class="addthis_counter addthis_bubble_style"></a>
</div> </div>
</fieldset> </fieldset>
</div>
<div class="float_right">
<fieldset> <fieldset>
<legend>QR Code</legend> <legend align="center">QR Code</legend>
<img id="deck_url_qrcode"/> <img id="deck_url_qrcode"/>
</fieldset> </fieldset>
</div>
<script type="text/javascript" <script type="text/javascript"
src="http://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-504b398d148616ce&async=1"></script> src="http://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-504b398d148616ce&async=1"></script>
<!-- AddThis Button END --> <!-- AddThis Button END -->
......
vendor/javascripts/jquery-ui-1.9.1.custom.min.js
View file @ 6b54bcd3
This source diff could not be displayed because it is too large. You can view the blob instead.
vendor/javascripts/jquery-ui-1.9.1.custom.min1.js 0 → 100644
View file @ 6b54bcd3
This source diff could not be displayed because it is too large. You can view the blob instead.
vendor/javascripts/jscroll.js
View file @ 6b54bcd3
...@@ -68,7 +68,7 @@ $.fn.extend({ ...@@ -68,7 +68,7 @@ $.fn.extend({
var sl = dw - sw var sl = dw - sw
var bw = j.Btn.btn==true ? sw : 0; var bw = j.Btn.btn==true ? sw : 0;
if($(_self).children(".jscroll-c").height()==null){//存在性检测 if($(_self).children(".jscroll-c").height()==null){//存在性检测
$(_self).wrapInner("<div class='jscroll-c' style='top:0px;z-index:9999;zoom:1;position:relative'></div>"); $(_self).wrapInner("<div class='jscroll-c' style='top:0px;z-index:9;zoom:1;position:relative'></div>");
$(_self).children(".jscroll-c").prepend("<div style='height:0px;overflow:hidden'></div>"); $(_self).children(".jscroll-c").prepend("<div style='height:0px;overflow:hidden'></div>");
$(_self).append("<div class='jscroll-e' unselectable='on' style=' height:100%;top:0px;right:0;-moz-user-select:none;position:absolute;overflow:hidden;z-index:10000;'><div class='jscroll-u' style='position:absolute;top:0px;width:100%;left:0;background:blue;overflow:hidden'></div><div class='jscroll-h' unselectable='on' style='background:green;position:absolute;left:0;-moz-user-select:none;border:1px solid'></div><div class='jscroll-d' style='position:absolute;bottom:0px;width:100%;left:0;background:blue;overflow:hidden'></div></div>"); $(_self).append("<div class='jscroll-e' unselectable='on' style=' height:100%;top:0px;right:0;-moz-user-select:none;position:absolute;overflow:hidden;z-index:10000;'><div class='jscroll-u' style='position:absolute;top:0px;width:100%;left:0;background:blue;overflow:hidden'></div><div class='jscroll-h' unselectable='on' style='background:green;position:absolute;left:0;-moz-user-select:none;border:1px solid'></div><div class='jscroll-d' style='position:absolute;bottom:0px;width:100%;left:0;background:blue;overflow:hidden'></div></div>");
} }
......
Markdown is supported
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