commit bd966f2fac1b566aec65262f4e5a9a6b6d303faa
| author | 斟酌 鵬兄 <tgckpg@gmail.com> |
|---|
| date | 2015-11-24T11:23:30Z |
|---|
| subject | Https migrations |
|---|
commit bd966f2fac1b566aec65262f4e5a9a6b6d303faa
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date: 2015-11-24T11:23:30Z
Https migrations
---
botanjs/src/Astro/Blog/AstroEdit/Article.js | 4 +++-
botanjs/src/Astro/Blog/AstroEdit/SiteLibrary.css | 2 +-
.../Astro/Blog/AstroEdit/Visualizer/Snippet/Sound.js | 2 +-
botanjs/src/Astro/Blog/AstroEdit/_this.css | 2 +-
botanjs/src/Astro/Blog/AstroEdit/_this.js | 4 +++-
botanjs/src/Astro/Blog/Components/Entry/Mega.css | 10 ++++++----
botanjs/src/Astro/Blog/Components/Notification.css | 2 +-
botanjs/src/Astro/Blog/Components/Section.css | 20 +++++++++++++++++++-
botanjs/src/Astro/Blog/Element/Footer.css | 2 +-
botanjs/src/Astro/Blog/Element/Header.css | 6 +++---
botanjs/src/Astro/Blog/Layout/ErrorPages.css | 10 +++++-----
botanjs/src/Astro/Bootstrap.css | 6 +++---
12 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/botanjs/src/Astro/Blog/AstroEdit/Article.js b/botanjs/src/Astro/Blog/AstroEdit/Article.js
index faeedd0..a25955b 100644
--- a/botanjs/src/Astro/Blog/AstroEdit/Article.js
+++ b/botanjs/src/Astro/Blog/AstroEdit/Article.js
@@ -3,6 +3,8 @@
/** @type {System.Cycle} */
var Cycle = __import( "System.Cycle" );
+ /** @type {System.utils} */
+ var utils = __import( "System.utils" );
/** @type {System.utils.EventKey} */
var EventKey = __import( "System.utils.EventKey" );
/** @type {System.Debug} */
@@ -112,7 +114,7 @@
/** @type {_AstConf_.AstroEdit} */
var a_conf = Config.get( "AstroEdit" );
- var base_path = Config.get( "BasePath" );
+ var base_path = utils.siteProto( Config.get( "BasePath" ) );
/*{{{ preview fields */
var ae_p_fields = {
diff --git a/botanjs/src/Astro/Blog/AstroEdit/SiteLibrary.css b/botanjs/src/Astro/Blog/AstroEdit/SiteLibrary.css
index e5ac4f8..e25068a 100644
--- a/botanjs/src/Astro/Blog/AstroEdit/SiteLibrary.css
+++ b/botanjs/src/Astro/Blog/AstroEdit/SiteLibrary.css
@@ -96,7 +96,7 @@
}
.asl_smask[expand] {
- background-image: url(http://file.astropenguin.net/blog/layout-images/collapse.png);
+ background-image: url(/assets/layout-images/collapse.png);
background-position: center 2.5px;
background-repeat: no-repeat;
}
diff --git a/botanjs/src/Astro/Blog/AstroEdit/Visualizer/Snippet/Sound.js b/botanjs/src/Astro/Blog/AstroEdit/Visualizer/Snippet/Sound.js
index a654bc2..b8aa977 100644
--- a/botanjs/src/Astro/Blog/AstroEdit/Visualizer/Snippet/Sound.js
+++ b/botanjs/src/Astro/Blog/AstroEdit/Visualizer/Snippet/Sound.js
@@ -18,7 +18,7 @@
var sound = function (insertSnippet, snippetWrap, createContext, override)
{
var temp, i, j
- , defaultArt = "http://file.astropenguin.net/blog/layout-images/disc_s.png"
+ , defaultArt = "/assets/layout-images/disc_s.png"
, handler = function ()
{
// Input fields
diff --git a/botanjs/src/Astro/Blog/AstroEdit/_this.css b/botanjs/src/Astro/Blog/AstroEdit/_this.css
index a948732..3a46c2a 100644
--- a/botanjs/src/Astro/Blog/AstroEdit/_this.css
+++ b/botanjs/src/Astro/Blog/AstroEdit/_this.css
@@ -215,7 +215,7 @@
}
.ae_expand_btn, .ae_callapse_btn {
- background: url(http://file.astropenguin.net/blog/layout-images/collapse.png) center 2.5px no-repeat;
+ background: url(/assets/layout-images/collapse.png) center 2.5px no-repeat;
width: 100%;
height: 10px;
}
diff --git a/botanjs/src/Astro/Blog/AstroEdit/_this.js b/botanjs/src/Astro/Blog/AstroEdit/_this.js
index e013993..803d841 100644
--- a/botanjs/src/Astro/Blog/AstroEdit/_this.js
+++ b/botanjs/src/Astro/Blog/AstroEdit/_this.js
@@ -1,6 +1,8 @@
(function(){
var ns = __namespace( "Astro.Blog.AstroEdit" );
+ /** @type {System.utils} */
+ var utils = __import( "System.utils" );
/** @type {System.Cycle} */
var Cycle = __import( "System.Cycle" );
/** @type {Dandelion} */
@@ -29,7 +31,7 @@
//// Component initializations
/** @type {_AstConf_.AstroEdit} */
var a_conf = Config.get( "AstroEdit" );
- var base_path = Config.get( "BasePath" );
+ var base_path = utils.siteProto( Config.get( "BasePath" ) );
Cycle.next(
function()
diff --git a/botanjs/src/Astro/Blog/Components/Entry/Mega.css b/botanjs/src/Astro/Blog/Components/Entry/Mega.css
index 96e5251..6c9805f 100644
--- a/botanjs/src/Astro/Blog/Components/Entry/Mega.css
+++ b/botanjs/src/Astro/Blog/Components/Entry/Mega.css
@@ -24,8 +24,9 @@
text-decoration: none;
}
-.mega-entry .cCont > img {
+.mega-entry .cCont img {
position: absolute;
+ margin-top: -25%;
max-width: 100%;
}
@@ -97,17 +98,18 @@
.mega-entry .cCont > h2 {
position: absolute;
-
+ font-family: custom-sans;
padding: 0 0.2em;
text-shadow: 2px 2px 8px black;
+ color: #DDD;
z-index: 1;
}
.cDate {
- padding: 0.2em;
- font-size: 0.8em;
+ padding: 0.2em 0.5em;
+ font-size: 0.9em;
}
.cEOF {
height: 10px;
diff --git a/botanjs/src/Astro/Blog/Components/Notification.css b/botanjs/src/Astro/Blog/Components/Notification.css
index 1538844..3133732 100644
--- a/botanjs/src/Astro/Blog/Components/Notification.css
+++ b/botanjs/src/Astro/Blog/Components/Notification.css
@@ -100,7 +100,7 @@
}
.nt_icon_settings {
- background-image: url(http://file.astropenguin.net/blog/layout-images/settings.png);
+ background-image: url(/assets/layout-images/settings.png);
padding-left: 25px !important;
background-repeat: no-repeat;
}
diff --git a/botanjs/src/Astro/Blog/Components/Section.css b/botanjs/src/Astro/Blog/Components/Section.css
index e0e7d0f..12fab2f 100644
--- a/botanjs/src/Astro/Blog/Components/Section.css
+++ b/botanjs/src/Astro/Blog/Components/Section.css
@@ -1,9 +1,13 @@
.section-buttons > a {
display: inline-block;
+ position: relative;
+
color: white;
- margin: 0.5em 0.2em;
background-color: darkslategray;
+
+ margin: 0.5em 0.2em;
padding: 0.75em 0;
+
opacity: 0.5;
}
@@ -29,6 +33,20 @@
);
}
+.section-buttons > a[data-name="lifestyle"] {
+ text-shadow: 1px 1px 1px black;
+ background-image:
+ repeating-linear-gradient(
+ -15deg
+ , orangered 0%, orangered 16.6%
+ , lawngreen 16.6%, lawngreen 33.2%
+ , turquoise 33.2%, turquoise 49.8%
+ , darkorchid 49.8%, darkorchid 66.6%
+ , violetred 66.6%, violetred 83.3%
+ , royalblue 83.3%, royalblue
+ );
+}
+
.section-buttons > a > span {
padding: 0.75em 0.5em;
}
diff --git a/botanjs/src/Astro/Blog/Element/Footer.css b/botanjs/src/Astro/Blog/Element/Footer.css
index 1ce3144..626319d 100644
--- a/botanjs/src/Astro/Blog/Element/Footer.css
+++ b/botanjs/src/Astro/Blog/Element/Footer.css
@@ -1,6 +1,6 @@
footer {
background-color: #222;
- background-image: url(http://file.astropenguin.net/blog/layout-images/lines.png);
+ background-image: url(/assets/layout-images/lines.png);
background-repeat: no-repeat;
background-position: right bottom;
}
diff --git a/botanjs/src/Astro/Blog/Element/Header.css b/botanjs/src/Astro/Blog/Element/Header.css
index 12b5282..a87e5e6 100644
--- a/botanjs/src/Astro/Blog/Element/Header.css
+++ b/botanjs/src/Astro/Blog/Element/Header.css
@@ -54,7 +54,7 @@ header {
-webkit-box-shadow: inset 0 0 10px 0 black;
box-shadow: inset 0 0 10px 0 black;
- background-image: url(http://file.astropenguin.net/blog/layout-images/home.png);
+ background-image: url(/assets/layout-images/home.png);
background-position: 50% 90%;
position: absolute;
overflow: hidden;
@@ -80,7 +80,7 @@ header {
height: 100%;
width: 100%;
- background-image: url(http://file.astropenguin.net/blog/layout-images/home-blur.png);
+ background-image: url(/assets/layout-images/home-blur.png);
background-position: 50% 0;
background-repeat: no-repeat;
@@ -174,7 +174,7 @@ header {
left: 0;
width: 100%;
height: 100%;
- background:url(http://file.astropenguin.net/blog/layout-images/collapse.png) center 2.5px no-repeat;
+ background:url(/assets/layout-images/collapse.png) center 2.5px no-repeat;
}
#collapse_panel:hover {
diff --git a/botanjs/src/Astro/Blog/Layout/ErrorPages.css b/botanjs/src/Astro/Blog/Layout/ErrorPages.css
index 376f5ad..395964c 100644
--- a/botanjs/src/Astro/Blog/Layout/ErrorPages.css
+++ b/botanjs/src/Astro/Blog/Layout/ErrorPages.css
@@ -58,9 +58,9 @@ html, body { height: 100%; }
height: 90px;
}
-.c401 { background: url(http://file.astropenguin.net/blog/layout-images/errorcodes.png) 0 0; }
-.c403 { background: url(http://file.astropenguin.net/blog/layout-images/errorcodes.png) 200px 0; }
-.c404 { background: url(http://file.astropenguin.net/blog/layout-images/errorcodes.png) 0 90px; }
+.c401 { background: url(/assets/layout-images/errorcodes.png) 0 0; }
+.c403 { background: url(/assets/layout-images/errorcodes.png) 200px 0; }
+.c404 { background: url(/assets/layout-images/errorcodes.png) 0 90px; }
.b401 { background: cornflowerblue; }
.b403 { background: crimson; }
@@ -89,11 +89,11 @@ html, body { height: 100%; }
margin-left: -200px;
margin-top: -200px;
- background: url(http://file.astropenguin.net/blog/layout-images/ring.png) center center no-repeat;
+ background: url(/assets/layout-images/ring.png) center center no-repeat;
}
h1 {
font-family: sans-serif;
font-size: 4em;
-}
\ No newline at end of file
+}
diff --git a/botanjs/src/Astro/Bootstrap.css b/botanjs/src/Astro/Bootstrap.css
index abef077..fda2212 100644
--- a/botanjs/src/Astro/Bootstrap.css
+++ b/botanjs/src/Astro/Bootstrap.css
@@ -2,7 +2,7 @@
@font-face{
font-family: custom-sans;
src: local("GIRegular"),
- url("http://file.astropenguin.net/blog/fonts/GI-Regular.woff") format("woff"),
+ url("/assets/fonts/GI-Regular.woff") format("woff"),
local("Helvetica-Light"),
local("Avenir"),
local("Verdana"),
@@ -15,8 +15,8 @@
@font-face{
font-family: custom-serif;
- src: url("http://file.astropenguin.net/blog/fonts/DAYROM__/DAYROM__.woff") format("woff"),
- url("http://file.astropenguin.net/blog/fonts/DAYROM__/DAYROM__.svg") format("svg"),
+ src: url("/assets/fonts/DAYROM__/DAYROM__.woff") format("woff"),
+ url("/assets/fonts/DAYROM__/DAYROM__.svg") format("svg"),
local("Palatino Linotype"),
local("Palatino"),
local("Georgia"),