diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 14:01:35 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-23 14:45:03 +0200 |
commit | 790aef362fd195adf97d8c780a7cbbbade27d51f (patch) | |
tree | 8be464687ab21806cfe9f7ada27098b563aa41b2 /examples/webkit/webkit-guide/css/css3_shadowBlur.css | |
parent | 9720efbd1035c2e939b0581163e6d804c713dd96 (diff) | |
parent | 07475c662eb73c833da2d461b8ef2702ca1e2cfb (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.qmake.conf
configure
src/corelib/global/qglobal.h
src/tools/qdoc/node.cpp
src/tools/qdoc/qdocdatabase.cpp
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
tools/configure/configureapp.cpp
Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
Diffstat (limited to 'examples/webkit/webkit-guide/css/css3_shadowBlur.css')
-rw-r--r-- | examples/webkit/webkit-guide/css/css3_shadowBlur.css | 145 |
1 files changed, 0 insertions, 145 deletions
diff --git a/examples/webkit/webkit-guide/css/css3_shadowBlur.css b/examples/webkit/webkit-guide/css/css3_shadowBlur.css deleted file mode 100644 index e65fcd5692..0000000000 --- a/examples/webkit/webkit-guide/css/css3_shadowBlur.css +++ /dev/null @@ -1,145 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt WebKit module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -body { - background : #aaaaaa; - font-family : sans-serif; -} - -body > section { - border-radius : 1em; - padding : 1em; - background : #ffffff; - margin-bottom : 10em; - min-height : 70%; -} - -.hidden { - display : none; -} - -.active { - color : blue; - cursor : pointer; - text-decoration : none; -} - -.nav > a { - display : inline-block; - width : 48px; - height : 48px; -} - -h1, h2 { - margin-top : 0em; - font-size : 18px; - text-align : center; -} - -h2 { - border-top : solid thin #aaaaaa; -} - -body > section.main { - position : absolute; - left : 0em; - right : 0em; - top : 5em; - min-height : 50%; - border-radius : 0.5em; - background : #aaaaaa; - padding : 0; -} - -section.main > article { - background : #ffffff; - padding : 1em; - margin : 1em 1em 10em 1em; - border-radius : 0.5em; -} - -section.nav { - z-index : 10; - border-radius : 0; - background : #aaaaaa; - background : transparent; - position : absolute;; - padding : 1em; - top : 0; - right : 0.0em; - left : 0.0em; -} - -nav { - padding : 0.5em; - border-radius : 0.5em; - background : #ffffff; - top : 10px; - text-align : justify; - height : 36px; - overflow : hidden; -} - -nav > a { - display : inline-block; - background-repeat : no-repeat; - height : 36px; - width : 36px; -} - -nav > a:active { - -webkit-transform : scale(0.8); -} - -#force_justify { - padding-left : 100%; -} - -.nav1 { background-image : url(../img/ic_he_032.png) } -.nav2 { background-image : url(../img/ic_o_032.png) } -.nav3 { background-image : url(../img/ic_ni_032.png) } -.nav4 { background-image : url(../img/ic_fe_032.png) } -.nav5 { background-image : url(../img/ic_na_032.png) } -.nav6 { background-image : url(../img/ic_zn_032.png) } - -nav { - -webkit-box-shadow : 0.5em 0.5em 0.5em #444444; -} - |