--- a/components/openstack/horizon/files/branding/css/solaris.css Tue Jun 10 14:07:48 2014 -0700
+++ b/components/openstack/horizon/files/branding/css/solaris.css Wed Jun 11 17:13:12 2014 -0700
@@ -1,4 +1,4 @@
-/*!
+/*
* Bootstrap v2.0.1
*
* Copyright 2012 Twitter, Inc
@@ -123,11 +123,11 @@
background-color: #ffffff;
}
a {
- color: #dd4814;
+ color: #005D9D;
text-decoration: none;
}
a:hover {
- color: #dd4814;
+ color: #005D9D;
text-decoration: underline;
}
.row {
@@ -350,7 +350,7 @@
}
h3 {
line-height: 27px;
- font-size: 18px;
+ font-size: 16px;
}
h3 small {
font-size: 14px;
@@ -1278,11 +1278,11 @@
[class^="icon-"],
[class*=" icon-"] {
display: inline-block;
- width: 14px;
- height: 14px;
+ width: 0px;
+ height: 0px;
line-height: 14px;
vertical-align: text-top;
- xbackground-image: url('/static/bootstrap/img/glyphicons-halflings.png?531d4b607365');
+ /*xbackground-image: url('/static/bootstrap/img/glyphicons-halflings.png?531d4b607365');*/
background-position: 14px 14px;
background-repeat: no-repeat;
*margin-right: .3em;
@@ -1292,7 +1292,7 @@
*margin-left: 0;
}
.icon-white {
- xbackground-image: url('/static/bootstrap/img/glyphicons-halflings-white.png?11118ae8db79');
+ /*xbackground-image: url('/static/bootstrap/img/glyphicons-halflings-white.png?11118ae8db79');*/
}
.icon-glass {
background-position: 0 0;
@@ -1658,7 +1658,7 @@
position: relative;
}
.dropdown-toggle {
- *margin-bottom: -3px;
+ border: 1px solid #eeeeee;
}
.dropdown-toggle:active,
.open .dropdown-toggle {
@@ -1749,7 +1749,8 @@
.dropdown.open {
*z-index: 1000;
}
-.dropdown.open .dropdown-toggle {
+.dropdown.open .dropdown-toggle,
+.dropdown.open .dropdown-toggle:hover {
color: #ffffff;
background: #ccc;
background: rgba(0, 0, 0, 0.3);
@@ -1973,9 +1974,9 @@
background-color: #c44012;
}
-
+li.active .btn-primary,
.btn-primary {
- color: #fff;
+ color: #ffffff;
border: 1px solid #0074CD;
background: #0074CD;
font-weight: bold;
@@ -2180,6 +2181,10 @@
*zoom: 1;
margin: 0px;
}
+.topologyNavi .btn-group {
+ margin-left: 5px;
+ float: right;
+}
.btn-group:before,
.btn-group:after {
display: table;
@@ -2192,7 +2197,7 @@
*margin-left: 0;
}
.btn-group + .btn-group {
- margin-left: 5px;
+ /*margin-left: 5px;*/
}
.btn-toolbar {
margin-top: 9px;
@@ -2426,16 +2431,32 @@
.nav-pills:after {
clear: both;
}
+.nav-pills {
+ margin: 0px;
+ padding: 5px 12px;
+ width: 289px !important;
+ border: 1px solid #d5dfe6;
+ border-top: 1px solid #eeeeee;
+ border-bottom: none;
+}
+.right .fake_table .members .nav-pills {
+ width: 304px !important;
+}
+.nav-pills:first-of-type {
+ border-top: 1px solid #d5dfe6;
+}
.nav-tabs > li,
.nav-pills > li {
float: left;
}
-.nav-tabs > li > a,
-.nav-pills > li > a {
+.nav-tabs > li > a {
line-height: 33px;
text-align: center;
}
-
+.nav-pills > li > a {
+ line-height: 14px;
+ text-align: center;
+}
.nav-tabs > li {
margin-bottom: -1px;
margin-left: -1px;
@@ -2455,19 +2476,26 @@
border-top: none;
cursor: default;
}
+ul.nav-pills li.active {
+ float: right;
+}
.nav-pills > li > a {
- padding-top: 8px;
- padding-bottom: 8px;
+ padding-top: 6px;
+ padding-bottom: 10px;
margin-top: 2px;
margin-bottom: 2px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
-.nav-pills .active > a,
+.nav-pills .active > a {
+ color: #ffffff;
+ background-color: #0074CD;
+ height: 14px;
+ width: 8px;
+}
.nav-pills .active > a:hover {
- color: #ffffff;
- background-color: #0088cc;
+ background-color: #0160C1;
}
.nav-stacked > li {
float: none;
@@ -2510,13 +2538,15 @@
border-width: 1px;
}
.nav-pills .dropdown-menu {
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
+ -webkit-border-radius: 0px;
+ -moz-border-radius: 0px;
+ border-radius: 0px;
}
.nav-tabs .dropdown-toggle .caret,
.nav-pills .dropdown-toggle .caret {
- border-top-color: #0088cc;
+ /*border-top-color: #000000;*/
+ border-top: 4px solid #005580;
+ oppacity: 0.3;
margin-top: 6px;
}
.nav-tabs .dropdown-toggle:hover .caret,
@@ -2525,10 +2555,10 @@
}
.nav-tabs .active .dropdown-toggle .caret,
.nav-pills .active .dropdown-toggle .caret {
- border-top-color: #333333;
+ border-top: 4px solid #005580;
}
.nav > .dropdown.active > a:hover {
- color: #000000;
+ color: #005580;
cursor: pointer;
}
.nav-tabs .open .dropdown-toggle,
@@ -3755,7 +3785,7 @@
font-style: normal;
}
a {
- color: #dd4814;
+ color: #005D9D;
}
ul {
list-style: none;
@@ -3767,6 +3797,7 @@
#main_content {
padding-left: 247px;
padding-right: 20px;
+ min-width: 840px;
}
.topbar {
background: #f2f2f2;
@@ -3909,6 +3940,12 @@
color: #8EACB7;
text-shadow: none;
}
+.nav li a.dropdown-toggle {
+ color: #8EACB7;
+}
+.nav li a.dropdown-toggle:hover {
+ color: #005580;
+}
.container-fluid {
padding-left: 0;
}
@@ -4234,7 +4271,8 @@
}
.table_actions .table_search {
/*display: inline-block;*/
- padding-bottom: 8px;
+ padding-bottom: 8px;
+ margin-left: 142px;
width: 267px;
}
@@ -4381,7 +4419,7 @@
}
.left {
float: left;
- width: 347px;
+ width: 315px;
margin-right: 15px;
}
.left form {
@@ -4389,7 +4427,7 @@
}
.right {
float: left;
- width: 308px;
+ width: 330px;
}
.workflow ul.nav-tabs {
@@ -4415,7 +4453,7 @@
background: url(../img/content_tab_bkgd_selected.png) repeat-x;
font-weight: bold;
border: 1px solid #C4CED8;
- border-top: 1px solid #FFFFFF;
+ border-top: 1px solid #1274D1;
border-bottom: 1px solid #FFFFFF;
}
@@ -4537,6 +4575,9 @@
width: 10px;
}
/* Actions dropdown */
+th.actions_column {
+ width: 150px;
+}
td.actions_column {
width: 150px;
padding: 10px;
@@ -4969,33 +5010,49 @@
.project_membership input {
background: url('../../dashboard/img/search.png?781fb162b111') no-repeat 105px 5px whiteSmoke;
}
+.membership .fake_table_header,
.project_membership .fake_table_header {
- background-color: #F1F1F1;
+ background-color: #F2F4F7;
width: 306px;
height: 38px;
- padding-top: 15px;
- border: 1px solid #DDD;
+ padding-top: 10px;
+ border: 1px solid #D5DFE6;
border-bottom: none;
}
+.membership .fake_table,
.project_membership .fake_table {
- margin-left: 5px;
width: 315px;
}
-.project_membership .fake_table ul.no_results {
- width: 298px;
-}
+.membership .fake_table ul.no_results,
+.project_membership .left .fake_table ul.no_results {
+ width: 313px;
+ line-height: 36px;
+ border: 1px solid #d5dfe6;
+
+}
+.membership .fake_table ul.btn-group:hover,
.project_membership .fake_table ul.btn-group:hover {
background-color: #DDD;
}
+.membership .left .fake_table_header,
.project_membership .left .fake_table_header {
- width: 318px;
-}
+ width: 313px;
+}
+.membership .right .fake_table_header,
.project_membership .right .fake_table_header {
- width: 318px;
- margin-left: -15px;
-}
+ width: 328px;
+}
+.membership .right .fake_table ul.no_results,
.project_membership .right .fake_table ul.no_results {
- margin-left: -20px;
+ /*margin-left: -20px;*/
+ line-height: 36px;
+ width: 328px;
+ border: 1px solid #d5dfe6;
+}
+ul.no_results li {
+ padding: 5px 12px;
+ height: 36px;
+ line-height: 36px;
}
.project_membership .member {
padding: 10px;
@@ -5004,18 +5061,21 @@
.project_membership .project_members {
margin-left: -20px;
}
-.project_membership .project_members ul.btn-group,
+.membership .project_members ul.btn-group,
.project_membership .available_users ul.btn-group {
width: 308px;
}
+.membership .dark_stripe,
.project_membership .dark_stripe {
background-color: #F9F9F9;
}
+.membership .light_stripe,
.project_membership .light_stripe {
background-color: white;
}
+.membership .last_stripe,
.project_membership .last_stripe {
- border-bottom: 1px solid #DDD;
+ border-bottom: 1px solid #d5dfe6;
}
.project_membership .filter {
width: 120px;
@@ -5027,6 +5087,7 @@
padding: 10px;
color: #08C;
}
+.membership .role_dropdown li,
.project_membership .role_dropdown li {
cursor: pointer;
background: none;
@@ -5042,13 +5103,27 @@
box-shadow: none;
z-index: 99999;
}
+.membership .role_dropdown li:hover,
.project_membership .role_dropdown li:hover {
background-color: #EBECED;
}
+.membership .nav .role_options,
.project_membership .nav .role_options {
float: right;
padding-right: 5px;
}
+.membership input[type="text"] {
+ width: 180px;
+ float: right;
+ margin-right: 12px;
+}
+.members_title {
+ margin-left: 12px;
+ position: relative;
+ top: 6px;
+
+}
+
/* Inline user creation */
.add_user_btn {
display: inline;
@@ -5636,8 +5711,10 @@
background-size: 14px 14px;
}
.launchButtons {
+ float: right;
text-align: right;
margin: 10px 0px 15px 10px;
+ clear: right;
}
.launchButtons a.btn {
margin-left: 10px;
@@ -5700,7 +5777,7 @@
margin: 0px -30px 0px 0px;
padding: 0px;
position: relative;
- top: 107px;
+ top: 100px;
}
#user_info, #user_info a {
@@ -5848,6 +5925,7 @@
margin-left: 23px;
color: #000000;
vertical-align: top;
+ font-weight: 500;
}
.sidebar a { font-size: 14px; }
@@ -5931,7 +6009,9 @@
/* static pages */
.static_page, .quota-dynamic { margin-top: 80px; }
-.static_page, .quota-dynamic h3 { margin-bottom: 20px; }
+.static_page, .quota-dynamic h3 {
+ margin-bottom: 20px;
+}
.static_page, .quota-dynamic .progress_bar {
max-width: 50%;
@@ -5954,4 +6034,41 @@
color:#000000;
border-left: 1px solid #EEEEEE;
}
+.topologyNavi {
+ height: 80px;
+}
+.quota-dynamic {
+ height: 200px;
+ min-width: 840px;
+}
+.d3_quota_bar {
+ float: left;
+ width: 160px;
+ text-align: center;
+ position: relative;
+ left: -30px;
+}
+#date_form h3 {
+ margin-bottom: 19px;
+}
+#volumes, #volume-types {
+ position: relative;
+ top: -8px;
+}
+td.normal_column, td.actions_column {
+ font-size: 12px;
+ color:#000000;
+ border-left: 1px solid #EEEEEE;
+}
+.display_name {
+ line-height: 36px;
+}
+.nodata {
+ display: none;
+}
+
+#no_update_flavor_access_members li {
+ line-height: 24px;
+ height: 48px;
+}
\ No newline at end of file