Skip to content

Commit 019253b

Browse files
committed
Merge pull request #294 from maciaszczykm/ui-overview
Style update
2 parents d68ec3f + 25295e7 commit 019253b

File tree

8 files changed

+25
-11
lines changed

8 files changed

+25
-11
lines changed

src/app/frontend/_variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ $headline-font-size-base: rem(2.4) !default;
2424
$subhead-font-size-base: rem(1.6) !default;
2525
$body-font-size-base: rem(1.4) !default;
2626
$caption-font-size-base: rem(1.2) !default;
27+
$toolbar-height-size-base: rem(6.4) !default;
2728

2829
$primary: #326de6;
2930
$warning: #ffa500;

src/app/frontend/chrome/chrome.scss

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
.kd-toolbar {
2424
box-shadow: $whiteframe-shadow-1dp;
25+
height: $toolbar-height-size-base;
26+
position: fixed;
2527
}
2628

2729
body {
@@ -38,11 +40,14 @@ a {
3840
}
3941
}
4042

41-
.kd-toolbar-tools,
42-
.kd-app-content-wrapper {
43+
.kd-toolbar-tools {
4344
margin: 0 auto;
4445
}
4546

47+
.kd-app-content-wrapper {
48+
margin-top: $toolbar-height-size-base;
49+
}
50+
4651
.kd-app-content {
4752
position: relative;
4853
}

src/app/frontend/deploy/deployfromsettings.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@
7979
</kd-help-section>
8080

8181
<kd-help-section>
82-
<md-switch ng-model="ctrl.isExternal" class="md-primary"
82+
<md-checkbox ng-model="ctrl.isExternal" class="md-primary"
8383
ng-model-options="{ debounce: { 'default': 500, 'blur': 0 } }">
8484
Expose service externally
85-
</md-switch>
85+
</md-checkbox>
8686
</kd-help-section>
8787

8888
<div ng-show="ctrl.isMoreOptionsEnabled()">

src/app/frontend/replicasetdetail/replicasetdetail.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h1 flex class="md-title kd-replicasetdetail-app-name">
2929
</div>
3030
<div flex layout="column" class="kd-replicasetdetail-sidebar-item">
3131
<span class="kd-replicasetdetail-sidebar-title kd-replicasetdetail-sidebar-info">
32-
Replica set
32+
Replica Set
3333
</span>
3434
<div layout="row" flex="nogrow">
3535
<md-button class="md-primary" ng-click="ctrl.handleDeleteReplicaSetDialog()">

src/app/frontend/replicasetdetail/serviceendpoint.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
-->
1616

1717
<div>
18-
{{::endpoint.host}}
1918
<span ng-repeat="port in ::endpoint.ports">
20-
{{::port.port}}/{{::port.protocol}}<span ng-if="::!$last">,</span>
19+
{{::endpoint.host}}:{{::port.port}} {{::port.protocol}}
20+
<br ng-if="::!$last">
2121
</span>
2222
</div>

src/app/frontend/replicasetlist/replicasetcard.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
.kd-replicaset-card-title {
3333
font-weight: $regular-font-weight;
3434
margin: 0;
35+
36+
&:hover {
37+
text-decoration: underline;
38+
}
3539
}
3640

3741
.kd-replicaset-card-description {
@@ -67,7 +71,8 @@
6771
}
6872

6973
.kd-replicaset-card-section {
70-
margin-top: 2 * $baseline-grid;
74+
margin-top: $baseline-grid;
75+
padding-right: $baseline-grid / 2;
7176
}
7277

7378
.kd-replicaset-card-section-title {

src/app/frontend/replicasetlist/replicasetlist.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
.md-fab {
1818
&.kd-replicaset-deploy {
19-
position: absolute;
19+
position: fixed;
2020
right: 0;
21-
top: -56px / 2 - $baseline-grid;
21+
top: $toolbar-height-size-base - $baseline-grid * 3.5 - $baseline-grid;
2222
}
2323
}

src/app/frontend/replicasetlist/replicasetlistcontainer.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
13-
// limitations under the License.
13+
// limitations under the License.
14+
15+
@import '../variables';
1416

1517
.kd-replica-set-list-container {
1618
align-content: center;
1719
align-items: center;
1820
display: flex;
1921
flex-flow: column wrap;
2022
justify-content: top;
23+
margin-top: $toolbar-height-size-base;
2124
}

0 commit comments

Comments
 (0)