Updated Branches: refs/heads/ui-restyle d97be4f6e -> 427c9cec6
Add breadcrumb style Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/427c9cec Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/427c9cec Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/427c9cec Branch: refs/heads/ui-restyle Commit: 427c9cec6c69cc94775d1ed7892f90f08880d56a Parents: d97be4f Author: Brian Federle <[email protected]> Authored: Wed Oct 2 11:28:11 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Wed Oct 2 11:28:11 2013 -0700 ---------------------------------------------------------------------- ui/stylesheets/_browser.scss | 41 +++++++++++++++++++++++++ ui/stylesheets/cloudstack.scss | 25 ++-------------- ui/stylesheets/csui/_breadcrumbs.scss | 48 ++++++++++++++++++++++++++++++ ui/stylesheets/csui/_csui.scss | 3 +- 4 files changed, 94 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/427c9cec/ui/stylesheets/_browser.scss ---------------------------------------------------------------------- diff --git a/ui/stylesheets/_browser.scss b/ui/stylesheets/_browser.scss new file mode 100644 index 0000000..965b7d0 --- /dev/null +++ b/ui/stylesheets/_browser.scss @@ -0,0 +1,41 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you 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. +#browser { + width: 80%; + height: 100%; + float: left; + box-shadow: -5px 0px 10px #b6b6b6; + z-index: 1; + + .container { + width: 100%; + height: 100%; + position: relative; + overflow: hidden; + + .panel { + background: white; + width: 100%; + height: 100%; + overflow: auto; + } + } +} + +#breadcrumbs { + @include csui-breadcrumbs; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/427c9cec/ui/stylesheets/cloudstack.scss ---------------------------------------------------------------------- diff --git a/ui/stylesheets/cloudstack.scss b/ui/stylesheets/cloudstack.scss index 7284388..b347d40 100644 --- a/ui/stylesheets/cloudstack.scss +++ b/ui/stylesheets/cloudstack.scss @@ -15,6 +15,7 @@ // specific language governing permissions and limitations // under the License. @import "csui/csui"; +@import "browser"; html body > .login { @include csui-login; @@ -198,34 +199,13 @@ body { } } -#browser { - width: 80%; - height: 100%; - float: left; - box-shadow: -5px 0px 10px #b6b6b6; - z-index: 1; - - .container { - width: 100%; - height: 100%; - position: relative; - overflow: hidden; - - .panel { - background: white; - width: 100%; - height: 100%; - overflow: auto; - } - } -} - .notification-box, #user-options, .region-selector { @include dialog; display: none; } +// Corner user drop-down #user-options { a { @include csui-hyperlink; @@ -243,6 +223,7 @@ body { @include csui-list; } +// Panel toolbars .toolbar { @include csui-toolbar; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/427c9cec/ui/stylesheets/csui/_breadcrumbs.scss ---------------------------------------------------------------------- diff --git a/ui/stylesheets/csui/_breadcrumbs.scss b/ui/stylesheets/csui/_breadcrumbs.scss new file mode 100644 index 0000000..cc227a6 --- /dev/null +++ b/ui/stylesheets/csui/_breadcrumbs.scss @@ -0,0 +1,48 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you 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. +@mixin csui-breadcrumbs { + box-shadow: 0px 3px 5px #ccc; + + ul { + @include row; + + padding-top: 0px; + padding-bottom: 10px; + + li { + color: #237AD7; + font-size: 12px; + list-style: none; + float: left; + + &:after { + content: ">"; + color: #ccc; + margin-right: 10px; + margin-left: 10px; + } + + &.active { + color: darken(#ccc, 30%); + + &:after { + content: ""; + } + } + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/427c9cec/ui/stylesheets/csui/_csui.scss ---------------------------------------------------------------------- diff --git a/ui/stylesheets/csui/_csui.scss b/ui/stylesheets/csui/_csui.scss index bd6c10c..b3584c3 100644 --- a/ui/stylesheets/csui/_csui.scss +++ b/ui/stylesheets/csui/_csui.scss @@ -56,4 +56,5 @@ html, body { @import "asset"; @import "dialog"; @import "list"; -@import "toolbar"; \ No newline at end of file +@import "toolbar"; +@import "breadcrumbs"; \ No newline at end of file
