From 5370e4904c4ef2e048e62878da2214255fb5eab0 Mon Sep 17 00:00:00 2001 From: printempw Date: Sun, 11 Dec 2016 15:17:24 +0800 Subject: [PATCH] brand-new landing page --- resources/assets/src/sass/index.scss | 154 +++++++++++++++++++++------ resources/assets/src/sass/style.scss | 7 +- resources/views/index.tpl | 113 ++++++++++++++------ resources/views/skinlib/master.tpl | 13 ++- resources/views/vendor/language.tpl | 4 +- 5 files changed, 221 insertions(+), 70 deletions(-) diff --git a/resources/assets/src/sass/index.scss b/resources/assets/src/sass/index.scss index d59ffe22..1dcf1f18 100644 --- a/resources/assets/src/sass/index.scss +++ b/resources/assets/src/sass/index.scss @@ -2,7 +2,7 @@ * @Author: printempw * @Date: 2016-06-04 20:54:53 * @Last Modified by: printempw - * @Last Modified time: 2016-08-07 11:26:30 + * @Last Modified time: 2016-12-11 15:10:01 */ @import "style.scss"; @@ -18,51 +18,74 @@ body { background-repeat: no-repeat; background-position: center 0; - .main-header { - background-color: rgba(255, 255, 255, 0.2); + .main-header .navbar { + transition: color 0.25s ease-in-out, + border-color 0.25s ease-in-out, + background-color 0.25s ease-in-out; } .main-header .navbar-brand { - color: #5e5e5e; font-family: Minecraft, 'Segoe UI', 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif; border-right: 0; } .main-header .navbar .navbar-nav { - li { - a { - border: 0; - color: #5e5e5e; - } - - a:hover { - background: rgba(0,0,0,0.1); - color: #f6f6f6; - } - - .active > a { - background: rgba(0,0,0,0.1); - color: #f6f6f6; - } - } - .user-menu .user-image { border-radius: 10%; } } - .main-header .navbar .navbar-custom-menu .navbar-nav > li { - a { - border-left: 0; + .main-header.transparent { + .navbar-brand { + color: #5e5e5e; + } + + .navbar-header > a { + color: #5e5e5e; + } + + .navbar { + background-color: rgba(255, 255, 255, 0.2); + + .navbar-nav { + li { + a { + border: 0; + color: #5e5e5e; + } + + a:hover { + background: rgba(0,0,0,0.1); + color: #f6f6f6; + } + + .active > a { + background: rgba(0,0,0,0.1); + color: #f6f6f6; + } + } + + } + + .navbar-custom-menu .navbar-nav > li { + a.btn { + background-color: #0078e7; + border: 1px solid #0078e7; + } + } + } + + .nickname { + color: #5e5e5e; } } - .navbar { - background-color: rgba(255, 255, 255, 0.2); - } - - .navbar-header > a { - color: #5e5e5e; + .main-header .navbar .navbar-custom-menu .navbar-nav > li { + a.btn { + border-radius: 5px; + background: transparent; + border: 1px solid #fff; + } } .content-wrapper { @@ -85,10 +108,6 @@ body { } -.nickname { - color: #5e5e5e; -} - .splash-button { color: white; padding: 0.8em 2.5em; @@ -196,3 +215,70 @@ body { .container .button:hover { background-color: rgba(255, 255, 255, 0.2); } + +hr { + display: block; + height: 1px; + border: 0; + border-top: 1px solid #ccc; + margin: 1em 0; + padding: 0; +} + +.wrapper { + width: 100%; +} + +/* ========================================================================== + Wrap Sections + ========================================================================== */ + +/* intro Wrap */ + +#intro { + padding: 50px 0 50px; + border-top: #bdc3c7 solid 5px; + + i { + font-size: 80px; + } + + .col-lg-4 { + margin: 10px 0 50px; + } + + @media (min-width: 1200px) { + .col-lg-4 { + margin: 10px 0 20px; + } + } +} + +#footerwrap { + background-color: #2f2f2f; + color: white; + padding: 40px 0 50px; + text-align: left; + + .col-lg-6:last-child { + text-align: center; + padding-top: 50px; + } + + @media (min-width: 1200px) { + + .col-lg-6:last-child { + text-align: right; + padding-top: 20px; + } + } +} + +/* Copyright Wrap */ + +#copyright { + border-top: #2f2f2f solid 5px; + background: #222222; + padding: 16px 0 20px; + color: white +} diff --git a/resources/assets/src/sass/style.scss b/resources/assets/src/sass/style.scss index 849ada28..69e5b2f7 100644 --- a/resources/assets/src/sass/style.scss +++ b/resources/assets/src/sass/style.scss @@ -2,7 +2,7 @@ * @Author: printempw * @Date: 2016-06-04 20:55:09 * @Last Modified by: printempw - * @Last Modified time: 2016-11-17 15:06:31 + * @Last Modified time: 2016-12-11 14:07:33 */ $font_stack: Ubuntu, 'Segoe UI', 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif; @@ -203,6 +203,11 @@ input:-webkit-autofill { color: #333; } } + + /* hide the text on mobile phone pages */ + .description-text { + display: none; + } } .key { diff --git a/resources/views/index.tpl b/resources/views/index.tpl index fd3ba5d5..7c89a87b 100644 --- a/resources/views/index.tpl +++ b/resources/views/index.tpl @@ -12,10 +12,11 @@ -
-
-
+ + {!! bs_footer() !!} - - + diff --git a/resources/views/skinlib/master.tpl b/resources/views/skinlib/master.tpl index 03171d29..2af30d68 100644 --- a/resources/views/skinlib/master.tpl +++ b/resources/views/skinlib/master.tpl @@ -63,8 +63,6 @@ @endunless - - @include('vendor.language')