Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mgr/dashboard: Add description to menu items on mobile navigation #26198

Merged
merged 2 commits into from Feb 7, 2019
Merged

mgr/dashboard: Add description to menu items on mobile navigation #26198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df02087
mgr/dashboard: Add description to menu items on mobile navigation
Jan 29, 2019
e7f707b
mgr/dashboard: Use scss variable for media queries
Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.scss
View file
Open in desktop
Expand Up @@ -25,19 +25,19 @@ cd-info-card {
}
}

@media (max-width: 1199px) {
@media (max-width: $screen-md-max) {
.cd-col-5 {
width: 33%;
}
}

@media (max-width: 991px) {
@media (max-width: $screen-sm-max) {
.cd-col-5 {
width: 50%;
}
}

@media (max-width: 767px) {
@media (max-width: $screen-xs-max) {
cd-info-card {
padding: 0;
}
Expand Down
8 changes: 5 additions & 3 deletions src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card-popover.scss
View file
Open in desktop
@@ -1,3 +1,5 @@
@import '../../../../defaults';

.info-card-popover-cluster-status {
max-width: 23vw;
max-height: 20vh;
Expand All @@ -9,18 +11,18 @@
}
}

@media (max-width: 1199px) {
@media (max-width: $screen-md-max) {
.info-card-popover-cluster-status {
max-width: 31vw;
}
}

@media (max-width: 991px) {
@media (max-width: $screen-sm-max) {
.info-card-popover-cluster-status {
max-width: 46vw;
}
}
@media (max-width: 767px) {
@media (max-width: $screen-xs-max) {
.info-card-popover-cluster-status {
max-width: 83vw;
}
Expand Down
6 changes: 3 additions & 3 deletions src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card.component.scss
View file
Open in desktop
Expand Up @@ -96,7 +96,7 @@ $logs-text-font-size: $card-font-min-size;
}
}

@media (max-width: 1199px) {
@media (max-width: $screen-md-max) {
.card-medium {
min-height: $card-medium-height * 1.5;
}
Expand All @@ -106,7 +106,7 @@ $logs-text-font-size: $card-font-min-size;
}
}

@media (max-width: 991px) {
@media (max-width: $screen-sm-max) {
.card {
min-height: $card-height * 2;
}
Expand All @@ -116,7 +116,7 @@ $logs-text-font-size: $card-font-min-size;
}
}

@media (max-width: 991px) and (min-width: 768px) {
@media (max-width: $screen-sm-max) and (min-width: $screen-sm-min) {
.card-medium {
min-height: $card-medium-height * 2.2;
}
Expand Down
4 changes: 3 additions & 1 deletion ...r/dashboard/frontend/src/app/core/navigation/administration/administration.component.html
View file
Open in desktop
Expand Up @@ -5,7 +5,9 @@
data-toggle="dropdown"
i18n-title
title="Dashboard Settings">
<i class="fa fa-cog"></i>
<i class="fa fa-fw fa-cog"></i>
<span i18n
class="visible-xs-inline-block">Dashboard Settings</span>
<span class="caret"></span>
</a>
<ul *dropdownMenu
Expand Down
4 changes: 3 additions & 1 deletion ...r/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html
View file
Open in desktop
Expand Up @@ -8,7 +8,9 @@
data-toggle="dropdown"
i18n-title
title="Help">
<i class="fa fa-question-circle-o"></i>
<i class="fa fa-fw fa-question-circle-o"></i>
<span i18n
class="visible-xs-inline-block">Help</span>
<span class="caret"></span>
</a>
<ul *dropdownMenu
Expand Down
4 changes: 3 additions & 1 deletion src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.html
View file
Open in desktop
Expand Up @@ -4,7 +4,9 @@
data-toggle="dropdown"
i18n-title
title="Logged in user">
<i class="fa fa-user fa-fw"></i>
<i class="fa fa-fw fa-user"></i>
<span i18n
class="visible-xs-inline-block">Logged in user</span>
<span class="caret"></span>
</a>
<ul *dropdownMenu
Expand Down
12 changes: 10 additions & 2 deletions ...ybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.scss
View file
Open in desktop
Expand Up @@ -131,7 +131,7 @@
border-color: transparent;
background-color: transparent;
}
@media (min-width: 768px) {
@media (min-width: $screen-sm-min) {
.navbar-primary > li > a {
border-bottom: 4px solid transparent;
}
Expand All @@ -151,9 +151,13 @@
top: 0;
}
}
@media (max-width: 767px) {
@media (max-width: $screen-xs-max) {
.navbar-nav {
margin: 0;

.fa {
margin-right: 0.5em;
}
}

.navbar-collapse,
Expand Down Expand Up @@ -191,6 +195,10 @@

.navbar-utility {
border-top: 1px solid $color-nav-border-top-collapse;

a {
font-size: 1em;
}
}

.navbar-primary > .active > a,
Expand Down
4 changes: 3 additions & 1 deletion ...mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html
View file
Open in desktop
Expand Up @@ -51,5 +51,7 @@
outsideClick="true"
i18n-title
title="Recent Notifications">
<i class="fa fa-bell fa-fw"></i>
<i class="fa fa-fw fa-bell"></i>
<span i18n
class="visible-xs-inline-block">Recent Notifications</span>
</a>
2 changes: 2 additions & 0 deletions ...d/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html
View file
Open in desktop
Expand Up @@ -79,5 +79,7 @@
title="Background Tasks">
<i class="fa fa-fw"
[ngClass]="icon"></i>
<span i18n
class="visible-xs-inline-block">Background Tasks</span>
<span *ngIf="executingTasks.length > 0"> ({{ executingTasks.length }})</span>
</a>
8 changes: 8 additions & 0 deletions src/pybind/mgr/dashboard/frontend/src/defaults.scss
View file
Open in desktop
Expand Up @@ -2,6 +2,14 @@

@import 'vendor.variables';

$screen-sm-min: 768px !default;
$screen-md-min: 992px !default;
$screen-lg-min: 1200px !default;

$screen-xs-max: calc(#{$screen-sm-min} - 1px);
$screen-sm-max: calc(#{$screen-md-min} - 1px);
$screen-md-max: calc(#{$screen-lg-min} - 1px);

$color-solid-red: #ff0000 !default;
$color-pink: #a94442 !default;
$color-light-red: #f2dede !default;
Expand Down
32 changes: 26 additions & 6 deletions src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf
View file
Open in desktop
Expand Up @@ -2326,6 +2326,10 @@
</context-group>
</trans-unit><trans-unit id="1d65cc22d5842c06d33b244fc67de9db4003537e" datatype="html">
<source>Recent Notifications</source>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/notifications/notifications.component.html</context>
<context context-type="linenumber">56</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/notifications/notifications.component.html</context>
<context context-type="linenumber">53</context>
Expand All @@ -2338,12 +2342,20 @@
</context-group>
</trans-unit><trans-unit id="ea94e7754983d80af8acb958a5d49d93bacd721c" datatype="html">
<source>Background Tasks</source>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/task-manager/task-manager.component.html</context>
<context context-type="linenumber">83</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/task-manager/task-manager.component.html</context>
<context context-type="linenumber">79</context>
</context-group>
</trans-unit><trans-unit id="85b79c9064aed1ead31ace985f31aa1363f6bdaf" datatype="html">
<source>Help</source>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/dashboard-help/dashboard-help.component.html</context>
<context context-type="linenumber">13</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/dashboard-help/dashboard-help.component.html</context>
<context context-type="linenumber">10</context>
Expand All @@ -2352,22 +2364,26 @@
<source>Documentation</source>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/dashboard-help/dashboard-help.component.html</context>
<context context-type="linenumber">21</context>
<context context-type="linenumber">23</context>
</context-group>
</trans-unit><trans-unit id="e351b40b3869a5c7d19c3d4918cb1ac7aaab95c4" datatype="html">
<source>API</source>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/dashboard-help/dashboard-help.component.html</context>
<context context-type="linenumber">26</context>
<context context-type="linenumber">28</context>
</context-group>
</trans-unit><trans-unit id="004b222ff9ef9dd4771b777950ca1d0e4cd4348a" datatype="html">
<source>About</source>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/dashboard-help/dashboard-help.component.html</context>
<context context-type="linenumber">31</context>
<context context-type="linenumber">33</context>
</context-group>
</trans-unit><trans-unit id="1481ecd21e760ac919a24e26cf790acd82e40199" datatype="html">
<source>Dashboard Settings</source>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/administration/administration.component.html</context>
<context context-type="linenumber">10</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/administration/administration.component.html</context>
<context context-type="linenumber">7</context>
Expand All @@ -2376,10 +2392,14 @@
<source>User management</source>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/administration/administration.component.html</context>
<context context-type="linenumber">16</context>
<context context-type="linenumber">18</context>
</context-group>
</trans-unit><trans-unit id="049dfd9fe6c78914ad58cf89ac6a631fca28ec74" datatype="html">
<source>Logged in user</source>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/identity/identity.component.html</context>
<context context-type="linenumber">9</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/identity/identity.component.html</context>
<context context-type="linenumber">6</context>
Expand All @@ -2389,13 +2409,13 @@
<x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/><x id="INTERPOLATION" equiv-text="{{ username }}"/><x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/identity/identity.component.html</context>
<context context-type="linenumber">17</context>
<context context-type="linenumber">19</context>
</context-group>
</trans-unit><trans-unit id="5d22c795daf43877a5f708dca2bccd549eb0471d" datatype="html">
<source>Sign out</source>
<context-group purpose="location">
<context context-type="sourcefile">app/core/navigation/identity/identity.component.html</context>
<context context-type="linenumber">25</context>
<context context-type="linenumber">27</context>
</context-group>
</trans-unit><trans-unit id="eeba399c4dae8d4890c27b7a2cd2dc28fcf8b5f9" datatype="html">
<source>Performance Counters</source>
Expand Down