From e674d339b0c2c653751da85d94fbc0f86b0ee3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=9F=E9=85=8C=20=E9=B5=AC=E5=85=84?= Date: Sun, 10 Jul 2016 03:34:41 +0800 Subject: [PATCH] Style changes --- .../src/Astro/Build/Components/BuildList.css | 40 ++++++--- .../src/Astro/Build/Components/ItemList.css | 2 +- botanjs/src/Astro/Build/Element/Footer.css | 12 --- botanjs/src/Astro/Build/Element/Footer.js | 2 - botanjs/src/Astro/Build/Element/Header.css | 87 ------------------- botanjs/src/Astro/Build/Element/Header.js | 1 - botanjs/src/Astro/Build/Layout/MainFrame.css | 40 +++------ botanjs/src/Astro/Build/Layout/MainFrame.js | 14 --- 8 files changed, 37 insertions(+), 161 deletions(-) delete mode 100644 botanjs/src/Astro/Build/Element/Footer.css delete mode 100644 botanjs/src/Astro/Build/Element/Footer.js delete mode 100644 botanjs/src/Astro/Build/Element/Header.css delete mode 100644 botanjs/src/Astro/Build/Element/Header.js diff --git a/botanjs/src/Astro/Build/Components/BuildList.css b/botanjs/src/Astro/Build/Components/BuildList.css index 8aecb183..1cf92014 100644 --- a/botanjs/src/Astro/Build/Components/BuildList.css +++ b/botanjs/src/Astro/Build/Components/BuildList.css @@ -1,24 +1,36 @@ .build-list > a { font-family: monospace; - padding: 0.25em 0.25em; - margin: 0.25em 0; display: block; + + float: left; + line-height: 0; + + position: relative; + + margin: 1px; + padding: 1.5em; + + background-color: rgba( 0, 0, 0, 0 ); } -.build-list > a[data-status^="-"] > .newsha { - color: red; +.build-list > a:hover { + background-color: rgba( 0, 0, 0, 1 ); } -.build-list > a > .newsha { - color: green; +.build-list > a:after +, .build-list > a:before { + content: ""; + background-color: rgba( 0, 255, 0, 0.5 ); + + width: 3em; + height: 3em; + top: 0; + left: 0; + + position: absolute; } -.newsha { - color: white; -} - -.build-list > a * { - padding: 0.25em 0.5em; - margin: 0.25em 0; -} +.build-list > a[data-clone="false"]:before +, .build-list > a[data-build="false"]:after +{ background-color: rgba( 255, 0, 0, 0.5 ); } diff --git a/botanjs/src/Astro/Build/Components/ItemList.css b/botanjs/src/Astro/Build/Components/ItemList.css index 18a94676..0f033ed9 100644 --- a/botanjs/src/Astro/Build/Components/ItemList.css +++ b/botanjs/src/Astro/Build/Components/ItemList.css @@ -10,7 +10,7 @@ div.project-list > a { height: 50px; color: #909396; - background-color: #48494A; + background-color: rgba( 0, 0, 0, 0.8 ); font-size: 4em; diff --git a/botanjs/src/Astro/Build/Element/Footer.css b/botanjs/src/Astro/Build/Element/Footer.css deleted file mode 100644 index 1bd0f35a..00000000 --- a/botanjs/src/Astro/Build/Element/Footer.css +++ /dev/null @@ -1,12 +0,0 @@ -footer:before { - content: ''; - - width: 100%; - height: 0.5em; - - background-color: #3A68B2; - - display: block; -} - -.footer_bg { width: 75%; } diff --git a/botanjs/src/Astro/Build/Element/Footer.js b/botanjs/src/Astro/Build/Element/Footer.js deleted file mode 100644 index 35a52bce..00000000 --- a/botanjs/src/Astro/Build/Element/Footer.js +++ /dev/null @@ -1,2 +0,0 @@ -// __namespace( "Astro.Build.Element.Footer" ); -// __import( "Astro.Common.Element.Footer" ); diff --git a/botanjs/src/Astro/Build/Element/Header.css b/botanjs/src/Astro/Build/Element/Header.css deleted file mode 100644 index 37e9b3ad..00000000 --- a/botanjs/src/Astro/Build/Element/Header.css +++ /dev/null @@ -1,87 +0,0 @@ -header { - position: relative; - border-bottom: 0.5em solid #3A68B2; -} - -header:before { - content: ''; - - width: 100%; - - bottom: 0; - - display: block; - position: absolute; -} - -.left, .right { - width: 50%; - display: block; -} - -.right { - position: absolute; - top: 0; - right: 0; -} - -nav { - width: 75%; - margin: 0 auto; -} - -nav div ul { - list-style: none; - font-size: 1.5em; -} - -nav div ul:after { - content: ""; - clear: both; - display: block; -} - -nav div ul ul { - top: 100%; - left: 0; - - min-width: 5em; - - display: none; - position: absolute; -} -nav div ul li { - padding: 0.25em 0.5em 0 0.25em; - - float: right; - - position: relative; -} - -nav div ul li:hover { -} - -nav div ul li a { - color: #C2C5C9; -} - -nav div.right ul { float: right; } - - nav div ul li:hover > ul { - display: block; - } - -svg.banner-deco { - float: right; - width: 68em; - height: 10em; -} - -nav sup { - font-size: 50%; - vertical-align: top; -} - -.header-padder { - clear: both; -} diff --git a/botanjs/src/Astro/Build/Element/Header.js b/botanjs/src/Astro/Build/Element/Header.js deleted file mode 100644 index ff2238d8..00000000 --- a/botanjs/src/Astro/Build/Element/Header.js +++ /dev/null @@ -1 +0,0 @@ -// __namespace( "Astro.Build.Element.Header" ); diff --git a/botanjs/src/Astro/Build/Layout/MainFrame.css b/botanjs/src/Astro/Build/Layout/MainFrame.css index 89843cc1..b8c141bd 100644 --- a/botanjs/src/Astro/Build/Layout/MainFrame.css +++ b/botanjs/src/Astro/Build/Layout/MainFrame.css @@ -5,7 +5,7 @@ body { font-family: custom-sans; } -header, footer { background-color: #0C121B; } +.horizon { background-color: #3a68b2; } .content-wrapper { position: relative; @@ -28,40 +28,12 @@ header, footer { background-color: #0C121B; } overflow: hidden; } -.block_deco { - position: absolute; - - width: 100%; - height: 400px; - - bottom: 1000%;; - right: -27px; - - background: url("http://file.astropenguin.net/blog/layout-images/build - blockdeco.png") no-repeat right bottom; -} - -* html .begin-wrapper { height: 100%; } - -.working-in-progress { - width: 100%; - height: 2em; - - color: white; - background-color: black; - background-image: repeating-linear-gradient(-35deg, transparent, transparent 35px, yellow 35px, yellow 70px); - - position: relative; - display: block; -} - a { color: #3A68B2;/*#48494A;*/ text-decoration: none; } -a:hover { - text-decoration: underline; -} +a:hover { text-decoration: underline; } h1, h2, h3, h4 { font-family: custom-serif; } @@ -84,3 +56,11 @@ ul.breadcrumb > li:before { } .greyed { color: #C2C5C9; } + +footer { + background-image: url("http://file.astropenguin.net/blog/layout-images/build - blockdeco.png"); + background-position: 101% -150px; + background-repeat: no-repeat; + background-size: 30%; +} + diff --git a/botanjs/src/Astro/Build/Layout/MainFrame.js b/botanjs/src/Astro/Build/Layout/MainFrame.js index 7723092d..b4cf44f6 100644 --- a/botanjs/src/Astro/Build/Layout/MainFrame.js +++ b/botanjs/src/Astro/Build/Layout/MainFrame.js @@ -18,20 +18,6 @@ var init = function () { - var padder = Dand.id( "padder" ); - var wrapper = Dand.id( "wrapper" ); - var footer = Dand.tag( "footer" ); - - var fheight = 0; - if( footer.length ) - { - footer = footer[0]; - fheight = ( footer.scrollHeight || footer.offsetHeight ); - padder.style.height = fheight + "px"; - wrapper.style.marginBottom = "-" + padder.style.height; - } - - block_deco.style.bottom = ( fheight - 72 ) + "px"; initBackgroundParallax(); };