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/03/25 02:51:32 UTC
zeppelin git commit: [MINOR][ZEPPELIN-2306] Improve alignment of
components in Helium header
Repository: zeppelin
Updated Branches:
refs/heads/master c7f9ed307 -> a3c7f985f
[MINOR][ZEPPELIN-2306] Improve alignment of components in Helium header
### What is this PR for?
If there are 2 more enabled `VISUALIZATION` pkgs, the ordering control section will be shown like below. But the useless spaces between "Helium" and "Bundle package display order(drag and drop)".
So I changed some alignment to remove the extra space.
### What type of PR is it?
Improvement
### What is the Jira issue?
[ZEPPELIN-2306](https://issues.apache.org/jira/browse/ZEPPELIN-2306)
### How should this be tested?
Outline the steps to test the PR here.
### Screenshots (if appropriate)
- Before
<img width="1278" alt="screen shot 2017-03-24 at 12 55 12 am" src="https://cloud.githubusercontent.com/assets/10060731/24256864/a3940516-102c-11e7-9fe2-71ded6115c4f.png">
- After
1. more than 2 pkgs are enabled
<img width="1271" alt="after1" src="https://cloud.githubusercontent.com/assets/10060731/24256742/4e09d1f2-102c-11e7-9ef6-327f54d8a31a.png">
2. only 1 pkg is enabled
<img width="1267" alt="after2" src="https://cloud.githubusercontent.com/assets/10060731/24256794/6ac384dc-102c-11e7-8861-950a8ca35427.png">
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: RyuAhyoung <ah...@MacBook-Pro-5.local>
Closes #2184 from AhyoungRyu/ZEPPELIN-2306 and squashes the following commits:
5e1291b [RyuAhyoung] Improve alignment of components in Helium header
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a3c7f985
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a3c7f985
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a3c7f985
Branch: refs/heads/master
Commit: a3c7f985feb2a1b0e4bed5721c122b0fe3e41041
Parents: c7f9ed3
Author: RyuAhyoung <ah...@MacBook-Pro-5.local>
Authored: Fri Mar 24 00:47:28 2017 +0900
Committer: ahyoungryu <ah...@apache.org>
Committed: Sat Mar 25 11:51:26 2017 +0900
----------------------------------------------------------------------
zeppelin-web/src/app/helium/helium.css | 8 ++++++++
zeppelin-web/src/app/helium/helium.html | 9 +++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a3c7f985/zeppelin-web/src/app/helium/helium.css
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/helium/helium.css b/zeppelin-web/src/app/helium/helium.css
index 169d482..d43fc66 100644
--- a/zeppelin-web/src/app/helium/helium.css
+++ b/zeppelin-web/src/app/helium/helium.css
@@ -12,6 +12,10 @@
* limitations under the License.
*/
+.heliumHead {
+ padding-bottom: 34px !important;
+}
+
.heliumPackageContainer {
padding-bottom: 0px;
margin-bottom: 0px;
@@ -166,6 +170,10 @@
}
.localPkgInfo {
+ margin-right: 0;
+}
+
+.localPkgInfo p {
margin: 10px 12px 0 0;
font-size: 11px;
font-style: italic;
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a3c7f985/zeppelin-web/src/app/helium/helium.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/helium/helium.html b/zeppelin-web/src/app/helium/helium.html
index 9f35660..8ff223e3 100644
--- a/zeppelin-web/src/app/helium/helium.html
+++ b/zeppelin-web/src/app/helium/helium.html
@@ -11,7 +11,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-<div class="interpreterHead">
+<div class="interpreterHead"
+ ng-class="(bundleOrder.length > 1) ? '' : 'heliumHead'">
<div class="header">
<div class="row">
<div class="col-md-12">
@@ -34,7 +35,6 @@ limitations under the License.
<i class="fa fa-cube"></i>
{{pkgTypes}}
</button>
- <p class="localPkgInfo">* Local registry package's name is gray colored.</p>
</div>
</div>
</div>
@@ -60,6 +60,11 @@ limitations under the License.
</div>
</div>
</div>
+ <div class="pull-right row localPkgInfo">
+ <div class="col-md-12">
+ <p>* Local registry package's name is gray colored.</p>
+ </div>
+ </div>
</div>
</div>