Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix borders

Browse source
This commit is contained in:
tinkoff-dwh 2017-07-24 11:27:45 +03:00
parent a0cd3b1d64
commit 8808b7bc23
2 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
zeppelin-web/src/app/notebook/notebook-actionBar.html
View file

@ -174,7 +174,8 @@ limitations under the License.
<div class="input-group input-group-sm search-group">
<span class="input-group-addon">Find</span>
<input type="text" class="form-control" id="findInput"
ng-class="{'no-match': !hasMatches() && search.searchText !== ''}"
ng-class="{'no-match': !hasMatches() && search.searchText !== '',
'has-match': search.searchText !== ''}"
ng-change="markAllOccurrencesAndHighlightFirst()"
ng-click="markAllOccurrencesAndHighlightFirst()" ng-keypress="onPressOnFindInput($event)"
ng-model="search.searchText" ng-trim="false"/>
@ -194,13 +195,16 @@ limitations under the License.
</div>
</div>
<div class="input-group input-group-sm search-group">
<span class="input-group-addon">Replace</span>
<input type="text" class="form-control" ng-model="search.replaceText" ng-trim="false"/>
<span class="input-group-addon" style="border-top-width: inherit">Replace</span>
<input type="text" class="form-control" ng-model="search.replaceText" ng-trim="false"
style="border-top-width: inherit"/>
<div class="input-group-btn">
<button class="btn btn-default" ng-click="replace()">Replace</button>
<button class="btn btn-default" ng-click="replace()"
style="border-top-width: inherit">Replace</button>
</div>
<div class="input-group-btn">
<button class="btn btn-default" ng-click="replaceAll()">All</button>
<button class="btn btn-default" ng-click="replaceAll()"
style="border-top-width: inherit">All</button>
</div>
</div>
</li>

34
zeppelin-web/src/app/notebook/notebook.css
View file

@ -334,31 +334,13 @@
.noteAction.headroom--unpinned { top: -100px; }
.noteAction.headroom--pinned { top: 50px; /** `noteAction` top */ }
.search-group input.no-match {
border: 1px solid red;
box-shadow: none;
}
.search-group .input-group-addon {
min-width: 64px;
}
.search-group input,
.search-group .input-group-addon,
.search-group .input-group-btn .btn {
border-radius: 0;
}
.search-dropdown {
border-radius: 0;
padding: 0;
}
.search-dropdown li {
margin: 0;
}
.search-group input.no-match {
#findInput.no-match {
border-left: 1px solid red !important;
border-top: 1px solid red !important;
border-bottom: 1px solid red !important;
@ -370,19 +352,22 @@
border-bottom: 1px solid red !important;
}
#findInput.has-match {
border-right: none;
}
.search-group .input-group-addon {
min-width: 64px;
}
.search-group input,
.search-group .input-group-addon,
.search-group .input-group-btn .btn {
border-radius: 0;
border-left-width: 0;
}
.search-dropdown {
border-radius: 0;
padding: 0;
border-width: 0;
}
.search-dropdown li {
@ -405,7 +390,6 @@
padding-left: 0;
}
#findInput {
border-right: none;
padding-right: 5px;
.search-group:nth-child(even) {
border-top-width: 0;
}