You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by ah...@apache.org on 2017/02/13 12:39:55 UTC
zeppelin git commit: [ZEPPELIN-2081] Prettify input,
textarea in interpreter setting page
Repository: zeppelin
Updated Branches:
refs/heads/master 5853dd244 -> 9b55f5860
[ZEPPELIN-2081] Prettify input, textarea in interpreter setting page
### What is this PR for?
Fix small details in interpreter setting page about inputboxes, textareas
- Set align middle for `td`
- Keep same min-height between input and textarea
- Add border-radius 3px;
### What type of PR is it?
[Improvement]
### What is the Jira issue?
[ZEPPELIN-2081](https://issues.apache.org/jira/browse/ZEPPELIN-2081)
### How should this be tested?
Open the browser and check manually.
### Screenshots (if appropriate)
#### Before: Invalid align
![image](https://cloud.githubusercontent.com/assets/4968473/22731438/06a84124-ee2e-11e6-9367-96d59a2dbc2a.png)
#### Before: Inconsistent min-height
![image](https://cloud.githubusercontent.com/assets/4968473/22731449/0bdab870-ee2e-11e6-9ee3-450e1b1508bf.png)
#### After: align
![image](https://cloud.githubusercontent.com/assets/4968473/22731451/11a303f2-ee2e-11e6-9ed4-708ca01e637d.png)
#### After: min-height
![image](https://cloud.githubusercontent.com/assets/4968473/22731456/15f295ee-ee2e-11e6-915d-e9d7d6236bbd.png)
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1a...@gmail.com>
Closes #1991 from 1ambda/ZEPPELIN-2081/prettify-intp-setting-boxes and squashes the following commits:
71f3b58 [1ambda] fix: Same font between input, textarea
7e2499b [1ambda] feat: Set middle align, min height
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9b55f586
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9b55f586
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9b55f586
Branch: refs/heads/master
Commit: 9b55f586051186a5ae1925757b9dacff90977091
Parents: 5853dd2
Author: 1ambda <1a...@gmail.com>
Authored: Mon Feb 13 12:32:00 2017 +0900
Committer: ahyoungryu <ah...@apache.org>
Committed: Mon Feb 13 21:39:00 2017 +0900
----------------------------------------------------------------------
zeppelin-web/src/app/interpreter/interpreter.css | 9 +++++++++
zeppelin-web/src/app/interpreter/interpreter.html | 15 +++++++--------
2 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9b55f586/zeppelin-web/src/app/interpreter/interpreter.css
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/interpreter/interpreter.css b/zeppelin-web/src/app/interpreter/interpreter.css
index 554ecbc..e1562a4 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.css
+++ b/zeppelin-web/src/app/interpreter/interpreter.css
@@ -39,6 +39,15 @@
display: block;
height: 23px;
border: 1px solid #CCCCCC;
+ border-radius: 3px;
+ vertical-align: middle;
+ font-size: 12px;
+}
+
+.interpreter textarea {
+ min-height: 23px;
+ border-radius: 3px;
+ vertical-align: middle;
}
.interpreter .interpreter-title {
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9b55f586/zeppelin-web/src/app/interpreter/interpreter.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html
index c586814..7f08742 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.html
+++ b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -399,28 +399,27 @@ limitations under the License.
</tr>
</thead>
<tr ng-repeat="key in setting.properties | sortByKey" >
- <td>{{key}}</td>
- <td>
+ <td style="vertical-align: middle;">{{key}}</td>
+ <td style="vertical-align: middle;">
<span editable-textarea="setting.properties[key]" e-form="valueform" e-msd-elastic>
{{setting.properties[key] | breakFilter}}
</span>
</td>
- <td ng-if="valueform.$visible">
+ <td style="vertical-align: middle;" ng-if="valueform.$visible">
<button class="btn btn-default btn-sm fa fa-remove"
ng-click="removeInterpreterProperty(key, setting.id)">
</button>
</td>
</tr>
<tr ng-if="valueform.$visible">
- <td>
+ <td style="vertical-align: middle;">
<input ng-model="setting.propertyKey"
- pu-elastic-input
- pu-elastic-input-minwidth="180px" />
+ pu-elastic-input pu-elastic-input-minwidth="180px" />
</td>
- <td>
+ <td style="vertical-align: middle;">
<textarea msd-elastic ng-model="setting.propertyValue"></textarea>
</td>
- <td>
+ <td style="vertical-align: middle;">
<button class="btn btn-default btn-sm fa fa-plus"
ng-click="addNewInterpreterProperty(setting.id)">
</button>