Updated styles.

GovTechSG · Mar 29, 2018 · 48d674f · 48d674f
1 parent 1930948
commit 48d674f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/src/css/style.css b/src/css/style.css
@@ -60,6 +60,9 @@ pre, .wrap {
  white-space: -o-pre-wrap; /* Opera 7 */
  word-wrap: break-word; /* Internet Explorer 5.5+ */
 }
+.code {
+ font-family: monospace;
+}
 
 /* --- Loading Animations --- */
 .spinner {

diff --git a/src/features/joseValidator.js b/src/features/joseValidator.js
@@ -18,7 +18,7 @@ let joseValidatorTemplate = `
  <div class="col-md-12">
  <h4>Verify JWT</h4>
  <label for="jwt-response">JSON serialized JWT response from APEX</label>
- <textarea rows="12" class="form-control" ng-model="$ctrl.input" id="jwt-response"
+ <textarea rows="12" class="form-control code" ng-model="$ctrl.input" id="jwt-response"
  placeholder="Paste API response here">
  </textarea>
  </div>
@@ -34,7 +34,7 @@ let joseValidatorTemplate = `
  Private Key to decrypt JWT
  </label>
  
- <textarea rows="12" class="form-control" ng-model="$ctrl.key" id="key-content" 
+ <textarea rows="12" class="form-control code" ng-model="$ctrl.key" id="key-content" 
  placeholder="Paste or load certificate/key contents here">
  </textarea>
  </div>
@@ -51,7 +51,7 @@ let joseValidatorTemplate = `
  <div class="col-md-12">
  <h4>Output</h4>
  <label for="verification-results">Verification results</label>
- <textarea rows="8" class="form-control" ng-model="$ctrl.output" id="verification-results"
+ <textarea rows="8" class="form-control code" ng-model="$ctrl.output" id="verification-results"
  placeholder="Parsed Output"></textarea>
  </div>
 </div>

diff --git a/src/features/paramsModal.js b/src/features/paramsModal.js
@@ -3,13 +3,10 @@ let paramsModalTemplate = `
  <h3 class="modal-title">Parameters Setup</h3>
 </div>
 <div class="modal-body">
- additionalParams
- Select json file to load:
- <input type="file" on-read-file="parseInputFile($fileContents)"
- class="btn btn-default" style="display:inline-block">
- <br/> <br/>
- <textarea rows="20" cols="65" class="form-control" ng-model="jsonString" ng-keydown="handleTabKey($event)" style="font-family:monospace"></textarea>
+ Select json file to load: <input type="file" on-read-file="parseInputFile($fileContents)" style="display:inline-block">
 
+ <textarea rows="20" cols="65" class="form-control code" ng-model="jsonString" ng-keydown="handleTabKey($event)" 
+ style="margin-top: 5px;"></textarea>
 </div>
 <div class="modal-footer">
  <button class="btn btn-primary" type="button" ng-click="set()">

diff --git a/src/features/signatureValidator.js b/src/features/signatureValidator.js
@@ -12,8 +12,7 @@ let signatureValidatorTemplate = `
 <div class="heading">
  <span class="label label-primary">1</span> Input Request Parameters and Generate Basestring
  <span ng-click="$ctrl.showOptions()" style="float: right;">
- <a href>
- <span class="glyphicon glyphicon-cog"></span> Options</a>
+ <a href><span class="glyphicon glyphicon-cog"></span> Load/save From JSON</a>
  </span>
 </div>
 
@@ -209,16 +208,13 @@ let signatureValidatorTemplate = `
  <div ng-if="$ctrl.showLevel2">
  <h4>Pem File
  <small>
- Load pem file
+ Load pem file: <input type="file" on-read-file="parseInputFile($fileContents)" style="display:inline">
  </small>
  </h4>
- <span class="col-md-12" style='text-align:center'>
- <input type="file" on-read-file="parseInputFile($fileContents)" class="btn btn-default" style="display:inline">
- </span>
  <div class="row">
  <div class="col-md-12">
  <br>
- <textarea rows="10" cols="65" class="form-control" ng-model="$ctrl.pem" name="pem" required></textarea>
+ <textarea rows="10" cols="65" class="form-control code" ng-model="$ctrl.pem" name="pem" required></textarea>
  <br>
  <span ng-show="paramForm.pem.$touched && paramForm.pem.$invalid" class="fail">
  Pem string is required.
@@ -263,12 +259,12 @@ let signatureValidatorTemplate = `
 
  <div class="col-md-12">
  <h4>Generated Basestring:</h4>
- <textarea rows="3" disabled class="form-control immutable" ng-model="input_basestring"></textarea>
+ <textarea rows="3" disabled class="form-control immutable code" ng-model="input_basestring"></textarea>
  </div>
  <div class="col-md-12">
  <h4>Basestring to Compare:</h4>
 
- <textarea rows="3" class="form-control" ng-model="input_basestring_tocompare"></textarea>
+ <textarea rows="3" class="form-control code" ng-model="input_basestring_tocompare"></textarea>
  </div>
  <div class="col-md-12 fx-fade-normal" ng-if="showBaseStringCompareResults">
  <h4>Comparison Results</h4>
@@ -285,7 +281,7 @@ let signatureValidatorTemplate = `
 
  <div ng-if="showAuthHeader">
  <h4>Request Auth Header:</h4>
- <textarea rows="10" ng-model="authHeader" disable class="form-control immutable" disabled></textarea>
+ <textarea rows="10" ng-model="authHeader" disable class="form-control immutable code" disabled></textarea>
  </div>
 
  <div style="text-align: center" ng-if="!sendingTestRequest">