Skip to content

Commit

Permalink
Paragraph CSS to its own file
Browse files Browse the repository at this point in the history
So far, the Paragraph's CSS is mixed in the notebook.css file.
This PR is made to move Paragraph's CSS to its own file.

Author: Damien Corneau <corneadoug@gmail.com>

Closes #311 from corneadoug/improve/SeparateParagraphCss and squashes the following commits:

59c1676 [Damien Corneau] Improve Report CSS
7f6c877 [Damien Corneau] Final split of Paragraph CSS
c2fa5bc [Damien Corneau] Fix CSS files spacing
ac626ef [Damien Corneau] More CSS moved to paragraph CSS
db178ce [Damien Corneau] Clean up looknfeel css
af317cc [Damien Corneau] Moving css to paragraph.css file
  • Loading branch information
corneadoug committed Sep 25, 2015
1 parent aa13633 commit 6bc13e2
Show file tree
Hide file tree
Showing 12 changed files with 485 additions and 579 deletions.
61 changes: 28 additions & 33 deletions zeppelin-web/src/app/home/home.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ body {
color: #212121;
}

html,body { height: 100%;}
html,
body {
height: 100%;
}

.bodyAsIframe {
background: white;
Expand All @@ -27,10 +30,10 @@ html,body { height: 100%;}
display: inline !important;
}


body.asIframe {
padding-top: 0px;
}

body .navbar {
margin-bottom: 0px;
}
Expand All @@ -50,16 +53,20 @@ body .navbar {
font-size: 18px;
}

.navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus {
.navbar-inverse .navbar-nav > .open > a,
.navbar-inverse .navbar-nav > .open > a:hover,
.navbar-inverse .navbar-nav > .open > a:focus {
color: #fff;
background-color: #3071a9;
}

.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
.navbar-inverse .navbar-toggle:hover,
.navbar-inverse .navbar-toggle:focus {
background-color: #3071a9;
}

.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus {
.navbar-inverse .navbar-nav > li > a:hover,
.navbar-inverse .navbar-nav > li > a:focus {
color: #fff;
background-color: rgba(0, 0, 0, 0.2);

Expand All @@ -69,7 +76,9 @@ body .navbar {
border-color: #FFFFFF;
}

.navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus {
.navbar-inverse .navbar-nav > .active > a,
.navbar-inverse .navbar-nav > .active > a:hover,
.navbar-inverse .navbar-nav > .active > a:focus {
color: #fff;
background-color: #080808;
}
Expand Down Expand Up @@ -99,6 +108,7 @@ a.navbar-brand:hover {
color: #333;
white-space: nowrap;
}

.dropdown-menu > .scrollbar-container > li > a:hover,
.dropdown-menu > .scrollbar-container > li > a:focus {
color: #262626;
Expand Down Expand Up @@ -148,7 +158,6 @@ a.navbar-brand:hover {
}
}


#main {
padding: 10px;
height: 100%;
Expand All @@ -166,7 +175,7 @@ a.navbar-brand:hover {
}

.server-status {
font-size:12px;
font-size: 12px;
margin-top: 6px;
}

Expand All @@ -180,14 +189,10 @@ a.navbar-brand:hover {
font-weight: bold !important;
}


/**
* Box and well
*/
.box{
.box {
border-style: solid;
min-height: 20px;
padding: 10px;
padding: 19px;
margin-bottom: 20px;
}

Expand All @@ -201,39 +206,27 @@ a.navbar-brand:hover {
box-shadow: none;
}

.box-heading{
position:relative;
.box-heading {
position: relative;
max-width: 100%;
/*font-size: 20px;*/
font-weight:300;
white-space: nowrap;
/*overflow:hidden;*/
text-overflow: ellipsis;
vertical-align: middle;
margin: 0 0 15px;
padding-bottom: 2px;
}
/**
h1.box-heading,
h2.box-heading,
h3.box-heading,
h4.box-heading,
h5.box-heading,
h6.box-heading{
font-size: 20px;
}*/

.box-heading > .btn-group,
.box-heading > .btn{
.box-heading > .btn {
margin-top: -3px;
}


.icheck-label{
.icheck-label {
position: relative;
top: 0;
}


.zeppelin {
background-image: url('/assets/images/zepLogo.png');
background-repeat: no-repeat;
Expand Down Expand Up @@ -283,7 +276,9 @@ kbd {
min-height: 400px;
}

/* ngToast style */
/*
ngToast Style
*/

.ng-toast .alert {
color: white !important;
Expand Down Expand Up @@ -312,5 +307,5 @@ This part should be removed when new version of bootstrap handles this issue.
*/
.btn-group > .tooltip + .btn,
.btn-group > .popover + .btn {
margin-left:-1px;
margin-left: -1px;
}
14 changes: 7 additions & 7 deletions zeppelin-web/src/app/interpreter/interpreter.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
font-family: 'Roboto', sans-serif;
}

.interpreterHead textarea, .interpreter textarea {
.interpreterHead textarea,
.interpreter textarea {
width: 100%;
display: block;
height: 20px;
Expand All @@ -37,11 +38,11 @@
}

.interpreter .interpreter-title {
font-size:20px;
font-weight:bold;
color:#3071a9;
float:left;
margin-top:0px;
font-size: 20px;
font-weight: bold;
color: #3071a9;
float: left;
margin-top: 0px;
}

.interpreter ul {
Expand All @@ -53,7 +54,6 @@
list-style-type: none;
}


.interpreter table tr .interpreterPropertyKey {
padding : 5px 5px 5px 5px;
}
Expand Down
Loading

0 comments on commit 6bc13e2

Please sign in to comment.