Move Starlingx branding from stx-horizon to stx-gui

Moved themes/titanium/ and themes/starlingx/ folder from
stx-horizon into stx-gui. Renamed titanium to starlingx and
deleted titanium.

Updated the spec file so the themes/starlingx/ folder is
installed under openstack_dashboard/themes.

Story: 2004552
Task: 28310

Change-Id: I328df72bca0c8d5288a36a5257cf5738eba622da
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
This commit is contained in:
Kristine Bujold 2018-12-06 10:35:40 -05:00
parent d791403a6b
commit d9bd6001bb
17 changed files with 684 additions and 1 deletions

View File

@ -1,2 +1,2 @@
SRC_DIR="starlingx-dashboard"
TIS_PATCH_VER=20
TIS_PATCH_VER=21

View File

@ -22,6 +22,7 @@ starlingx specific horizon plugins
%define py_pkg_name starlingx_dashboard
%define enabled_dir %{_datadir}/openstack-dashboard/openstack_dashboard/enabled/
%define stx_themes_dir %{_datadir}/openstack-dashboard/openstack_dashboard/themes/starlingx/
%define debug_package %{nil}
@ -42,6 +43,10 @@ install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
install -d -m 755 %{buildroot}%{enabled_dir}
install -p -D -m 755 %{py_pkg_name}/enabled/* %{buildroot}%{enabled_dir}
install -d -m 755 %{buildroot}%{stx_themes_dir}
cp -R %{py_pkg_name}/themes/starlingx/* %{buildroot}%{stx_themes_dir}
chmod -R 755 %{buildroot}%{stx_themes_dir}/*
%clean
rm -rf $RPM_BUILD_ROOT
@ -51,6 +56,7 @@ rm -rf $RPM_BUILD_ROOT
%{python2_sitelib}/%{py_pkg_name}-%{version}*.egg-info
%{enabled_dir}
%{stx_themes_dir}
%package wheels
Summary: %{name} wheels

View File

@ -0,0 +1,38 @@
@import "/themes/starlingx/variables";
@import "/themes/default/styles";
// WRS components
@import "components/badges";
// (Eddie Ramirez): To be deprecated
// @import "components/sidebar";
// @import "components/topbar";
// @import "components/splash";
@import "components/charts";
@import "components/tables";
.messages {
width: 500px;
margin-left: -250px;
left: 50%;
right: auto;
}
.password-icon {
top: 0px;
color: gray;
}
#main_content {
height: 100%;
width: 100%;
display: table;
#content_body {
width: 100%;
display: table-cell;
padding-left: 0px;
vertical-align: top;
}
}

View File

@ -0,0 +1,92 @@
@import "/themes/default/variables";
/* Primary Brand Colors */
$windriver-white: #ffffff;
$windriver-black: #000000;
$windriver-red: #CC0000;
$windriver-lighter-red: #CC1515;
$windriver-gray: #333333;
$windriver-lighter-gray: #9f9f9f;
/* Secondary Brand Colors */
$windriver-slate-green: #336666;
$windriver-slate-blue: #336699;
$windriver-tan: #CC9966;
$windriver-gold: #FFCC33;
/* Global Styles */
$text-color: #666;
$link-color: $windriver-slate-blue;
$gray-light: #cccccc;
$font-size-base: 15px !default;
$font-size-small: ceil(($font-size-base * 0.85)) !default; // ~12px
$sidebar-background-color: #666;
$sidebar-active-color: $windriver-red;
$context-delimiter-size: 13px;
$errorBackground: #f2dede;
$warningBackground: #fcf8e3;
/* Bootstrap Customizations */
$linkColor: $link-color;
$textColor: $text-color;
// Splash Screen Styles
$splash-bg-color: #666;
$splash-login-bg-color: #333;
$splash-border-color: #000;
$splash-text-color: #fff;
$splash-label-color: #eee;
// Dashboard Styles
$sidebar-width: 220px;
$brand-bg-color: $windriver-black;
$brand-bg-highlight: #666;
$brand-text-color: $windriver-white;
$brand-width: $sidebar-width;
$brand-height: 30px;
$nav-tabs-bg-color: $windriver-white;
$nav-tabs-link-color: $windriver-white;
$nav-tabs-active-color: $text-color;
$nav-tabs-hover-color: $windriver-black;
$main-nav-bg-color: #666;
$main-nav-title-color: $windriver-white;
$main-nav-link-color: #ddd;
$main-nav-width: $sidebar-width;
$switch-bar-bg-color: $windriver-black;
$switch-bar-bg-hover: $windriver-gray;
$switch-bar-text-color: $windriver-red;
$topbar-background-color: #4a4a4a;
$topbar-title-color: $windriver-white;
$topbar-text-color: #eee;
$topbar-link-color: $topbar-text-color;
$topbar-hover-color: $windriver-white;
$badge-color-primary: $windriver-slate-blue;
$badge-color-danger: $windriver-red;
$badge-color-warning: $windriver-gold;
$badge-color: #fff;
$badge-link-hover-color: #fff;
$badge-bg: $gray-light;
$badge-active-color: $linkColor;
$badge-active-bg: #fff;
$badge-font-weight: bold;
$badge-line-height: 1;
$badge-border-radius: 10px;
$badge-font-size: ceil(($font-size-small * 0.85)); // ~12px
$modal-lg: 1200px; // overide default/bootstrap/_variable.sccs
//Default theme overrides
$brand-primary: $windriver-slate-blue;
$brand-success: #5cb85c !default;
$brand-info: #5bc0de !default;
$brand-warning: $windriver-gold;
$brand-danger: $windriver-red;

View File

@ -0,0 +1,76 @@
//
// Badges
// --------------------------------------------------
// Base classes
.badge {
display: inline-block;
min-width: 10px;
padding: 3px 7px;
font-size: $badge-font-size;
font-weight: $badge-font-weight;
color: $badge-color;
line-height: $badge-line-height;
vertical-align: baseline;
white-space: nowrap;
text-align: center;
background-color: $badge-bg;
border-radius: $badge-border-radius;
// Empty badges collapse automatically (not available in IE8)
&:empty {
display: none;
}
// Quick fix for badges in buttons
.btn & {
position: relative;
top: -1px;
}
.btn-xs & {
top: 0;
padding: 1px 5px;
}
}
.badge-success {
background-color: $badge-color-primary;
}
.badge-danger {
background-color: $badge-color-danger;
}
.badge-warning {
background-color: darken($badge-color-warning, 10%);
}
.status-success {
color: $brand-success;
}
.status-danger {
color: $badge-color-danger;
}
.status-warning {
color: darken($badge-color-warning, 10%);
}
// Hover state, but only for links
a.badge {
&:hover,
&:focus {
color: $badge-link-hover-color;
text-decoration: none;
cursor: pointer;
}
}
// Account for counters in navs
a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
color: $badge-active-color;
background-color: $badge-active-bg;
}
.nav-pills > li > a > .badge {
margin-left: 3px;
}

View File

@ -0,0 +1,19 @@
// Chart Usage Specifics
.d3_pie_chart_usage {
// The inner arc
.arc.inner {
fill: #336699;
stroke: none;
// Specialness if its full
&.FULL {
fill: $windriver-red;
}
// Specialness if its almost full
&.NEARLY_FULL {
fill: $windriver-gold;
}
}
}

View File

@ -0,0 +1,134 @@
// Indent selected menu items
#sidebar .openstack-panel.active {
margin-left: 15px;
}
// Squish accordian pills
#sidebar-accordion {
a {
background-color: $main-nav-bg-color;
color: $main-nav-bg-color;
padding: .4em 1.2em;
background: transparent;
}
.panel > a{
background: transparent;
}
}
// Coloring of sidebar
#sidebar {
// Header highlight color
//.openstack-dashboard > a:hover,
.openstack-dashboard > a:focus,
li {
background-color: $sidebar-background-color;
}
.nav-pills.nav-stacked {
& > li {
& > a {
color: $windriver-white;
background: $main-nav-bg-color;
}
}
}
// Dashboard headers
#sidebar-accordion > li.panel > a{
//font-size: 15px;
border-radius: 9px;
background-color: $windriver-lighter-gray;
}
// Panel group headers
#sidebar-accordion li.openstack-panel-group > a {
//font-size: 15px;
color: $windriver-white;
text-align: left;
&:hover {
background-color: transparent;
}
}
// All links
li.openstack-dashboard a.openstack-panel {
color: $windriver-white;
// Link on hover
&:hover {
color: $windriver-lighter-red;
background-color: $sidebar-background-color;
}
}
// Selected panel
li.openstack-dashboard a.openstack-panel.active {
color: $sidebar-active-color;
background: $windriver-white;
border-left: 2px;
border-left-style: solid;
border-left-color: $sidebar-active-color;
}
}
#sidebar {
float: none;
display: table-cell;
height: 100%;
background-color: $sidebar-background-color;
.branding {
padding-bottom: 0px;
padding-top: 0px;
padding-left: 0px;
text-align: center;
/* vertical gradient (excluding IE9 and below - which clips the nav-tabs) */
background-color: mix($brand-bg-color, $brand-bg-highlight, 60%); // Old Browswers
background-image: -moz-linear-gradient(top, $brand-bg-color, $brand-bg-highlight); // FF 3.6+
background-image: -ms-linear-gradient(top, $brand-bg-color, $brand-bg-highlight); // IE10
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($brand-bg-color), to($brand-bg-highlight)); // Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient(top, $brand-bg-color, $brand-bg-highlight); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(top, $brand-bg-color, $brand-bg-highlight); // Opera 11.10
background-image: linear-gradient(top, $brand-bg-color, $brand-bg-highlight); // The standard
background-repeat: repeat-x;
.brand {
background: none;
padding-bottom: 0px;
margin-top: 0px;
a {
float: none;
color: $brand-text-color;
text-indent: inherit;
text-align: center;
text-decoration: none;
text-shadow: 2px 1px 15px #000;
font-size: 20px;
line-height: 20px;
margin: 20px 0px 0px 0px;
padding-top: 0px;
padding-bottom: 0px;
height: $brand-height;
width: $brand-width;
}
}
.system {
width: $sidebar-width;
overflow-wrap: break-word;
text-align: center;
color: $brand-text-color;
padding-top: 0px;
padding-bottom: 0px;
margin-bottom: 10px;
font-size: 15px;
}
}
}

View File

@ -0,0 +1,65 @@
#splash {
background: $splash-bg-color;
color: $splash-text-color;
.panel , .panel-heading, .panel-footer{
background: $splash-login-bg-color;
border-color: $splash-border-color;
}
.panel-body {
// Unstretch text fields
margin-right: 40px;
margin-left: 40px;
}
.panel-heading{
// White line
border-bottom-color: $splash-label-color;
/* vertical gradient (excluding IE9 and below - which clips the nav-tabs) */
background-color: mix($brand-bg-color, $splash-login-bg-color, 60%); // Old Browswers
background-image: -moz-linear-gradient(top, $brand-bg-color, $splash-login-bg-color); // FF 3.6+
background-image: -ms-linear-gradient(top, $brand-bg-color, $splash-login-bg-color); // IE10
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($brand-bg-color), to($splash-login-bg-color)); // Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient(top, $brand-bg-color, $splash-login-bg-color); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(top, $brand-bg-color, $splash-login-bg-color); // Opera 11.10
background-image: linear-gradient(top, $brand-bg-color, $splash-login-bg-color); // The standard
background-repeat: repeat-x;
}
.panel-footer {
// Hide lower line
border-top: none;
// Move over button
button {
margin-right: 40px;
}
}
.red-line {
height: 53px;
width: 43%;
border-bottom: 2px solid $windriver-red;
margin-bottom: -18px;
margin-left: -16px;
}
h3 {
display: block;
color: $splash-text-color;
text-align: center;
margin-bottom: 30px;
font-size: 32px;
line-height: 39px;
text-shadow: 2px 2px 4px #000000;
}
form label {
color: $splash-label-color;
font-weight: normal;
}
}

View File

@ -0,0 +1,39 @@
// Exact selectors below required to override .table-striped
.table tbody tr,
.table-striped.datatable tbody tr {
&.status_down > td,
&.status_down.odd > td,
&.status_down.even > td {
background-color: $errorBackground;
}
&.warning > td,
&.warning.odd > td,
&.warning.even > td {
background-color: $warningBackground;
}
}
// Hover states for .table-hover
.table-hover tbody tr,
.table-striped.datatable tbody tr {
&.status_down:hover > td,
&.status_down.odd:hover > td,
&.status_down.even:hover > td {
background-color: darken($errorBackground, 5%);
}
&.status_unknown:hover > td,
&.status_unknown.odd:hover > td,
&.status_unknown.even:hover > td {
background-color: darken($warningBackground, 5%);
}
}
.table_actions .table_limit {
display: inline-block;
margin-left: 5px;
border: 1px;
.btn.btn-small .caret {
margin-top: 7px;
}
}

View File

@ -0,0 +1,45 @@
.navbar-fixed-top, .topbar {
padding: 0px 0px;
background-color: $topbar-background-color;
a.navbar-brand {
padding-left: 0px;
}
h1.brand a {
background: none;
}
.navbar-default .navbar-nav {
.dropdown-menu {
background-color: white;
}
& > li > a{
color: $topbar-text-color;
}
}
.context_selection{
float: left;
}
.user_settings {
float: right;
}
// Styling for time & alarms
.navbar-center {
color: $topbar-text-color;
padding-top: 0.8em;
display: table;
margin-left: auto;
margin-right: auto;
float: none;
.datetime {
padding-right: 13px;
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

@ -0,0 +1 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 123.51 144"><defs><style>.cls-1{fill:#330072;}.cls-2{fill:#685bc7;}</style></defs><title>StarlingX_Logo_RGB_Stacked_2color</title><path class="cls-1" d="M87.79,208.81c-2-.52-2.52-.77-2.52-1.53v0c0-.56.51-1,1.5-1a5.44,5.44,0,0,1,3,1.15l1.34-1.94A6.78,6.78,0,0,0,86.8,204c-2.38,0-4.09,1.4-4.09,3.52v0c0,2.32,1.52,3,3.87,3.57,2,.5,2.36.83,2.36,1.48v0c0,.68-.64,1.1-1.69,1.1a5.34,5.34,0,0,1-3.48-1.42l-1.52,1.82a7.42,7.42,0,0,0,5,1.87c2.52,0,4.29-1.3,4.29-3.62v0C91.49,210.28,90.15,209.43,87.79,208.81Z" transform="translate(-82.25 -72)"/><polygon class="cls-1" points="13.57 134.49 17.12 134.49 17.12 143.8 19.69 143.8 19.69 134.49 23.25 134.49 23.25 132.12 13.57 132.12 13.57 134.49"/><path class="cls-1" d="M113.14,204l-5,11.76h2.61l1.07-2.62h4.94l1.07,2.62h2.68l-5-11.76Zm-.4,6.87,1.55-3.78,1.55,3.78Z" transform="translate(-82.25 -72)"/><path class="cls-1" d="M135.24,208v0a3.68,3.68,0,0,0-1-2.67,4.62,4.62,0,0,0-3.4-1.19h-5.34V215.8h2.57v-3.74h2l2.5,3.74h3l-2.86-4.17A3.63,3.63,0,0,0,135.24,208Zm-2.61.13c0,1-.71,1.66-2,1.66h-2.6v-3.36h2.55c1.26,0,2,.57,2,1.67Z" transform="translate(-82.25 -72)"/><polygon class="cls-1" points="61.05 132.12 58.49 132.12 58.49 143.8 66.88 143.8 66.88 141.47 61.05 141.47 61.05 132.12"/><rect class="cls-1" x="72.11" y="132.12" width="2.57" height="11.68"/><polygon class="cls-1" points="88.61 139.31 83.14 132.12 80.77 132.12 80.77 143.8 83.3 143.8 83.3 136.38 88.96 143.8 91.14 143.8 91.14 132.12 88.61 132.12 88.61 139.31"/><path class="cls-1" d="M184.91,211.3h2.59V213a4.09,4.09,0,0,1-2.42.71,3.5,3.5,0,0,1-3.54-3.71v0a3.5,3.5,0,0,1,3.35-3.64,4.31,4.31,0,0,1,3.06,1.19l1.61-2a6.4,6.4,0,0,0-4.58-1.6,6,6,0,0,0-6.13,6v0a5.85,5.85,0,0,0,6.14,6,7.56,7.56,0,0,0,5-1.85v-5.07h-5.07Z" transform="translate(-82.25 -72)"/><polygon class="cls-1" points="123.34 132.12 120.42 132.12 117.94 135.91 115.5 132.12 112.5 132.12 116.4 137.86 112.33 143.8 115.25 143.8 117.89 139.8 120.5 143.8 123.51 143.8 119.44 137.83 123.34 132.12"/><polygon class="cls-2" points="58.46 21.04 42.68 0 0 0 37.12 49.49 58.46 21.04"/><path class="cls-2" d="M137.22,145.3l25.85,34.47h42.68L168.44,130C160.24,138.61,148.31,144.52,137.22,145.3Z" transform="translate(-82.25 -72)"/><path class="cls-1" d="M111.59,170.56l22.84-30.45h.32c11.81,0,25.65-7.32,33.15-17.64l23.37-31.16a47.48,47.48,0,0,1,14.48-12.17c-6.28-2.61-15.84-4-15.84-4C186.21,72,177.76,72,177.76,72c-14.69,0-21.67,9.31-21.67,9.31l-32.21,43c19.16-.12,23-3.08,34.73-18.24l2.45-3.32a13,13,0,0,1,10.46-5.27l-8.71,11.77c-12.75,16.49-18,20.34-40.18,20.34-.93,0-1.82,0-2.69,0L82.25,179.77h9.24C98.54,179.77,107.14,176,111.59,170.56Z" transform="translate(-82.25 -72)"/></svg>

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

View File

@ -0,0 +1,90 @@
{% load branding i18n staticfiles %}
{% load load_config from horizon %}
{% load_config as CONF %}
{% comment %}
NB: The context for 500 pages is an empty dict.
Don't add any content here that depends on things from
the context.
{% endcomment %}
<!DOCTYPE html>
<html>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
<!-- WRS addition -->
<link rel="shortcut icon" href="{% static '/static/themes/starlingx/img/favicon.ico' %}"/>
<link rel="apple-touch-icon" sizes="180x180" href="{% static 'dashboard/img/apple-touch-icon.png' %}" />
<link rel="mask-icon" href="{% static 'dashboard/img/safari-pinned-tab.svg' %}" color="#5bbad5" />
<title>{% trans "Server error" %} - {% site_branding %}</title>
{% block css %}
<style>
a {
color: #336699; /* slate blue */
text-decoration: none;
}
body {
color: #eee; /* light gray */
text-align: center;
font-weight: normal;
background: none repeat scroll 0% 0% #666;
}
div#container {
padding-top: 70px;
margin: 72px auto 0 auto;
width: 390px;
background: url("{% static '/static/themes/starlingx/img/logo-splash.png' %}") no-repeat scroll center 35px padding-box #333;
border: 1px solid #000;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
box-shadow: 0px 3px 7px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0px 3px 7px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 0px 3px 7px rgba(0, 0, 0, 0.3);
}
h1 {
color: #fff;
text-shadow: 2px 2px 4px #000000;
}
h2 {
font-weight: normal;
}
div#container > div {
padding: 25px;
}
</style>
{% endblock %}
</head>
<body id="{% block body_id %}{% endblock %}">
{% block page_header %}{% endblock %}
{% block content %}
<div id="container">
<h1>{% site_branding %}</h1>
<div id="text">
{% block text %}
<h2>{% trans "Something went wrong!" %}</h2>
<p>{% trans "An unexpected error has occurred. Try refreshing the page. If that doesn't help, contact your local administrator." %}</p>
{% endblock %}
</div>
<div id="links">
{% block links %}
<p><a href="{{ CONF.WEBROOT }}">{% trans "Home" %}</a></p>
{% if CONF.HORIZON_CONFIG.bug_url %}
<p><a href="{{ CONF.HORIZON_CONFIG.bug_url }}">{% trans "Report Bug" %}</a></p>
{% endif %}
<p><a href="{{ CONF.HORIZON_CONFIG.help_url }}">{% trans "Help" %}</a></p>
{% endblock %}
</div>
</div>
{% endblock %}
{% block footer %}{% endblock %}
{% block js %}{% endblock %}
</body>
</html>

View File

@ -0,0 +1,31 @@
{% load compress %}
{% load themes %}
{% compress css %}
<link href='{{ STATIC_URL }}horizon/lib/bootstrap_datepicker/datepicker3.css' type='text/css' media='screen' rel='stylesheet' />
<link href='{{ STATIC_URL }}horizon/lib/rickshaw/rickshaw.css' type='text/css' media='screen' rel='stylesheet' />
{% endcompress %}
{% current_theme as current_theme %}
{% theme_dir as theme_dir %}
{% comment %}
The following 'include' is used to allow all scss files to share the same variable namespace
and also have access to ALL styles so that we can allow @extend functionality to persist.
If you wish to add new scss files, it is recommended that you add them from within the
themes/themes.scss template file.
{% endcomment %}
{% with THEME=current_theme THEME_DIR=theme_dir %}
{% compress css %}
<style type="text/scss">
{% include 'themes/themes.scss' %}
</style>
{% endcompress %}
{% endwith %}
<link rel="shortcut icon" href="{% themable_asset 'img/favicon.png' %}"/>
<link rel="apple-touch-icon" sizes="180x180" href="{% themable_asset 'img/apple-touch-icon.png' %}" />
<link rel="mask-icon" href="{% themable_asset 'img/safari-pinned-tab.svg' %}" color="#5bbad5" />

View File

@ -0,0 +1,7 @@
{% load branding %}
{% load themes %}
<a class="navbar-brand" href="{% site_branding_link %}" target="_self">
<!-- WRS addition -->
<img class="openstack-logo" src="{% themable_asset 'img/logo.png' %}" alt="{% site_branding %}">
</a>

View File

@ -0,0 +1,40 @@
{% load i18n %}
{% load themes %}
{% if not_list %}
<div class="dropdown user-menu">
{% else %}
<li class="dropdown user-menu">
{% endif %}
<a data-toggle="dropdown" href="#" class="dropdown-toggle" role="button" aria-expanded="false">
<span class="fa fa-user"></span>
<span class="user-name">{{ request.user.username }}</span>
<span class="fa fa-caret-down"></span>
</a>
<ul id="editor_list" class="dropdown-menu dropdown-menu-right selection-menu">
<li>
<a href="{% url 'horizon:settings:user:index' %}" target="_self">
<span class="fa fa-cog"></span>
{% trans "Settings" %}
</a>
</li>
<li>
<a href="{% url 'horizon:project:api_access:openrc' %}">
<span class="fa fa-download"></span>
{% trans "OpenStack RC File v3" %}
</a>
</li>
<li class="divider"></li>
<li>
<a href="{% url 'logout' %}" target="_self">
<span class="fa fa-sign-out"></span>
{% trans "Sign Out" %}
</a>
</li>
</ul>
{% if not_list %}
</div>
{% else %}
</li>
{% endif %}