Merge pull request #3 from YaoZ0803/master

sql
Cide424 · Nov 12, 2016 · 4780c56 · 4780c56
2 parents becebc6 + fa33da1
commit 4780c56
Show file tree

Hide file tree

Showing 14 changed files with 3,594 additions and 8 deletions.
diff --git a/components/com_k2/css/k2.css b/components/com_k2/css/k2.css
@@ -477,7 +477,7 @@ div.catItemHeader {}
 	div.catItemHeader span.catItemDateCreated {color:#999;font-size:11px;}
 	div.catItemHeader h3.catItemTitle {padding:4px 0 4px 0;margin:0;}
 	div.catItemHeader h3.catItemTitle span {}
-	div.catItemHeader h3.catItemTitle span sup {font-size:12px;color:#CF1919;text-decoration:none;} /* superscript */
+	div.catItemHeader h3.catItemTitle span sup {font-size:15px;color:#CF1919;text-decoration:none;} /* superscript */
 	div.catItemHeader span.catItemAuthor {display:block;padding:0;margin:0;}
 	div.catItemHeader span.catItemAuthor a {}
 	div.catItemHeader span.catItemAuthor a:hover {}

diff --git a/images/289631.jpg b/images/289631.jpg
diff --git a/modules/mod_je_camera/cache/timthumb_int_1ecdda64857f91d5aed752e177fc6cbd.timthumb.txt b/modules/mod_je_camera/cache/timthumb_int_1ecdda64857f91d5aed752e177fc6cbd.timthumb.txt
diff --git a/modules/mod_je_camera/cache/timthumb_int_be274a47dabf6050ae4ca2dff7da371c.timthumb.txt b/modules/mod_je_camera/cache/timthumb_int_be274a47dabf6050ae4ca2dff7da371c.timthumb.txt
diff --git a/modules/mod_je_camera/cache/timthumb_int_c61d0ec1028111c53b93abffb6ce1ccc.timthumb.txt b/modules/mod_je_camera/cache/timthumb_int_c61d0ec1028111c53b93abffb6ce1ccc.timthumb.txt
diff --git a/modules/mod_je_camera/cache/timthumb_int_ffe539b4b270df3ba91fdf3e987a3979.timthumb.txt b/modules/mod_je_camera/cache/timthumb_int_ffe539b4b270df3ba91fdf3e987a3979.timthumb.txt
diff --git a/modules/mod_je_camera/css/mod-style.css b/modules/mod_je_camera/css/mod-style.css
@@ -1,6 +1,6 @@
 .pane-sliders .panel { border: none !important; }
 div.panel > h3 { height: 30px!important;padding:0!important; background: #fff!important; border: 1px solid #ccc; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; font: bold 18px/30px Arial, Helvetica, sans-serif}
-div.panel > h3 a { color: #333!important;}
+div.panel > h3 a { color: #111!important;}
 div.panel h3.pane-toggler-down{ background:#D5EEFF!important;border: 1px solid #A4CDE9!important; width:100%; height:100%}
 div.panel h3.pane-toggler-down a { color: #333!important; }
 .sub-heading {background:#D5EEFF!important;border: 1px solid #A4CDE9!important; color:#333!important;width:400px;  -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; font: bold 15px/30px Arial, Helvetica, sans-serif; display:block; padding:0 10px; text-align:left!important; margin:0 0 10px 0}

diff --git a/...ets/dev/t3/2b805d3e55f479678f9fc5e6222fc870-cache-t3-0dae412ad758fb5fdcfb69bc2035d3db.php b/...ets/dev/t3/2b805d3e55f479678f9fc5e6222fc870-cache-t3-0dae412ad758fb5fdcfb69bc2035d3db.php
@@ -1 +1 @@
-<?php die("Access Denied"); ?>#x#i:1477793784;
+<?php die("Access Denied"); ?>#x#i:1478848725;
diff --git a/...ets/dev/t3/2b805d3e55f479678f9fc5e6222fc870-cache-t3-65ac3e43898c85f3fc00fe8c1bd08469.php b/...ets/dev/t3/2b805d3e55f479678f9fc5e6222fc870-cache-t3-65ac3e43898c85f3fc00fe8c1bd08469.php
@@ -1 +1 @@
-<?php die("Access Denied"); ?>#x#i:1477793784;
+<?php die("Access Denied"); ?>#x#i:1478848725;
diff --git a/...ets/dev/t3/2b805d3e55f479678f9fc5e6222fc870-cache-t3-f08fe1bcc833476e6b35b54ef3635504.php b/...ets/dev/t3/2b805d3e55f479678f9fc5e6222fc870-cache-t3-f08fe1bcc833476e6b35b54ef3635504.php
@@ -1 +1 @@
-<?php die("Access Denied"); ?>#x#i:1477793784;
+<?php die("Access Denied"); ?>#x#i:1478848725;
diff --git a/templates/t3_bs3_blank/css/themes/dark/template.css b/templates/t3_bs3_blank/css/themes/dark/template.css
@@ -259,7 +259,7 @@ h2,
 }
 h3,
 .h3 {
-  font-size: 24px;
+  font-size: 15px;
 }
 h4,
 .h4 {

diff --git a/templates/t3_bs3_blank/css/themes/red/template.css b/templates/t3_bs3_blank/css/themes/red/template.css
@@ -259,7 +259,7 @@ h2,
 }
 h3,
 .h3 {
-  font-size: 24px;
+  font-size: 15px;
 }
 h4,
 .h4 {

diff --git a/templates/t3_bs3_blank/local/css/template.css b/templates/t3_bs3_blank/local/css/template.css
@@ -259,7 +259,7 @@ h2,
 }
 h3,
 .h3 {
-  font-size: 24px;
+  font-size: 15px;
 }
 h4,
 .h4 {

diff --git a/website.sql b/website.sql
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php die("Access Denied"); ?>#x#i:1477793784;
		<?php die("Access Denied"); ?>#x#i:1478848725;
-Original file line number
+Diff line change
@@ Expand Up / @@ -259,7 +259,7 @@ h2, @@
     }
     h3,
     .h3 {
-      font-size: 24px;
+      font-size: 15px;
     }
     h4,
     .h4 {
@@ Expand Down @@