Skip to content

Commit e132ea3

Browse files
committed
Merge branch 'client-470-seed' of https://github.com/wavesplatform/WavesGUI into client-473-release
2 parents 6225965 + b61cbca commit e132ea3

2 files changed

Lines changed: 20 additions & 10 deletions

File tree

src/modules/utils/modals/settings/settings.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@
4444

4545
<w-step step-id="security" class="security">
4646
<div class="row margin-1">
47-
<div class="footnote disabled-600 label" w-i18n="modal.settings.security.backupPhrase"></div>
47+
<div class="footnote-1 disabled-600 label" w-i18n="modal.settings.security.backupPhrase"></div>
4848
<div class="data-field">
4949
<w-button ng-if="!$ctrl.shownSeed" class="tiny" ng-click="$ctrl.shownSeed = true">
5050
<w-i18n>modal.settings.security.show</w-i18n>
5151
</w-button>
52-
<div ng-if="$ctrl.shownSeed">{{::$ctrl.phrase}}</div>
52+
<pre class="footnote-1" ng-if="$ctrl.shownSeed">{{::$ctrl.phrase}}</pre>
5353
</div>
5454
</div>
5555

5656
<div class="row margin-1">
57-
<div class="footnote disabled-600 label" w-i18n="modal.settings.security.privateKey"></div>
57+
<div class="footnote-1 disabled-600 label" w-i18n="modal.settings.security.privateKey"></div>
5858
<div class="data-field">
5959
<w-button ng-if="!$ctrl.shownKey" class="tiny" ng-click="$ctrl.shownKey = true">
6060
<w-i18n>modal.settings.security.show</w-i18n>
@@ -63,26 +63,26 @@
6363
</div>
6464
</div>
6565
<div class="row flex-row row-style">
66-
<div class="footnote disabled-600" w-i18n="modal.settings.security.publicKey"></div>
66+
<div class="footnote-1 disabled-600" w-i18n="modal.settings.security.publicKey"></div>
6767
<div>{{::$ctrl.publicKey}}</div>
6868
</div>
6969

7070
<div class="row flex-row row-style">
71-
<div class="footnote disabled-600" w-i18n="modal.settings.security.address"></div>
71+
<div class="footnote-1 disabled-600" w-i18n="modal.settings.security.address"></div>
7272
<div>{{::$ctrl.address}}</div>
7373
</div>
7474
</w-step>
7575

7676
<w-step step-id="network" class="network">
7777
<div class="row margin-1">
78-
<div class="footnote disabled-600 label" w-i18n="modal.settings.network.nodeAddress"></div>
78+
<div class="footnote-1 disabled-600 label" w-i18n="modal.settings.network.nodeAddress"></div>
7979
<div class="data-field">
8080
<w-input ng-model="$ctrl.node"></w-input>
8181
</div>
8282
</div>
8383

8484
<div class="row margin-3">
85-
<div class="footnote disabled-600 label" w-i18n="modal.settings.network.matcherAddress"></div>
85+
<div class="footnote-1 disabled-600 label" w-i18n="modal.settings.network.matcherAddress"></div>
8686
<div class="data-field">
8787
<w-input ng-model="$ctrl.matcher"></w-input>
8888
</div>
@@ -95,17 +95,17 @@
9595

9696
<w-step step-id="info" class="info">
9797
<div class="row flex-row row-style">
98-
<div class="footnote disabled-600" w-i18n="modal.settings.info.version"></div>
98+
<div class="footnote-1 disabled-600" w-i18n="modal.settings.info.version"></div>
9999
<div>{{::$ctrl.appName}} {{::$ctrl.appVersion}}</div>
100100
</div>
101101

102102
<div class="row flex-row row-style">
103-
<div class="footnote disabled-600" w-i18n="modal.settings.info.support"></div>
103+
<div class="footnote-1 disabled-600" w-i18n="modal.settings.info.support"></div>
104104
<div><a href="{{::$ctrl.supportLink}}" target="_blank">{{::$ctrl.supportLinkName}}</a></div>
105105
</div>
106106

107107
<div class="row flex-row row-style">
108-
<div class="footnote disabled-600">&copy; 2017 Waves Platform</div>
108+
<div class="footnote-1 disabled-600">&copy; 2017 Waves Platform</div>
109109
<div><span class="waves-logo"></span></div>
110110
</div>
111111
</w-step>

src/modules/utils/modals/settings/settings.less

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,16 @@ md-dialog.settings-modal {
149149
border-radius: 4px;
150150
border: 1px dashed @color-basic-200;
151151
padding: 0 15px;
152+
overflow: auto;
153+
154+
pre {
155+
display: block;
156+
position: absolute;
157+
line-height: 1em;
158+
margin: 0;
159+
padding: 19px 0 10px 0;
160+
top: 0;
161+
}
152162

153163
input {
154164
border-radius: @border-radius;

0 commit comments

Comments
 (0)