Commit 2b938630 authored by kliger's avatar kliger

bug fixes

parent 8ad88379
......@@ -23,10 +23,66 @@
// @import "{}/imports/ui/stylesheets/answer-count-font.ttf";
.classic-padding-top {
padding-top: 15px;
}
.classic-padding-bottom {
padding-bottom: 15px;
}
.clickable {
cursor: pointer;
}
body {
background-color: #f5f5f5 !important;
}
.flatly {
.btn-success:hover {
color: #ffffff;
background-color: #128f76;
border-color: #11866f;
}
.btn {
border-width: 2px;
}
.btn-block {
display: block;
width: 100%;
}
.btn-success {
color: #ffffff;
background-color: #18bc9c;
border-color: #18bc9c;
}
.btn {
display: inline-block;
margin-bottom: 0;
font-weight: normal;
text-align: center;
vertical-align: middle;
-ms-touch-action: manipulation;
touch-action: manipulation;
cursor: pointer;
background-image: none;
border: 1px solid transparent;
white-space: nowrap;
padding: 10px 15px;
font-size: 15px;
line-height: 1.42857143;
border-radius: 4px;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.btn:hover {
margin: 0 !important;
border-bottom-width: 1px;
}
a {
color: #18bc9c;
text-decoration: none;
}
a {
background-color: transparent;
}
}
\ No newline at end of file
......@@ -24,7 +24,7 @@ export const Answer = Class.create({
{
type: 'maxLength',
param: 30,
message: 'תשובה ארוכה מידי',
message: 'תשובה ארוכה מדי',
},
{
type: 'regexp',
......@@ -94,7 +94,7 @@ export const Question = Class.create({
{
type: 'gte',
param: 5,
message: 'מעט מידי זמן לשאלה',
message: 'מעט מדי זמן לשאלה',
},
{
type: 'lte',
......
......@@ -50,10 +50,12 @@ const QuizForm = ({ quiz, validate, actions }) => {
</div>
))}
<div className="row" id="add-question-btn-row">
<button className="btn btn-lg btn-block" onClick={actions.addQuestion}>
<span className="glyphicon glyphicon-plus" aria-hidden="true" />
<span> הוסף שאלה</span>
</button>
<div className="flatly classic-padding-bottom">
<button className="btn btn-lg btn-block" onClick={actions.addQuestion}>
<span className="glyphicon glyphicon-plus" aria-hidden="true" />
<span> הוסף שאלה</span>
</button>
</div>
</div>
<div className="row">
<div className="panel panel-default">
......@@ -93,13 +95,15 @@ const QuizForm = ({ quiz, validate, actions }) => {
</div>
</div>
<div className="row">
<button
id="quiz-form-submit"
className="btn btn-success btn-lg btn-block"
onClick={actions.saveQuiz}
>
<span className="glyphicon glyphicon-ok" aria-hidden="true" />
</button>
<div className="flatly classic-padding-top">
<button
id="quiz-form-submit"
className="btn btn-success btn-lg btn-block"
onClick={actions.saveQuiz}
>
<span className="glyphicon glyphicon-ok" aria-hidden="true" />
</button>
</div>
</div>
</div>
</div>
......
import React from 'react';
const NotFound = () =>
const NotFound = () => (
<div id="not-found">
<div className="not-found-image">
<img src="/img/404.svg" alt="" />
<div className="game-background" />
<div className="row">
<img className="logo" src="/img/Logo.svg"/>
</div>
<div className="not-found-title">
<h1>Sorry, that page doesn't exist</h1>
<a href="/" className="gotohomepage">Go to home</a>
<div className="row">
<div className="not-found-title">
<h1>אופסססס...</h1>
<h3>מתנצלים, נראה שהעמוד הזה פשוט לא קיים!</h3>
<a href="/" className="gotohomepage">חזור לדף הבית</a>
</div>
</div>
</div>;
</div>
);
export default NotFound;
......@@ -18,7 +18,7 @@ class Search extends React.Component {
};
}
render() {
const { results } = this.props;
const { results, query } = this.props;
const showDeleteAlert = (quiz) => {
this.setState({ quizToDelete: quiz, showDeleteQuizAlert: true });
};
......@@ -55,6 +55,7 @@ class Search extends React.Component {
<img className="col-md-6" src="/img/no-search-results-text.png" alt="No Search Results" />
</div>
: <div id="search">
<h1>תוצאות חיפוש עבור <strong>{ query }</strong></h1>
<ul>
{results.map(quiz =>
<div key={quiz._id}>
......@@ -95,9 +96,9 @@ class Search extends React.Component {
}
}
const SearchContainer = ({ results, loading }) => {
const SearchContainer = ({ results, loading, query }) => {
if (loading) return <Loading />;
return <Search results={results} />;
return <Search results={results} query={query} />;
};
export default createContainer(({ query = '' }) => {
......@@ -109,5 +110,6 @@ export default createContainer(({ query = '' }) => {
return {
loading,
results,
query,
};
}, SearchContainer);
#not-found {
width: 700px;
margin: 0 auto;
.not-found-image {
width: 25%;
float: left;
}
margin: auto;
text-align: center;
color: #fff;
padding-top: 80px;
.not-found-title {
width: 70%;
float: right;
background: url(/img/bg-footer.svg);
background-repeat: no-repeat;
background-position: center;
background-size: contain;
min-height: 400px;
h1 {
font-size: 30px;
color: #1f2128;
font-size: 46px;
color: #fff;
margin-bottom: 20px;
margin-top: 155px;
}
h3 {
color: #fff;
}
a.gotohomepage {
background-color: #de4f4f;
......@@ -30,6 +23,12 @@
text-decoration: none;
text-transform: uppercase;
height: 40px;
margin: auto;
}
}
}
@media(min-height: 850px){
#not-found {
padding-top: 18%;
}
}
......@@ -33,17 +33,20 @@
margin-bottom: 0;
}
#add-question-btn-row {
margin-bottom: 15px;
button {
.btn {
background-color: #fff;
border: solid 1px #158cba;
color: #158cba;
}
}
#quiz-form-submit {
margin-top: 15px;
.btn:hover {
background-color: #eee;
}
}
#submit-panel {
padding-bottom: 0;
}
&-submit {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
}
#quiz-management-main {
padding-top: 50px;
.tab-btns {
margin-bottom: 20px;
}
......@@ -76,9 +77,29 @@
.btn {
margin: 0;
border-width: 1px;
border-top: none;
border-right: none;
border-left: none;
&:hover {
margin: 0;
border-width: 1px;
border-top: none !important;
border-right: none !important;
border-left: none !important;
}
&:focus {
margin: 0;
border-width: 1px;
border-top: none !important;
border-right: none !important;
border-left: none !important;
}
&:active {
margin: 0;
border-width: 1px;
border-top: none !important;
border-right: none !important;
border-left: none !important;
}
}
.btn-default {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment