Repository: couchdb-fauxton Updated Branches: refs/heads/secondary-indexes 3f03cd358 -> 0cf7101ed
Working on alert styling Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/0cf7101e Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/0cf7101e Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/0cf7101e Branch: refs/heads/secondary-indexes Commit: 0cf7101ed296b402ed6f2a3dc83dde8b96aaaaf7 Parents: 3f03cd3 Author: deathbearbrown <deathbearbr...@gmail.com> Authored: Tue Aug 12 12:57:52 2014 -0400 Committer: deathbearbrown <deathbearbr...@gmail.com> Committed: Tue Aug 12 12:57:52 2014 -0400 ---------------------------------------------------------------------- app/addons/fauxton/resizeColumns.js | 2 +- app/templates/layouts/one_pane.html | 1 + app/templates/layouts/two_pane.html | 4 ++-- app/templates/layouts/with_sidebar.html | 1 + app/templates/layouts/with_tabs.html | 2 +- app/templates/layouts/with_tabs_sidebar.html | 2 +- assets/index.underscore | 1 - assets/less/bootstrap/alerts.less | 2 +- assets/less/headers.less | 16 ++++++++++++---- assets/less/templates.less | 8 ++++++++ index.html | 2 +- 11 files changed, 29 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0cf7101e/app/addons/fauxton/resizeColumns.js ---------------------------------------------------------------------- diff --git a/app/addons/fauxton/resizeColumns.js b/app/addons/fauxton/resizeColumns.js index 98555a9..3fd1883 100644 --- a/app/addons/fauxton/resizeColumns.js +++ b/app/addons/fauxton/resizeColumns.js @@ -99,7 +99,7 @@ function(FauxtonAPI) { setPosition: function(panelWidth){ var primary = this.getPrimaryNavWidth(); - $('#right-content').css('left',panelWidth+primary+4); + $('.set-left-position').css('left',panelWidth+primary+4); }, onResizeHandler: function (){ http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0cf7101e/app/templates/layouts/one_pane.html ---------------------------------------------------------------------- diff --git a/app/templates/layouts/one_pane.html b/app/templates/layouts/one_pane.html index c7adf1f..0bbc989 100644 --- a/app/templates/layouts/one_pane.html +++ b/app/templates/layouts/one_pane.html @@ -14,6 +14,7 @@ the License. <div id="primary-navbar"></div> <div id="dashboard" class="container-fluid one-pane"> + <div id="global-notifications" class="container errors-container window-resizeable"></div> <div class="fixed-header"> <div id="breadcrumbs"></div> <div id="api-navbar"></div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0cf7101e/app/templates/layouts/two_pane.html ---------------------------------------------------------------------- diff --git a/app/templates/layouts/two_pane.html b/app/templates/layouts/two_pane.html index 0174a5a..053285a 100644 --- a/app/templates/layouts/two_pane.html +++ b/app/templates/layouts/two_pane.html @@ -14,7 +14,7 @@ the License. <div id="primary-navbar"></div> <div id="dashboard" class="container-fluid two-pane"> - + <div id="global-notifications" class="container errors-container window-resizeable set-left-position"></div> <header class="fixed-header row-fluid"> <div id="breadcrumbs" class="window-resizeable"></div> <div id="api-navbar" class="window-resizeable"></div> @@ -22,6 +22,6 @@ the License. <div class="content-area two-pane"> <div id="left-content" class="span6 window-resizeable"></div> - <div id="right-content" class="span6 window-resizeable"></div> + <div id="right-content" class="span6 window-resizeable set-left-position"></div> </div> </div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0cf7101e/app/templates/layouts/with_sidebar.html ---------------------------------------------------------------------- diff --git a/app/templates/layouts/with_sidebar.html b/app/templates/layouts/with_sidebar.html index 7fc64db..2d0f4fa 100644 --- a/app/templates/layouts/with_sidebar.html +++ b/app/templates/layouts/with_sidebar.html @@ -15,6 +15,7 @@ the License. <div id="primary-navbar"></div> <div id="dashboard" class="container-fluid with-sidebar"> + <div id="global-notifications" class="container errors-container window-resizeable"></div> <header class="fixed-header row-fluid"> <div id="breadcrumbs" class="sidebar"></div> <div id="api-navbar" class="window-resizeable"></div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0cf7101e/app/templates/layouts/with_tabs.html ---------------------------------------------------------------------- diff --git a/app/templates/layouts/with_tabs.html b/app/templates/layouts/with_tabs.html index 074385f..2d03d19 100644 --- a/app/templates/layouts/with_tabs.html +++ b/app/templates/layouts/with_tabs.html @@ -14,7 +14,7 @@ the License. <div id="primary-navbar"></div> <div id="dashboard" class="container-fluid"> - + <div id="global-notifications" class="container errors-container window-resizeable"></div> <header class="fixed-header row-fluid"> <div id="breadcrumbs" class="sidebar"></div> <div id="api-navbar" class="window-resizeable"></div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0cf7101e/app/templates/layouts/with_tabs_sidebar.html ---------------------------------------------------------------------- diff --git a/app/templates/layouts/with_tabs_sidebar.html b/app/templates/layouts/with_tabs_sidebar.html index de4bdee..0a7c661 100644 --- a/app/templates/layouts/with_tabs_sidebar.html +++ b/app/templates/layouts/with_tabs_sidebar.html @@ -14,7 +14,7 @@ the License. <div id="primary-navbar"></div> <div id="dashboard" class="container-fluid with-sidebar"> - + <div id="global-notifications" class="container errors-container window-resizeable"></div> <header class="fixed-header row-fluid"> <div id="breadcrumbs" class="sidebar"></div> <div id="api-navbar" class="window-resizeable"></div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0cf7101e/assets/index.underscore ---------------------------------------------------------------------- diff --git a/assets/index.underscore b/assets/index.underscore index 6a887b5..94befb9 100644 --- a/assets/index.underscore +++ b/assets/index.underscore @@ -33,7 +33,6 @@ <body id="home"> <!-- Main container. --> <div role="main" id="main"> - <div id="global-notifications" class="container errors-container"></div> <div id="app-container"></div> </div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0cf7101e/assets/less/bootstrap/alerts.less ---------------------------------------------------------------------- diff --git a/assets/less/bootstrap/alerts.less b/assets/less/bootstrap/alerts.less index 0116b19..c631078 100644 --- a/assets/less/bootstrap/alerts.less +++ b/assets/less/bootstrap/alerts.less @@ -8,7 +8,7 @@ .alert { padding: 8px 35px 8px 14px; - margin-bottom: @baseLineHeight; + min-height: 60px; text-shadow: 0 1px 0 rgba(255,255,255,.5); background-color: @warningBackground; border: 1px solid @warningBorder; http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0cf7101e/assets/less/headers.less ---------------------------------------------------------------------- diff --git a/assets/less/headers.less b/assets/less/headers.less index c1e1bfd..149e90b 100644 --- a/assets/less/headers.less +++ b/assets/less/headers.less @@ -83,6 +83,11 @@ > div{ display:inline-block; } + .breadcrumb { + li:first-child{ + border-right: 1px solid #ccc; + } + } } .breadcrumb { margin-bottom: 0; @@ -98,7 +103,6 @@ .two-pane & { padding:20px 10px; font-size: 19px; - border-right: 1px solid #ccc; } } color: @breadcrumbText; @@ -121,16 +125,20 @@ position: absolute; right: 0; top: 0; + .dropdown-toggle { + color: #666666; + } a { + padding: 10px 20px; text-decoration: none; } .dropdown { border-left: 1px solid #ccc; - padding: 20px; + padding: 20px 0px; } .dropdown-menu { - left: -105px; - top: 56px; + left: -109px; + top: 48px; } } } http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0cf7101e/assets/less/templates.less ---------------------------------------------------------------------- diff --git a/assets/less/templates.less b/assets/less/templates.less index bf80258..3ab7d19 100644 --- a/assets/less/templates.less +++ b/assets/less/templates.less @@ -386,6 +386,14 @@ } } +#global-notifications{ + .with-sidebar & { + left: @sidebarWidth+@navWidth; + .closeMenu & { + left: @sidebarWidth+@collapsedNavWidth; + } + } +} /* Sidenav: USED IN DOCUMENT ADDON & EXTERNAL ADDONS http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0cf7101e/index.html ---------------------------------------------------------------------- diff --git a/index.html b/index.html index 892f499..844e9c9 100644 --- a/index.html +++ b/index.html @@ -36,7 +36,7 @@ <body id="home"> <!-- Main container. --> <div role="main" id="main"> - <div id="global-notifications" class="container errors-container"></div> + <div id="global-notifications" class="container errors-container window-resizeable"></div> <div id="app-container"></div> <hr>
