Merge branch 'master' into various_bugs
Conflicts: config/locales/en.yml config/locales/zh_tw.yml vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
This commit is contained in:
chris committed
commit
b40d4702d5
233 files changed
+3124
-5384
No files matched your search
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
@@ -1,69 +0,0 @@
|
||||
.clock{
|
||||
/* The .clock div. Created dynamically by jQuery */
|
||||
/*background-color:#252525;*/
|
||||
height:200px;
|
||||
width:200px;
|
||||
position:relative;
|
||||
overflow:hidden;
|
||||
float:left;
|
||||
}
|
||||
|
||||
.clock .rotate{
|
||||
/* There are two .rotate divs - one for each half of the background */
|
||||
position:absolute;
|
||||
width:200px;
|
||||
height:200px;
|
||||
top:0;
|
||||
left:0;
|
||||
}
|
||||
|
||||
.rotate.right{
|
||||
display:none;
|
||||
z-index:11;
|
||||
}
|
||||
|
||||
.clock .bg, .clock .front{
|
||||
width:100px;
|
||||
height:200px;
|
||||
/*background-color:#252525;*/
|
||||
position:absolute;
|
||||
top:0;
|
||||
}
|
||||
|
||||
.clock .display{
|
||||
/* Holds the number of seconds, minutes or hours respectfully */
|
||||
position:absolute;
|
||||
width:200px;
|
||||
font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif;
|
||||
z-index:20;
|
||||
color:#F5F5F5;
|
||||
font-size:60px;
|
||||
text-align:center;
|
||||
top:65px;
|
||||
left:0;
|
||||
|
||||
/* CSS3 text shadow: */
|
||||
text-shadow:4px 4px 5px #333333;
|
||||
}
|
||||
|
||||
/* The left part of the background: */
|
||||
|
||||
.clock .bg.left{ left:0; }
|
||||
|
||||
/* Individual styles for each color: */
|
||||
.orange .bg.left{ background:url(bg_orange.png) no-repeat left top; }
|
||||
.green .bg.left{ background:url(bg_green.png) no-repeat left top; }
|
||||
.blue .bg.left{ background:url(bg_blue.png) no-repeat left top; }
|
||||
|
||||
/* The right part of the background: */
|
||||
.clock .bg.right{ left:100px; }
|
||||
|
||||
.orange .bg.right{ background:url(bg_orange.png) no-repeat right top; }
|
||||
.green .bg.right{ background:url(bg_green.png) no-repeat right top; }
|
||||
.blue .bg.right{ background:url(bg_blue.png) no-repeat right top; }
|
||||
|
||||
|
||||
.clock .front.left{
|
||||
left:0;
|
||||
z-index:10;
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
<style type="text/css">
|
||||
.g_weather { position: relative; height: 198px; }
|
||||
.g_weather img { float: left; display: block; margin: 0; padding: 12px; }
|
||||
.g_weather .gw_recent {
|
||||
overflow: hidden;
|
||||
height: 96%;
|
||||
padding-top: 4%;
|
||||
}
|
||||
.g_weather .gw_weekly { display: none; }
|
||||
.g_weather .gw_location {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
bottom: 0;
|
||||
font-size: 15px;
|
||||
line-height: 20px;
|
||||
}
|
||||
.g_weather .gw_condition_des { font-size: 22px; }
|
||||
.g_weather .gw_temp { margin-top: 26px; }
|
||||
.g_weather .gw_temp_num { font-size: 56px; }
|
||||
.g_weather .gw_temp_unit { font-size: 26px; }
|
||||
.g_weather .gw_forecast {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
font-size: 13px;
|
||||
line-height: 20px;
|
||||
}
|
||||
</style>
|
||||
<div class="g_weather">
|
||||
<div class="gw_recent">
|
||||
<img src="desktop_widgets/4fa7817cc88514014d7c59c2/img/sunny.png" alt="sunny" class="gw_condition">
|
||||
<div class="gw_temp">
|
||||
<span class="gw_temp_num thmtxt">29</span><span class="gw_temp_unit thmtxt">°C</span>
|
||||
</div>
|
||||
<div class="gw_condition_des thmtxt">Sunny</div>
|
||||
</div>
|
||||
<div class="gw_weekly">
|
||||
weekly report
|
||||
</div>
|
||||
<div class="gw_location thmtxt">Hsin-Chu</div>
|
||||
<a href="" class="gw_forecast thmtxt">> Weekly Report</a>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
g_weather();
|
||||
</script>
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Executable
+1
@@ -0,0 +1 @@
|
||||
/* No Css */
|
||||
File renamed without changes.
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"author" : "Harry",
|
||||
"name" : "Browser",
|
||||
"shape" : "w2 h1",
|
||||
"version" : "1.0"
|
||||
}
|
||||
File renamed without changes.
+74
-81
@@ -1,81 +1,74 @@
|
||||
<link href="http://fonts.googleapis.com/css?family=Rationale|Orbitron" rel="stylesheet" type="text/css">
|
||||
<style>
|
||||
.clock{
|
||||
/* The .clock div. Created dynamically by jQuery */
|
||||
background-color:#111;
|
||||
height:75px;
|
||||
width:75px;
|
||||
position:relative;
|
||||
overflow:hidden;
|
||||
float:left;
|
||||
}
|
||||
|
||||
.clock .rotate{
|
||||
/* There are two .rotate divs - one for each half of the background */
|
||||
position:absolute;
|
||||
width:75px;
|
||||
height:75px;
|
||||
top:0;
|
||||
left:0;
|
||||
}
|
||||
|
||||
.rotate.right{
|
||||
display:none;
|
||||
z-index:9;
|
||||
}
|
||||
|
||||
.clock .bg, .clock .front{
|
||||
width:37.5px;
|
||||
height:75px;
|
||||
background-color:#111;
|
||||
position:absolute;
|
||||
top:0;
|
||||
}
|
||||
|
||||
.clock .display{
|
||||
/* Holds the number of seconds, minutes or hours respectfully */
|
||||
position:absolute;
|
||||
width:75px;
|
||||
font-family: Orbitron, sans-serif;
|
||||
z-index:17;
|
||||
color:#F5F5F5;
|
||||
font-size:21px;
|
||||
text-align:center;
|
||||
top:27.5px;
|
||||
left:0px;
|
||||
|
||||
}
|
||||
|
||||
/* The left part of the background: */
|
||||
|
||||
.clock .bg.left{ left:0px; }
|
||||
|
||||
/* Individual styles for each color: */
|
||||
.orange .bg.left{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_orange.png) no-repeat left top; }
|
||||
.green .bg.left{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_green.png) no-repeat left top; }
|
||||
.blue .bg.left{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_blue.png) no-repeat left top; }
|
||||
|
||||
/* The right part of the background: */
|
||||
.clock .bg.right{ left:37.5px; }
|
||||
|
||||
.orange .bg.right{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_orange.png) no-repeat right top; }
|
||||
.green .bg.right{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_green.png) no-repeat right top; }
|
||||
.blue .bg.right{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_blue.png) no-repeat right top; }
|
||||
|
||||
|
||||
.clock .front.left{
|
||||
left:0;
|
||||
z-index:15;
|
||||
}
|
||||
#fancyClock {
|
||||
position: absolute;
|
||||
overflow: hidden;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
margin: -36px 0 0 -114px;
|
||||
}
|
||||
</style>
|
||||
<div id="fancyClock"></div>
|
||||
<script>
|
||||
$('#fancyClock').tzineClock();
|
||||
</script>
|
||||
.clock{
|
||||
/* The .clock div. Created dynamically by jQuery */
|
||||
background-color:#111;
|
||||
height:75px;
|
||||
width:75px;
|
||||
position:relative;
|
||||
overflow:hidden;
|
||||
float:left;
|
||||
}
|
||||
|
||||
.clock .rotate{
|
||||
/* There are two .rotate divs - one for each half of the background */
|
||||
position:absolute;
|
||||
width:75px;
|
||||
height:75px;
|
||||
top:0;
|
||||
left:0;
|
||||
}
|
||||
|
||||
.rotate.right{
|
||||
display:none;
|
||||
z-index:9;
|
||||
}
|
||||
|
||||
.clock .bg, .clock .front{
|
||||
width:37.5px;
|
||||
height:75px;
|
||||
background-color:#111;
|
||||
position:absolute;
|
||||
top:0;
|
||||
}
|
||||
|
||||
.clock .display{
|
||||
/* Holds the number of seconds, minutes or hours respectfully */
|
||||
position:absolute;
|
||||
width:75px;
|
||||
font-family: Orbitron, sans-serif;
|
||||
z-index:17;
|
||||
color:#F5F5F5;
|
||||
font-size:21px;
|
||||
text-align:center;
|
||||
top:27.5px;
|
||||
left:0px;
|
||||
|
||||
}
|
||||
|
||||
/* The left part of the background: */
|
||||
|
||||
.clock .bg.left{ left:0px; }
|
||||
|
||||
/* Individual styles for each color: */
|
||||
.orange .bg.left{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_orange.png) no-repeat left top; }
|
||||
.green .bg.left{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_green.png) no-repeat left top; }
|
||||
.blue .bg.left{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_blue.png) no-repeat left top; }
|
||||
|
||||
/* The right part of the background: */
|
||||
.clock .bg.right{ left:37.5px; }
|
||||
|
||||
.orange .bg.right{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_orange.png) no-repeat right top; }
|
||||
.green .bg.right{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_green.png) no-repeat right top; }
|
||||
.blue .bg.right{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_blue.png) no-repeat right top; }
|
||||
|
||||
|
||||
.clock .front.left{
|
||||
left:0;
|
||||
z-index:15;
|
||||
}
|
||||
#fancyClock {
|
||||
position: absolute;
|
||||
overflow: hidden;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
margin: -36px 0 0 -114px;
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"author" : "Harry",
|
||||
"name" : "Clock",
|
||||
"shape" : "w2 h1",
|
||||
"version" : "1.0"
|
||||
|
||||
}
|
||||
Executable
+5
@@ -0,0 +1,5 @@
|
||||
<link href="http://fonts.googleapis.com/css?family=Rationale|Orbitron" rel="stylesheet" type="text/css">
|
||||
<div id="fancyClock"></div>
|
||||
<script>
|
||||
$('#fancyClock').tzineClock();
|
||||
</script>
|
||||
Regular → Executable
+1
-15
@@ -1,4 +1,3 @@
|
||||
<style>
|
||||
#search{border-radius: 5px; margin:10px;margin-top:25px;}
|
||||
input {
|
||||
border:none;
|
||||
@@ -18,17 +17,4 @@ input {
|
||||
text-align: center;
|
||||
color: #222;
|
||||
text-shadow: 0px 1px 1px #555;
|
||||
}
|
||||
</style>
|
||||
<center>
|
||||
<form id="search">
|
||||
<img src="desktop_widgets/4fa78140c88514014d7c59be/img/google_64.png" style='margin-right:10px;'><br />
|
||||
<input id="googlesearch">
|
||||
<input type="submit" style="display:none;">
|
||||
<br>
|
||||
<span id="eric">Powered by Eric</span>
|
||||
</form>
|
||||
</center>
|
||||
<script>
|
||||
search();
|
||||
</script>
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"author" : "Eric",
|
||||
"name" : "Google Search",
|
||||
"shape" : "w2 h1",
|
||||
"version" : "1.0"
|
||||
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
|
||||
<center>
|
||||
<form id="search">
|
||||
<img src="desktop_widgets/4fa78140c88514014d7c59be/img/google_64.png" style='margin-right:10px;' class="widget_image"><br />
|
||||
<input id="googlesearch">
|
||||
<input type="submit" style="display:none;">
|
||||
<br>
|
||||
<span id="eric">Powered by Eric</span>
|
||||
</form>
|
||||
</center>
|
||||
<script>
|
||||
search();
|
||||
</script>
|
||||
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,26 @@
|
||||
.g_weather { position: relative; height: 198px; }
|
||||
.g_weather img { float: left; display: block; margin: 0; padding: 12px; }
|
||||
.g_weather .gw_recent {
|
||||
overflow: hidden;
|
||||
height: 96%;
|
||||
padding-top: 4%;
|
||||
}
|
||||
.g_weather .gw_weekly { display: none; }
|
||||
.g_weather .gw_location {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
bottom: 0;
|
||||
font-size: 15px;
|
||||
line-height: 20px;
|
||||
}
|
||||
.g_weather .gw_condition_des { font-size: 22px; }
|
||||
.g_weather .gw_temp { margin-top: 26px; }
|
||||
.g_weather .gw_temp_num { font-size: 56px; }
|
||||
.g_weather .gw_temp_unit { font-size: 26px; }
|
||||
.g_weather .gw_forecast {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
font-size: 13px;
|
||||
line-height: 20px;
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"author" : "Devin",
|
||||
"name" : "Weather",
|
||||
"shape" : "w2 h2",
|
||||
"version" : "0.0"
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
<div class="g_weather">
|
||||
<div class="gw_recent">
|
||||
<img src="desktop_widgets/4fa7817cc88514014d7c59c2/img/sunny.png" alt="sunny" class="gw_condition widget_image">
|
||||
<div class="gw_temp">
|
||||
<span class="gw_temp_num thmtxt">29</span><span class="gw_temp_unit thmtxt">°C</span>
|
||||
</div>
|
||||
<div class="gw_condition_des thmtxt">Sunny</div>
|
||||
</div>
|
||||
<div class="gw_weekly">
|
||||
weekly report
|
||||
</div>
|
||||
<div class="gw_location thmtxt">Hsin-Chu</div>
|
||||
<a href="" class="gw_forecast thmtxt">> Weekly Report</a>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
g_weather();
|
||||
</script>
|
||||
File renamed without changes.
File renamed without changes.
Reference in new issue
Block a user