You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2019/03/07 15:49:31 UTC
[ignite] branch master updated: IGNITE-11506 Web console: Tweak CSS
to show long user name.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 06c70c5 IGNITE-11506 Web console: Tweak CSS to show long user name.
06c70c5 is described below
commit 06c70c56ad601f231ff246f01ce4d92d94c785a6
Author: Ilya Borisov <kl...@gmail.com>
AuthorDate: Thu Mar 7 22:48:27 2019 +0700
IGNITE-11506 Web console: Tweak CSS to show long user name.
---
.../frontend/app/components/breadcrumbs/style.scss | 5 ++---
.../web-console-header/components/user-menu/style.scss | 15 +++++++++++++++
.../web-console-header/components/user-menu/template.pug | 4 ++--
.../web-console/frontend/public/stylesheets/style.scss | 2 +-
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/modules/web-console/frontend/app/components/breadcrumbs/style.scss b/modules/web-console/frontend/app/components/breadcrumbs/style.scss
index f0a98ee..1638ea6 100644
--- a/modules/web-console/frontend/app/components/breadcrumbs/style.scss
+++ b/modules/web-console/frontend/app/components/breadcrumbs/style.scss
@@ -18,13 +18,12 @@
breadcrumbs {
$side-margin: 5px;
- padding-left: $side-margin;
- padding-right: $side-margin;
+ padding: 3px $side-margin;
display: inline-flex;
align-items: center;
flex-direction: row;
- height: 26px;
+ min-height: 20px;
border-radius: 4px;
background-color: rgba(197, 197, 197, 0.1);
font-size: 12px;
diff --git a/modules/web-console/frontend/app/components/web-console-header/components/user-menu/style.scss b/modules/web-console/frontend/app/components/web-console-header/components/user-menu/style.scss
index 898047b..9d9e3e3 100644
--- a/modules/web-console/frontend/app/components/web-console-header/components/user-menu/style.scss
+++ b/modules/web-console/frontend/app/components/web-console-header/components/user-menu/style.scss
@@ -18,11 +18,26 @@
user-menu {
--active-link-color: #ee2b27;
font-size: 14px;
+ max-width: 150px;
+ max-height: 100%;
+ display: flex;
&>.active {
color: var(--active-link-color)
}
.caret {
margin-left: 8px;
+ margin-top: 3px;
+ align-self: center;
+ }
+ .user-menu__username {
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ }
+ .user-menu__trigger {
+ display: flex;
+ max-height: 100%;
+ overflow: hidden;
}
}
\ No newline at end of file
diff --git a/modules/web-console/frontend/app/components/web-console-header/components/user-menu/template.pug b/modules/web-console/frontend/app/components/web-console-header/components/user-menu/template.pug
index e946c78..4940e52 100644
--- a/modules/web-console/frontend/app/components/web-console-header/components/user-menu/template.pug
+++ b/modules/web-console/frontend/app/components/web-console-header/components/user-menu/template.pug
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-div(
+div.user-menu__trigger(
ng-class='{active: $ctrl.$state.includes("base.settings")}'
ng-click='$event.stopPropagation()'
bs-dropdown='$ctrl.items'
@@ -22,5 +22,5 @@ div(
data-trigger='hover focus'
data-container='self'
)
- span {{$ctrl.user.firstName}} {{$ctrl.user.lastName}}
+ span.user-menu__username {{$ctrl.user.firstName}} {{$ctrl.user.lastName}}
span.caret
\ No newline at end of file
diff --git a/modules/web-console/frontend/public/stylesheets/style.scss b/modules/web-console/frontend/public/stylesheets/style.scss
index a8b9a10..be31060 100644
--- a/modules/web-console/frontend/public/stylesheets/style.scss
+++ b/modules/web-console/frontend/public/stylesheets/style.scss
@@ -2071,7 +2071,7 @@ header.header-with-selector {
h1 {
- height: 36px;
+ min-height: 36px;
margin: 0;
margin-right: 8px;