aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonikahedman <monika_hedman@brown.edu>2019-07-14 12:56:11 -0400
committermonikahedman <monika_hedman@brown.edu>2019-07-14 12:56:11 -0400
commit7cd915c98db61e646ab34184613c1f6364cb620e (patch)
treedb44d787964be0e6df5be473954543b3ed01ca4e
parent81d23dbd7b918fd1812b770960687bc8a12a0a34 (diff)
submit button added
-rw-r--r--deploy/index.html1
-rw-r--r--src/client/views/search/SearchBox.scss3
-rw-r--r--src/client/views/search/SearchBox.tsx1
-rw-r--r--src/client/views/search/SearchItem.scss56
4 files changed, 35 insertions, 26 deletions
diff --git a/deploy/index.html b/deploy/index.html
index f4a019b71..532b995f8 100644
--- a/deploy/index.html
+++ b/deploy/index.html
@@ -6,7 +6,6 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<script src="https://cdnjs.cloudflare.com/ajax/libs/typescript/3.3.1/typescript.min.js"></script>
- <script src="https://rawgithub.com/juliangarnier/anime/master/anime.min.js"></script>
</head>
<body>
diff --git a/src/client/views/search/SearchBox.scss b/src/client/views/search/SearchBox.scss
index 2a27bbe62..08d3a65f1 100644
--- a/src/client/views/search/SearchBox.scss
+++ b/src/client/views/search/SearchBox.scss
@@ -41,11 +41,10 @@
}
.searchBox-results {
- margin-left: 27px;
+ margin-right: 142px;
top: 300px;
display: flex;
flex-direction: column;
- margin-right: 72px;
height: 560px;
overflow: hidden;
overflow-y: auto;
diff --git a/src/client/views/search/SearchBox.tsx b/src/client/views/search/SearchBox.tsx
index 7dcfbe1ef..cddc56a8a 100644
--- a/src/client/views/search/SearchBox.tsx
+++ b/src/client/views/search/SearchBox.tsx
@@ -176,6 +176,7 @@ export class SearchBox extends React.Component {
<input value={this._searchString} onChange={this.onChange} type="text" placeholder="Search..."
className="searchBox-barChild searchBox-input" onPointerDown={this.openSearch} onKeyPress={this.enter}
style={{ width: this._resultsOpen ? "500px" : "100px" }} />
+ <button className="searchBox-barChild searchBox-submit" onClick={this.submitSearch} onPointerDown={FilterBox.Instance.stopProp}>Submit</button>
<button className="searchBox-barChild searchBox-filter" onClick={FilterBox.Instance.openFilter} onPointerDown={FilterBox.Instance.stopProp}>Filter</button>
</div>
<div className="searchBox-results" style={this._resultsOpen ? { display: "flex" } : { display: "none" }}>
diff --git a/src/client/views/search/SearchItem.scss b/src/client/views/search/SearchItem.scss
index fa4c9cb38..04ebf2714 100644
--- a/src/client/views/search/SearchItem.scss
+++ b/src/client/views/search/SearchItem.scss
@@ -73,34 +73,38 @@
-o-transition: opacity 0.2s ease-in-out;
transition: opacity 0.2s ease-in-out;
}
- }
- .link-container.item:hover {
- width: 70px;
}
- .link-container.item:hover .link-count {
- opacity: 0;
- }
+ // .link-container.item:hover {
+ // width: 70px;
+ // }
+
+ // .link-container.item:hover .link-count {
+ // opacity: 0;
+ // }
+
+ // .link-container.item:hover .link-extended {
+ // opacity: 1;
+ // }
- .link-container.item:hover .link-extended {
- opacity: 1;
- }
-
.icon-icons {
- width:50px
+ width: 50px
}
+
.icon-live {
- width:175px;
+ width: 175px;
}
- .icon-icons, .icon-live {
- height:50px;
- margin:auto;
+ .icon-icons,
+ .icon-live {
+ height: 50px;
+ margin: auto;
overflow: hidden;
+
.search-type {
display: inline-block;
- width:100%;
+ width: 100%;
position: absolute;
justify-content: center;
align-items: center;
@@ -112,10 +116,11 @@
overflow: hidden;
img {
- width:100% !important;
- height:auto !important;
+ width: 100% !important;
+ height: auto !important;
}
}
+
.search-type:hover+.search-label {
opacity: 1;
}
@@ -134,16 +139,18 @@
}
.icon-live:hover {
- height:175px;
+ height: 175px;
+
.pdfBox-cont {
img {
- width:100% !important;
+ width: 100% !important;
}
}
}
}
+
.search-info:hover {
- width:60%;
+ width: 60%;
}
}
}
@@ -176,12 +183,15 @@
}
}
+
.search-overview:hover {
z-index: 1;
}
+
.collection {
- display:flex;
+ display: flex;
}
+
.collection-item {
- width:35px;
+ width: 35px;
} \ No newline at end of file