Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5A3F617478 for ; Thu, 1 Oct 2015 12:59:48 +0000 (UTC) Received: (qmail 8996 invoked by uid 500); 1 Oct 2015 12:59:35 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 8938 invoked by uid 500); 1 Oct 2015 12:59:35 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 8924 invoked by uid 99); 1 Oct 2015 12:59:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Oct 2015 12:59:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7D319E08CE; Thu, 1 Oct 2015 12:59:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertkowalski@apache.org To: commits@couchdb.apache.org Date: Thu, 01 Oct 2015 12:59:35 -0000 Message-Id: <1ff6438a419e43cea0909f4d233ce350@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] fauxton commit: updated refs/heads/master to ebd9ced Repository: couchdb-fauxton Updated Branches: refs/heads/master 283daa92a -> ebd9ced89 rename queryoptions file we don't use camel case for file names PR: #535 PR-URL: https://github.com/apache/couchdb-fauxton/pull/535 Reviewed-By: Benjamin Keen Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/69b686e3 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/69b686e3 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/69b686e3 Branch: refs/heads/master Commit: 69b686e31cc0ea9f4c7eeb254dc061447995f2c9 Parents: 283daa9 Author: Robert Kowalski Authored: Wed Sep 23 12:09:13 2015 +0200 Committer: Robert Kowalski Committed: Thu Oct 1 14:59:01 2015 +0200 ---------------------------------------------------------------------- app/addons/documents/assets/less/documents.less | 2 +- .../documents/assets/less/query-options.less | 218 +++++++++++++++++++ .../documents/assets/less/queryOptions.less | 218 ------------------- 3 files changed, 219 insertions(+), 219 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/69b686e3/app/addons/documents/assets/less/documents.less ---------------------------------------------------------------------- diff --git a/app/addons/documents/assets/less/documents.less b/app/addons/documents/assets/less/documents.less index 9ece2e5..8868da9 100644 --- a/app/addons/documents/assets/less/documents.less +++ b/app/addons/documents/assets/less/documents.less @@ -13,7 +13,7 @@ @import "../../../../../assets/less/variables.less"; @import "../../../../../assets/less/bootstrap/variables.less"; @import "../../../../../assets/less/bootstrap/mixins.less"; -@import "queryOptions.less"; +@import "query-options.less"; @import "view-editor.less"; @import "changes.less"; @import "sidenav.less"; http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/69b686e3/app/addons/documents/assets/less/query-options.less ---------------------------------------------------------------------- diff --git a/app/addons/documents/assets/less/query-options.less b/app/addons/documents/assets/less/query-options.less new file mode 100644 index 0000000..7445036 --- /dev/null +++ b/app/addons/documents/assets/less/query-options.less @@ -0,0 +1,218 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy of +// the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations under +// the License. + +.tray-enter, +.tray-appear { + opacity: 0.01; + animation: slidefadeIn .2s ease-in; + -webkit-animation: slidefadeIn .2s ease-in; +} + +.tray-enter.tray-enter-active, +.tray-appear.tray-appear-active { + opacity: 1; +} + +@keyframes slidefadeIn { + from { + opacity: 0.01; + top: 30px + } + + to { + opacity: 1; + top: 55px; + } +} + +@keyframes slidefadeOut { + from { + opacity: 1; + top: 55px; + } + + to { + opacity: 0.01; + top: 30px + } +} + +.tray-leave { + opacity: 1; + animation: slidefadeOut .2s ease-out; + -webkit-animation: slidefadeOut .2s ease-out; + + &.tray-leave-active { + opacity: 0; + } +} + +#query-options-tray:before { + right: 140px; +} + +#query-options-tray { + width: 490px; + padding-top: 6px; + + .query-group:first-child { + margin-top: 0px; + padding-top: 0px; + } + + .icon-question-sign { + margin-left: 3px; + font-size: 17.5px; + } + + .query-group { + padding: 20px; + border-bottom: 1px solid #555; + } + + .query-group:last-child { + border-bottom: none; + } + .controls-group { + margin: 0; + } + .controls-group:last-child { + margin: 0; + } + + form { + overflow: auto; + margin-bottom: 0; + .dropdown.inline { + display: inline-block; + } + + #keys-input { + resize: none; + } + + #qoGroupLevelGroup { + width: 34%; + } + + .input-small { + width: 74px; + margin-left: 5px; + } + .checkbox { + padding: 0; + margin: 0; + } + .btn-success { + .border-radius(5px); + } + .btn-cancel, .btn-cancel:active { + background: none; + border: none; + box-shadow: none; + color: @red; + line-height: 1em; + } + select { + margin-top: -4px; + margin-bottom: 0px; + } + .include-end-key-row { + line-height: 20px; + margin-left: 8px; + } + } + + .toggle-btns { + .btn { + padding: 5px 12px 5px; + background: #727A82; + color: #fff; + font-size: 12px; + border: none; + } + .btn.active { + background: #fff; + color: @linkColorHover; + box-shadow: 2px 2px 0px rgba(0, 0, 0, 0.25) inset, 2px 2px 2px rgba(0, 0, 0, 0.15); + } + label:first-child { + .border-radius(5px 0 0 5px); + } + label:last-child { + .border-radius(0 5px 5px 0); + margin-left: 1px; + } + } + + label { + margin-right: 0; + font-size: 13px; + + /* + due to: https://code.google.com/p/chromium/issues/detail?id=411065 - that bug causes the checkbox state not to + update when the user clicks on labels quickly. It can be removed once the fix is in Chrome stable + */ + -webkit-user-select: none; + } + label.disabled { + color: #777777; + } + div.controls-group.well{ + height: 156px; + background: none; + border: none; + padding: 10px 0; + } + .row-fluid.fieldsets { + .inline { + width: 32%; + } + .inline:nth-child(3) { + text-align: right; + width: 34%; + } + } + .qo-main-fields-row .row-fluid.fieldsets { + .inline:nth-child(2) { + width: 30%; + } + .inline:nth-child(3) { + text-align: right; + width: 36%; + } + } + + .row-fluid.fieldsets { + margin-bottom: 5px; + :last-child { + margin-bottom: 2px; + } + } + + #skipRows { + margin-left: 5px; + } + .add-on { + height: 28px; + } + .hide { + display: none; + } + + .icon-question-sign:hover { + color: @linkColorHover; + } + .additionalParams { + margin-bottom: 2px; + } +} http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/69b686e3/app/addons/documents/assets/less/queryOptions.less ---------------------------------------------------------------------- diff --git a/app/addons/documents/assets/less/queryOptions.less b/app/addons/documents/assets/less/queryOptions.less deleted file mode 100644 index 7445036..0000000 --- a/app/addons/documents/assets/less/queryOptions.less +++ /dev/null @@ -1,218 +0,0 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy of -// the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. - -.tray-enter, -.tray-appear { - opacity: 0.01; - animation: slidefadeIn .2s ease-in; - -webkit-animation: slidefadeIn .2s ease-in; -} - -.tray-enter.tray-enter-active, -.tray-appear.tray-appear-active { - opacity: 1; -} - -@keyframes slidefadeIn { - from { - opacity: 0.01; - top: 30px - } - - to { - opacity: 1; - top: 55px; - } -} - -@keyframes slidefadeOut { - from { - opacity: 1; - top: 55px; - } - - to { - opacity: 0.01; - top: 30px - } -} - -.tray-leave { - opacity: 1; - animation: slidefadeOut .2s ease-out; - -webkit-animation: slidefadeOut .2s ease-out; - - &.tray-leave-active { - opacity: 0; - } -} - -#query-options-tray:before { - right: 140px; -} - -#query-options-tray { - width: 490px; - padding-top: 6px; - - .query-group:first-child { - margin-top: 0px; - padding-top: 0px; - } - - .icon-question-sign { - margin-left: 3px; - font-size: 17.5px; - } - - .query-group { - padding: 20px; - border-bottom: 1px solid #555; - } - - .query-group:last-child { - border-bottom: none; - } - .controls-group { - margin: 0; - } - .controls-group:last-child { - margin: 0; - } - - form { - overflow: auto; - margin-bottom: 0; - .dropdown.inline { - display: inline-block; - } - - #keys-input { - resize: none; - } - - #qoGroupLevelGroup { - width: 34%; - } - - .input-small { - width: 74px; - margin-left: 5px; - } - .checkbox { - padding: 0; - margin: 0; - } - .btn-success { - .border-radius(5px); - } - .btn-cancel, .btn-cancel:active { - background: none; - border: none; - box-shadow: none; - color: @red; - line-height: 1em; - } - select { - margin-top: -4px; - margin-bottom: 0px; - } - .include-end-key-row { - line-height: 20px; - margin-left: 8px; - } - } - - .toggle-btns { - .btn { - padding: 5px 12px 5px; - background: #727A82; - color: #fff; - font-size: 12px; - border: none; - } - .btn.active { - background: #fff; - color: @linkColorHover; - box-shadow: 2px 2px 0px rgba(0, 0, 0, 0.25) inset, 2px 2px 2px rgba(0, 0, 0, 0.15); - } - label:first-child { - .border-radius(5px 0 0 5px); - } - label:last-child { - .border-radius(0 5px 5px 0); - margin-left: 1px; - } - } - - label { - margin-right: 0; - font-size: 13px; - - /* - due to: https://code.google.com/p/chromium/issues/detail?id=411065 - that bug causes the checkbox state not to - update when the user clicks on labels quickly. It can be removed once the fix is in Chrome stable - */ - -webkit-user-select: none; - } - label.disabled { - color: #777777; - } - div.controls-group.well{ - height: 156px; - background: none; - border: none; - padding: 10px 0; - } - .row-fluid.fieldsets { - .inline { - width: 32%; - } - .inline:nth-child(3) { - text-align: right; - width: 34%; - } - } - .qo-main-fields-row .row-fluid.fieldsets { - .inline:nth-child(2) { - width: 30%; - } - .inline:nth-child(3) { - text-align: right; - width: 36%; - } - } - - .row-fluid.fieldsets { - margin-bottom: 5px; - :last-child { - margin-bottom: 2px; - } - } - - #skipRows { - margin-left: 5px; - } - .add-on { - height: 28px; - } - .hide { - display: none; - } - - .icon-question-sign:hover { - color: @linkColorHover; - } - .additionalParams { - margin-bottom: 2px; - } -}