From d7b127fa2df9b438cfc6a45c3d7357f9544a61b3 Mon Sep 17 00:00:00 2001 From: lauren Vuchetich Date: Thu, 28 Jul 2016 12:44:38 -0700 Subject: [PATCH] 0718issues (#787) * rancher/rancher#5448 rancher/rancher#5447 access control border on small modal * fix on last commit * rancher/rancher#5447 --- .../form-service-links/template.hbs | 2 +- .../storagepool-section/template.hbs | 6 +- app/components/tooltip-warning/template.hbs | 6 +- app/styles/components/_tooltip.scss | 1 + app/styles/layout/_header.scss | 4 +- app/styles/layout/_sm-screen.scss | 139 +++++++++--------- 6 files changed, 81 insertions(+), 77 deletions(-) diff --git a/app/components/form-service-links/template.hbs b/app/components/form-service-links/template.hbs index 265d781ec..913c95ade 100644 --- a/app/components/form-service-links/template.hbs +++ b/app/components/form-service-links/template.hbs @@ -20,7 +20,7 @@   {{#each serviceLinksArray as |link|}} - + {{new-select classNames="form-control service-link input-sm" diff --git a/app/components/storagepool-section/template.hbs b/app/components/storagepool-section/template.hbs index 939f02c16..d2f087d7c 100644 --- a/app/components/storagepool-section/template.hbs +++ b/app/components/storagepool-section/template.hbs @@ -45,7 +45,7 @@ {{sortable-th sortable=this action="changeSort" name="state" width="115" label="generic.state"}} {{sortable-th sortable=this action="changeSort" name="name" width="350" label="storagePoolSection.models.table.header.volumeName"}} {{t 'storagePoolSection.models.table.header.activeMounts'}} -   +   @@ -59,7 +59,7 @@

{{vol.displayName}}

{{/tooltip-element}} - + {{#if vol.activeMounts.length}} {{#each vol.activeMounts as |mount|}}
@@ -91,7 +91,7 @@ {{t 'storagePoolSection.models.table.header.snapshotState'}} {{t 'storagePoolSection.models.table.header.snapshotName'}} {{t 'storagePoolSection.models.table.header.backedUp'}} -   +   diff --git a/app/components/tooltip-warning/template.hbs b/app/components/tooltip-warning/template.hbs index 9a2f0f96c..4ae04f302 100644 --- a/app/components/tooltip-warning/template.hbs +++ b/app/components/tooltip-warning/template.hbs @@ -1,4 +1,6 @@ - +
+ {{t 'tooltipWarning.notConfigured'}} -
{{t 'tooltipWarning.dismiss'}}
+
{{t 'tooltipWarning.dismiss'}}
+
diff --git a/app/styles/components/_tooltip.scss b/app/styles/components/_tooltip.scss index 701b7ceae..63cfe1b26 100644 --- a/app/styles/components/_tooltip.scss +++ b/app/styles/components/_tooltip.scss @@ -152,6 +152,7 @@ .tooltip-warning-container { background : $lightTeal; color : white; + cursor: pointer; &.top::after { border-top : 5px solid $lightTeal; diff --git a/app/styles/layout/_header.scss b/app/styles/layout/_header.scss index ab0d69bba..d5a6165f5 100644 --- a/app/styles/layout/_header.scss +++ b/app/styles/layout/_header.scss @@ -203,6 +203,8 @@ HEADER { .gh-block-detail { color: $text-color; + max-width: 175px; + font-size: .85em; } .user-logout { @@ -212,7 +214,7 @@ HEADER { position: absolute; top: 0; right: 0; - padding: 18px 10px; + padding: 17px 10px; font-size: 12px; text-align: center; vertical-align: middle; diff --git a/app/styles/layout/_sm-screen.scss b/app/styles/layout/_sm-screen.scss index b4319c9ed..bdb9047e6 100644 --- a/app/styles/layout/_sm-screen.scss +++ b/app/styles/layout/_sm-screen.scss @@ -92,88 +92,87 @@ } } - .well { - padding: 0; - } -} + /*responsive tables and nav 695-959*/ -/*responsive tables and nav*/ -@media (max-width: $screen-sm-max) { - table, - thead, - tbody, - th, - td, - tr { - display: block; - } + table, + thead, + tbody, + th, + td, + tr { + display: block; + } - thead { - height: 0; - position: absolute; - top: -9999px; - left: -9999px; - - & tr { + thead { + height: 0; position: absolute; top: -9999px; left: -9999px; + + & tr { + position: absolute; + top: -9999px; + left: -9999px; + } + } + + tr { + border: 1px solid $table-border-color; + margin: 10px 0; + + &.sm-noborder{ + border-width: 0px; } } - tr { - border: 1px solid $table-border-color; - margin: 10px 0; -} + td { + border: none; + border-bottom: 1px solid #eee; + position: relative; + padding-left: 50%; + white-space: normal; + text-align:left; + width: 100% !important; + border-right: none !important; - td { - border: none; - border-bottom: 1px solid #eee; - position: relative; - padding-left: 50%; - white-space: normal; - text-align:left; - width: 100% !important; - border-right: none !important; - - & .spark-line { - width: 44px !important; + & .spark-line { + width: 44px !important; + } } - } - td:before { - content: attr(data-title); - width: 45%; - margin-right: 10px; - white-space: nowrap; - text-align:left; - font-weight: bold; - } + td:before { + content: attr(data-title); + width: 45%; + margin-right: 10px; + white-space: nowrap; + text-align:left; + font-weight: bold; + } - .stack-section .grid td.state { - padding: 10px !important; - } + .stack-section .grid td.state { + padding: 10px !important; + } -.grid TD.actions { - position: static; - text-align: left; - } + .grid TD.actions { + position: static; + text-align: left; + } - .stack-section { - background: transparent !important; - } - .stack-section .grid TD, .stack-section .grid TH { - border-bottom: 1px dotted $table-border-color !important; - border-top: none; - text-align: left !important; - } + .stack-section { + background: transparent !important; + } + .stack-section .grid TD, .stack-section .grid TH { + border-bottom: 1px dotted $table-border-color !important; + border-top: none; + text-align: left !important; + } - .grid > thead > tr > th, - .grid > thead > tr > td, - .grid > tbody > tr > th, - .grid > tbody > tr > td, - .grid > tfoot > tr > th, - .grid > tfoot > tr > td { - border-top: none; - } -} \ No newline at end of file + .grid > thead > tr > th, + .grid > thead > tr > td, + .grid > tbody > tr > th, + .grid > tbody > tr > td, + .grid > tfoot > tr > th, + .grid > tfoot > tr > td { + border-top: none; + } + } \ No newline at end of file