Skip to content

Commit b0c62bb

Browse files
author
OpenShift Bot
authoredNov 22, 2016
Merge pull request #908 from sg00dwin/header-and-tabs-spacing
Merged by openshift-bot
·
v3.11.0v1.5.0
2 parents 95b0902 + 537ab3a commit b0c62bb

29 files changed

+104
-88
lines changed
 

Diff for: ‎app/styles/_core.less

+13-7
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,18 @@
119119
}
120120
}
121121

122-
.nav-tabs, .tab-content {
122+
.nav-tabs {
123123
margin-bottom: @grid-gutter-width / 2;
124-
margin-top: @grid-gutter-width / 2;
125124
}
126125

126+
.resource-details {
127+
h3 {
128+
border-bottom: 1px solid #eee;
129+
padding-bottom: 10px;
130+
}
131+
}
132+
133+
127134
.hide-tabs .nav-tabs {
128135
display: none;
129136
}
@@ -212,6 +219,10 @@ mark {
212219
}
213220
}
214221

222+
.registry-image-pull {
223+
margin-bottom: @grid-gutter-width / 2;
224+
}
225+
215226
.image-sources {
216227
.source-path:after,
217228
.destination-dir:before {
@@ -1149,11 +1160,6 @@ labels + .resource-details {
11491160
margin-top: 21px;
11501161
}
11511162

1152-
.resource-details h3 {
1153-
padding-bottom: 10px;
1154-
border-bottom: 1px solid #eee;
1155-
}
1156-
11571163
h1 small.meta, .build-config-summary .meta {
11581164
font-size: 12px;
11591165
@media (max-width: @screen-xs-min) {

Diff for: ‎app/styles/_log.less

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
}
44
.log-header {
55
margin-bottom: 3px;
6+
margin-top: @grid-gutter-width / 2;
67
label {
78
margin-bottom: 0;
89
}
@@ -245,4 +246,4 @@
245246
.h2();
246247
.empty-state-message();
247248
.text-center();
248-
}
249+
}

Diff for: ‎app/styles/_membership.less

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
}
1111
.content-pane {
1212
width: 100%;
13-
margin-top: 50px;
1413
.col-add-role {
1514
padding: 10px 0;
1615
min-width: 150px;

Diff for: ‎app/styles/_substructure.less

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ html,body {
7070
height: 100%;
7171
.middle-header {
7272
.flex(@columns: 0 0 auto);
73+
margin-bottom: @grid-gutter-width / 2;
7374
}
7475
.middle-content {
7576
.flex(@columns: 1 1 auto);

Diff for: ‎app/views/browse/build-config.html

-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ <h2>No builds.</h2>
193193
<div class="resource-details">
194194
<div class="row">
195195
<div class="col-lg-6">
196-
<h3>Configuration</h3>
197196
<dl class="dl-horizontal left">
198197
<div>
199198
<dt>Build Strategy:</dt>

Diff for: ‎app/views/browse/config-map.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h1>
4646
</div>
4747
</div>
4848
</div><!-- /middle-header-->
49-
<div class="middle-content gutter-top">
49+
<div class="middle-content">
5050
<div class="container-fluid">
5151
<div ng-if="configMap" class="row">
5252
<div class="col-sm-12">

Diff for: ‎app/views/browse/config-maps.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h1>Config Maps</h1>
2323
<div class="middle-content">
2424
<div class="container-fluid">
2525
<div class="row">
26-
<div class="col-md-12 gutter-top">
26+
<div class="col-md-12">
2727
<div ng-if="!loaded">Loading...</div>
2828
<div ng-if="loaded">
2929
<table class="table table-bordered table-hover table-mobile">

Diff for: ‎app/views/browse/deployment-config.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,19 @@ <h1>
9696
<div ng-if="!loaded">Loading...</div>
9797
<div class="row" ng-if="loaded">
9898
<div class="col-md-12" ng-class="{ 'hide-tabs' : !deploymentConfig }">
99+
<div ng-if="deploymentConfig.spec.paused" class="alert alert-info animate-if">
100+
<span class="pficon pficon-info" aria-hidden="true"></span>
101+
<strong>{{deploymentConfig.metadata.name}} is paused.</strong>
102+
This will stop any new deployments and deployment triggers from running
103+
until resumed.
104+
<span ng-if="!updatingPausedState && ('deploymentconfigs' | canI : 'update')">
105+
<a href="" ng-click="setPaused(false)" role="button">Resume deployment</a>
106+
</span>
107+
</div>
99108
<uib-tabset>
100109
<uib-tab active="selectedTab.details">
101110
<uib-tab-heading>Details</uib-tab-heading>
102111
<div class="resource-details" ng-if="deploymentConfig">
103-
<div ng-if="deploymentConfig.spec.paused" class="alert alert-info animate-if">
104-
<span class="pficon pficon-info" aria-hidden="true"></span>
105-
<strong>{{deploymentConfig.metadata.name}} is paused.</strong>
106-
This will stop any new deployments and deployment triggers from running
107-
until resumed.
108-
<span ng-if="!updatingPausedState && ('deploymentconfigs' | canI : 'update')">
109-
<a href="" ng-click="setPaused(false)" role="button">Resume deployment</a>
110-
</span>
111-
</div>
112112
<div class="row">
113113
<div class="col-lg-6">
114114
<h3>Configuration</h3>

Diff for: ‎app/views/browse/image.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ <h1>
1616
</div>
1717
</div>
1818
</div><!-- /middle-header-->
19-
<div class="middle-content gutter-top" persist-tab-state>
19+
<div class="middle-content" persist-tab-state>
2020
<div class="container-fluid">
2121
<div ng-if="imageStream && !image">Loading...</div>
2222
<div class="row" ng-if="image">
@@ -32,7 +32,7 @@ <h1>
3232
</registry-image-meta>
3333
</uib-tab>
3434
<uib-tab heading="Config" active="selectedTab.config">
35-
<uib-tab-heading>Config</uib-tab-heading>
35+
<uib-tab-heading>Configuration</uib-tab-heading>
3636
<registry-image-config image="image">
3737
</registry-image-config>
3838
</uib-tab>

Diff for: ‎app/views/browse/imagestream.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h1>
4040
</div>
4141
</div>
4242
</div><!-- /middle-header-->
43-
<div class="middle-content gutter-top">
43+
<div class="middle-content">
4444
<div class="container-fluid">
4545
<div class="row" ng-if="imageStream">
4646
<div class="col-md-12">

Diff for: ‎app/views/browse/persistent-volume-claim.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ <h1>
5050
<div class="middle-content">
5151
<div class="container-fluid">
5252
<div class="row" ng-if="pvc" >
53-
<div class="col-md-12 gutter-top">
53+
<div class="col-md-12">
5454
<div class="resource-details">
5555
<dl class="dl-horizontal left">
5656
<dt>Status:</dt>
@@ -84,4 +84,3 @@ <h1>
8484
</div><!-- /middle-container -->
8585
</div><!-- /middle-section -->
8686
</project-page>
87-

Diff for: ‎app/views/browse/pod.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ <h2>
133133
</div>
134134

135135
<div ng-if="!noContainersYet">
136-
<div class="mar-bottom-md">
136+
<div class="mar-bottom-md mar-top-xl">
137137
<span class="pficon pficon-info" aria-hidden="true"></span>
138138
When you navigate away from this pod, any open terminal connections will be closed.
139139
This will kill any foreground processes you started from the terminal.

Diff for: ‎app/views/browse/route.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h1>
4747
</div>
4848
</div>
4949
</div><!-- /middle-header-->
50-
<div class="middle-content gutter-top">
50+
<div class="middle-content">
5151
<div class="container-fluid">
5252
<div class="row" ng-if="route">
5353
<div class="col-sm-12">

Diff for: ‎app/views/browse/routes.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h1>Routes</h1>
2323
<div class="middle-content">
2424
<div class="container-fluid">
2525
<div class="row">
26-
<div class="col-md-12 gutter-top">
26+
<div class="col-md-12">
2727
<table class="table table-bordered table-hover table-mobile">
2828
<thead>
2929
<tr>

Diff for: ‎app/views/browse/secret.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h1>
3838
</div>
3939
</div>
4040
</div><!-- /middle-header-->
41-
<div class="middle-content gutter-top">
41+
<div class="middle-content">
4242
<div class="container-fluid">
4343
<div ng-if="secret" class="row">
4444
<div class="col-sm-12">

Diff for: ‎app/views/builds.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1>Builds</h1>
2020
<div class="middle-content">
2121
<div class="container-fluid">
2222
<div class="row">
23-
<div class="col-md-12 gutter-top">
23+
<div class="col-md-12">
2424
<table class="table table-bordered table-hover table-mobile">
2525
<thead>
2626
<tr>

Diff for: ‎app/views/deployments.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ <h1>Deployments</h1>
2020
<div class="middle-content">
2121
<div class="container-fluid">
2222
<div class="row">
23-
<div class="col-md-12"
24-
ng-class="{ 'gutter-top': !(deployments | hashSize) && !(replicaSets | hashSize) }">
23+
<div class="col-md-12">
2524
<h3 ng-if="(deployments | hashSize) || (replicaSets | hashSize)">Deployment Configurations</h3>
2625
<table class="table table-bordered table-hover table-mobile">
2726
<thead>

Diff for: ‎app/views/directives/annotations.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="gutter-top-bottom">
1+
<div class="gutter-bottom">
22
<p>
33
<a href="" ng-click="toggleAnnotations()" ng-if="!expandAnnotations">Show annotations</a>
44
<a href="" ng-click="toggleAnnotations()" ng-if="expandAnnotations">Hide annotations</a>

Diff for: ‎app/views/directives/pod-metrics.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="metrics" ng-if="pod || deployment">
1+
<div class="metrics mar-top-xl" ng-if="pod || deployment">
22
<div ng-show="!metricsError" class="metrics-options">
33
<!-- Let the user select the container if we're showing pod metrics. -->
44
<div ng-if="pod.spec.containers.length" class="form-group">

Diff for: ‎app/views/events.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h1>Events</h1>
1515
<div class="middle-content">
1616
<div class="container-fluid">
1717
<div class="row">
18-
<div class="col-md-12 gutter-top" ng-if="projectContext">
18+
<div class="col-md-12" ng-if="projectContext">
1919
<events project-context="projectContext" ng-if="projectContext"></events>
2020
</div>
2121
</div>

Diff for: ‎app/views/images.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1>Image Streams</h1>
2020
<div class="middle-content">
2121
<div class="container-fluid">
2222
<div class="row">
23-
<div class="col-md-12 gutter-top">
23+
<div class="col-md-12">
2424
<table class="table table-bordered table-hover table-mobile">
2525
<thead>
2626
<tr>

Diff for: ‎app/views/other-resources.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h1>Other Resources</h1>
2727
<div class="middle-content">
2828
<div class="container-fluid">
2929
<div class="row">
30-
<div class="col-md-12 gutter-top">
30+
<div class="col-md-12">
3131
<table class="table table-bordered table-mobile" ng-class="{ 'table-empty': (resources | hashSize) === 0 }">
3232
<thead>
3333
<tr>

Diff for: ‎app/views/pipelines.html

+11-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,20 @@
44
<!-- Middle section -->
55
<div class="middle-section">
66
<div class="middle-container">
7+
<div class="middle-header">
8+
<div class="container-fluid">
9+
<div class="page-header page-header-bleed-right page-header-bleed-left">
10+
<h1>
11+
Pipelines
12+
</h1>
13+
<alerts alerts="alerts"></alerts>
14+
</div>
15+
</div>
16+
</div>
717
<div class="middle-content pipelines-page">
818
<div class="container-fluid">
919
<div class="row">
1020
<div class="col-md-12">
11-
<div class="page-header page-header-bleed-right page-header-bleed-left">
12-
<h1 class="mar-top-none">Pipelines</h1>
13-
</div>
14-
<alerts alerts="alerts"></alerts>
1521
<div ng-if="!(buildConfigs | hashSize)" class="mar-top-lg">
1622
<div ng-if="!buildConfigsLoaded">
1723
Loading...
@@ -45,7 +51,7 @@ <h2>No pipelines.</h2>
4551
Start Pipeline
4652
</button>
4753
</div>
48-
<h2>
54+
<h2 class="mar-top-none">
4955
<a ng-href="{{buildConfig | navigateResourceURL}}">{{buildConfigName}}</a>
5056
<small>created <span am-time-ago="buildConfig.metadata.creationTimestamp"></span></small>
5157
</h2>

Diff for: ‎app/views/pods.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1>Pods</h1>
2020
<div class="middle-content">
2121
<div class="container-fluid">
2222
<div class="row">
23-
<div class="col-md-12 gutter-top">
23+
<div class="col-md-12">
2424
<pods-table pods="pods" empty-message="emptyMessage"></pods-table>
2525
</div><!-- /col-* -->
2626
</div>

Diff for: ‎app/views/project.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h1 title="Overview">Overview</h1>
3535
<div class="middle-content surface-shaded">
3636
<div class="container-fluid surface-shaded">
3737
<div class="row">
38-
<div class="col-md-12 gutter-top">
38+
<div class="col-md-12">
3939

4040
<!-- Empty states -->
4141
<div ng-if="(services | hashSize) === 0 && (monopodsByService[''] | hashSize) === 0 && (deploymentsByServiceByDeploymentConfig[''] | hashSize) === 0">
@@ -122,7 +122,7 @@ <h2 ng-if="displayRouteByService[serviceId]" ng-init="otherRoutes = (routesBySer
122122
<span class="pficon pficon-warning-triangle-o" aria-hidden="true"></span>
123123
This service has <a href="project/{{projectName}}/browse/routes">routes</a> with warnings.
124124
</small>
125-
</div>
125+
</div>
126126
</h2>
127127

128128
<!-- If no route is present, show the service name large -->

Diff for: ‎app/views/secrets.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1>Secrets</h1>
2020
<div ng-if="!loaded" class="mar-top-xl">Loading...</div>
2121
<div ng-if="loaded" class="row">
2222
<div class="col-md-12">
23-
<h3>Source Secrets</h3>
23+
<h2>Source Secrets</h2>
2424
<table class="table table-bordered table-hover table-mobile secrets-table">
2525
<thead>
2626
<tr>
@@ -49,7 +49,7 @@ <h3>Source Secrets</h3>
4949
</tbody>
5050
</table>
5151
<div ng-if="secretsByType.images.length !== 0">
52-
<h3>Image Secrets</h3>
52+
<h2>Image Secrets</h2>
5353
<table class="table table-bordered table-hover table-mobile secrets-table">
5454
<thead>
5555
<tr>
@@ -74,7 +74,7 @@ <h3>Image Secrets</h3>
7474
</table>
7575
</div>
7676
<div ng-if="secretsByType.other.length !== 0">
77-
<h3>Other Secrets</h3>
77+
<h2>Other Secrets</h2>
7878
<table class="table table-bordered table-hover table-mobile secrets-table">
7979
<thead>
8080
<tr>

Diff for: ‎app/views/services.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1>Services</h1>
2020
<div class="middle-content">
2121
<div class="container-fluid">
2222
<div class="row">
23-
<div class="col-md-12 gutter-top">
23+
<div class="col-md-12">
2424
<table class="table table-bordered table-hover table-mobile">
2525
<thead>
2626
<tr>

0 commit comments

Comments
 (0)
Please sign in to comment.