Repository: couchdb-fauxton Updated Branches: refs/heads/master 57aadfbb3 -> 9e5cf9fe3
Minor CSS tweaks After speaking with Justin, I made a small tweak to the header CSS which ensures the spacing between the API and OPTIONS header buttons and their icons was consistent regardless of viewport size. That lead to a few other small CSS tweaks to ensure it works on all screen sizes. Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/9e5cf9fe Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/9e5cf9fe Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/9e5cf9fe Branch: refs/heads/master Commit: 9e5cf9fe37ed4f71377f2b03392318c258b5d762 Parents: 57aadfb Author: Ben Keen <ben.k...@gmail.com> Authored: Mon Jan 18 12:59:18 2016 -0800 Committer: Ben Keen <ben.k...@gmail.com> Committed: Tue Jan 19 09:25:35 2016 -0800 ---------------------------------------------------------------------- .../assets/less/header-togglebutton.less | 5 +- app/addons/databases/assets/less/databases.less | 2 +- app/addons/documents/assets/less/documents.less | 3 +- .../documents/assets/less/query-options.less | 2 +- app/addons/documents/routes-mango.js | 2 - app/addons/fauxton/assets/less/components.less | 2 +- assets/less/fauxton.less | 71 +++++--------------- 7 files changed, 27 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9e5cf9fe/app/addons/components/assets/less/header-togglebutton.less ---------------------------------------------------------------------- diff --git a/app/addons/components/assets/less/header-togglebutton.less b/app/addons/components/assets/less/header-togglebutton.less index e804204..33834ca 100644 --- a/app/addons/components/assets/less/header-togglebutton.less +++ b/app/addons/components/assets/less/header-togglebutton.less @@ -25,9 +25,12 @@ font-size: 20px; &:before { float: left; - margin: 10px 6px 0 0; + margin: 10px 0 0 0; } } + span { + margin-left: 6px; + } .icon.fontawesome { &:before { margin: 6px 6px 0 0; http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9e5cf9fe/app/addons/databases/assets/less/databases.less ---------------------------------------------------------------------- diff --git a/app/addons/databases/assets/less/databases.less b/app/addons/databases/assets/less/databases.less index ddf616c..58763a5 100644 --- a/app/addons/databases/assets/less/databases.less +++ b/app/addons/databases/assets/less/databases.less @@ -36,7 +36,7 @@ .new-database-tray { padding: 16px 20px 28px; &:before { - right: 243px; + right: 206px; } input.input-xxlarge { http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9e5cf9fe/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 f8aca08..0ea173a 100644 --- a/app/addons/documents/assets/less/documents.less +++ b/app/addons/documents/assets/less/documents.less @@ -159,8 +159,9 @@ button.string-edit[disabled] { } } -#react-headerbar { +body #dashboard #react-headerbar { float: left; + overflow: hidden; } .doc-editor-extension-icons { http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9e5cf9fe/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 index 94421cd..e9556d2 100644 --- a/app/addons/documents/assets/less/query-options.less +++ b/app/addons/documents/assets/less/query-options.less @@ -57,7 +57,7 @@ } #query-options-tray:before { - right: 175px; + right: 180px; } #query-options-tray { http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9e5cf9fe/app/addons/documents/routes-mango.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/routes-mango.js b/app/addons/documents/routes-mango.js index c5410e8..379150b 100644 --- a/app/addons/documents/routes-mango.js +++ b/app/addons/documents/routes-mango.js @@ -70,8 +70,6 @@ function (app, FauxtonAPI, Helpers, BaseRoute, Databases, }, findUsingIndex: function () { - console.log(this.database); - var params = this.createParams(), urlParams = params.urlParams, mangoResultCollection = new Resources.MangoDocumentCollection(null, { http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9e5cf9fe/app/addons/fauxton/assets/less/components.less ---------------------------------------------------------------------- diff --git a/app/addons/fauxton/assets/less/components.less b/app/addons/fauxton/assets/less/components.less index dfa9d4d..4202efa 100644 --- a/app/addons/fauxton/assets/less/components.less +++ b/app/addons/fauxton/assets/less/components.less @@ -38,7 +38,7 @@ } .api-bar-tray:before { - right: 95px; + right: 80px; } .clipboard-copy-element { http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9e5cf9fe/assets/less/fauxton.less ---------------------------------------------------------------------- diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less index 9cad9a5..1a36c96 100644 --- a/assets/less/fauxton.less +++ b/assets/less/fauxton.less @@ -624,8 +624,11 @@ footer.pagination-footer { } } -.control-toggle-include-docs span::before { - content: "Include Docs"; +body .control-toggle-include-docs span { + margin-left: 0; + &::before { + content: "Include Docs"; + } } @media (max-width: 1177px) { @@ -634,34 +637,22 @@ footer.pagination-footer { .two-panel-header { .control-toggle-include-docs span::before { content: " Docs"; - margin-left: 5px; - } - i.icon.fonticon-link:before, - i.icon.fonticon-gears:before { - margin: 10px 0px 0 0; - } - .icon.fontawesome { - margin: 0 -6px 0 0px; } - .right-header button i:before{ + .right-header button i:before { margin: 2px 0 0 0; } - #query-options-tray:before { - right: 136px - } } } } } -@media (max-width: 1104px) { +@media (max-width: 1120px) { body.closeMenu { .with-sidebar { .two-panel-header { .control-toggle-include-docs span::before { - content: " Docs"; - margin-left: 5px; + content: "Docs"; } button:not(.control-toggle-include-docs) span { display: none; @@ -669,18 +660,14 @@ footer.pagination-footer { button i:before { float: none; } - i.icon.fonticon-link:before, - i.icon.fonticon-gears:before { - margin: 10px 0px 0 0; - } - .icon.fontawesome { - margin: 0 -6px 0 0px; - } - .right-header button i:before{ + .right-header button i:before { margin: 2px 0 0 0; } #query-options-tray:before { - right: 136px + right: 130px; + } + .api-bar-tray:before { + right: 68px; } } } @@ -692,34 +679,22 @@ footer.pagination-footer { .with-sidebar { .two-panel-header { .control-toggle-include-docs span::before { - content: " Docs"; - margin-left: 5px; + content: "Docs"; } - i.icon.fonticon-link:before, - i.icon.fonticon-gears:before { - margin: 10px 0px 0 0; - } - .icon.fontawesome { - margin: 0 -6px 0 0px; - } - .right-header button i:before{ + .right-header button i:before { margin: 2px 0 0 0; } - #query-options-tray:before { - right: 136px - } } } } } -@media (max-width: 1082px) { +@media (max-width: 1090px) { body:not(.closeMenu) { .with-sidebar { .two-panel-header { .control-toggle-include-docs span::before { - content: " Docs"; - margin-left: 5px; + content: "Docs"; } button:not(.control-toggle-include-docs) span { display: none; @@ -727,19 +702,9 @@ footer.pagination-footer { button i:before { float: none; } - i.icon.fonticon-link:before, - i.icon.fonticon-gears:before { - margin: 10px 0px 0 0; - } - .icon.fontawesome { - margin: 0 -6px 0 0px; - } - .right-header button i:before{ + .right-header button i:before { margin: 2px 0 0 0; } - #query-options-tray:before { - right: 136px - } } } }
