Merge branch 'development' of github.com:huridocs/uwazi into development

huridocs · Jun 6, 2016 · 3d075c1 · 3d075c1
2 parents 643c445 + 1c38341
commit 3d075c1
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 251 deletions.
diff --git a/app/react/App/scss/elements/_item.scss b/app/react/App/scss/elements/_item.scss
@@ -2,12 +2,12 @@
 	list-style-type: none;
 	padding-bottom: 15px;
 	@include desktop {
-		margin-left: -4px;
-		margin-right: -4px;
-
+		padding: 0 11px;
+    display: block;
+    margin: auto;
+    max-width: 960px;
 		li {
 			position: static;
-			//height: 140px;
 			padding: 0 4px;
 		}
 	}
@@ -168,7 +168,11 @@
 
 .sort-by {
 	text-align: center;
+	padding: 0 15px;
 	@include desktop {
+		display: block;
+    margin: auto;
+    max-width: 960px;
 		text-align: right;
 		#documents-counter {
 			text-align: left;

diff --git a/app/react/App/scss/modules/_document.scss b/app/react/App/scss/modules/_document.scss
@@ -1,9 +1,6 @@
 .document-viewer {
 	transform: translateX(0%);
 	transition: all 500ms;
-	&.is-active {
-		transform: translateX(-20%);
-	}
 	&.is-active-2 {
 		transform: translateX(-100%);
 	}
@@ -152,124 +149,3 @@
 	transition: right 500ms, opacity 0ms;
 	width: 33%;
 }
-
-.create-modal {
-	position: absolute;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	background: $c-primary-lighten;
-	width: 400px;
-	padding: 15px;
-	transform: translateX(100%);
-	transition: all 500ms;
-	overflow-y: scroll;
-	padding-bottom: 0px; /* footer height (magic number) */
-	&.is-active {
-		transform: translateX(0);
-	}
-
-	h1 {
-		text-transform: uppercase;
-		letter-spacing: 0.05em;
-		font-size: $f-size-lg;
-		padding-right: 30px;
-		padding-bottom: 15px;
-		margin: 0;
-		border-bottom: 1px solid $c-grey;
-	}
-	.close-modal {
-		position: absolute;
-		top: 15px;
-		right: 15px;
-		font-size: 20px;
-		opacity: 0.5;
-		cursor: pointer;
-		&:hover {
-			opacity: 1;
-		}
-	}
-	.item-group {
-		padding: 15px 0px;
-		margin: 0 -2px 15px;
-		overflow-y: scroll;
-		height: 100%;
-	}
-	.item {
-		height: auto;
-		margin-bottom: 5px;
-		padding: 15px 15px 0;
-		border-color: $c-white;
-		&:after {
-			content: '\f00c';
-			font-family: FontAwesome;
-			position: absolute;
-			top: 30%;
-		  left: 42%;
-		  font-size: 40px;
-			color: $c-success;
-			opacity: 0;
-			transition: 500ms all;
-		}
-		&.is-selected {
-			background: $c-primary-lighten;
-			color: $c-primary-light;
-			border: 1px solid $c-primary-light;
-			&:after {
-				opacity: 1;
-				top: -5px;
-			}
-			&:before {
-				display: none;
-			}
-		}
-		.item-name {
-			font-size: $f-size;
-		}
-	}
-}
-
-.ref-modal {
-	position: fixed;
-	right: 0;
-	top: 60px;
-	bottom: 0;
-	border-left: 1px dotted $c-grey;
-	width: 400px;
-	padding: 15px;
-	transform: translateX(100%);
-	transition: all 500ms;
-	&.is-active {
-		transform: translateX(0);
-	}
-
-	h1 {
-		text-transform: uppercase;
-		letter-spacing: 0.05em;
-		font-size: $f-size-lg;
-	}
-	.item-group {
-		padding: 15px 0px;
-		margin: 0 -2px 15px;
-		overflow-y: scroll;
-		height: 80%;
-	}
-	.item {
-		height: auto;
-		margin-bottom: 5px;
-		padding: 15px;
-		border-color: $c-white;
-
-		&.is-selected {
-			&:before {
-				display: none;
-			}
-		}
-		&.leave {
-			opacity: 0;
-		}
-		.item-name {
-			font-size: $f-size;
-		}
-	}
-}
diff --git a/app/react/App/scss/modules/_uploads.scss b/app/react/App/scss/modules/_uploads.scss
@@ -1,4 +1,7 @@
 .upload-box {
+	display: block;
+	margin: auto;
+	max-width: 960px;
 	border: 1px dashed $c-grey;
 	text-align: center;
 	padding: 45px;

diff --git a/app/react/Layout/Lists.js b/app/react/Layout/Lists.js
@@ -55,7 +55,7 @@ ItemFooter.Label = ItemLabel;
 ItemFooter.ProgressBar = ProgressBar;
 
 let RowList = ({children}) => {
-  return <div className="item-group row">{children}</div>;
+  return <div className="row"><div className="item-group">{children}</div></div>;
 };
 
 let RowListItem = ({children, status, onClick, active}) => {

diff --git a/app/react/Layout/SidePanel.js b/app/react/Layout/SidePanel.js
@@ -4,7 +4,7 @@ import './scss/sidepanel.scss';
 export class SidePanel extends Component {
   render() {
     return (
-      <aside className={'create-modal side-panel ' + (this.props.open ? 'is-active' : 'is-hidden')}>
+      <aside className={'create-modal col-sm-4 col-md-3 side-panel ' + (this.props.open ? 'is-active' : 'is-hidden')}>
         {this.props.children}
       </aside>
     );

diff --git a/app/react/Layout/scss/sidepanel.scss b/app/react/Layout/scss/sidepanel.scss
@@ -8,10 +8,10 @@
 	top: 60px;
 	bottom: 0;
 	border-left: 1px dotted $c-grey;
-	width: 400px;
 	padding: 15px;
 	transition: all 500ms;
 	overflow-y: scroll;
+	background: $c-primary-lighten;
 
 	&.is-active {
 		transform: translateX(0);

diff --git a/app/react/Library/components/DocumentsList.js b/app/react/Library/components/DocumentsList.js
@@ -9,7 +9,7 @@ export class DocumentsList extends Component {
   render() {
     let documents = this.props.documents.toJS();
     return (
-      <main className={'document-viewer col-sm-8 col-sm-offset-2 ' + (this.props.filtersPanel ? 'is-active' : '')}>
+      <main className={'document-viewer ' + (this.props.filtersPanel ? 'col-xs-12 col-sm-8 col-md-9 is-active' : 'col-xs-12')}>
         <div className="sort-by">
           <div className="row">
             <h1 id="documents-counter" className="col-sm-7 page-title">1-12 of 39 documents for "africa"</h1>

diff --git a/app/react/Uploads/components/UploadsSection.js b/app/react/Uploads/components/UploadsSection.js
@@ -30,13 +30,13 @@ export class UploadsSection extends Component {
   }
 
   render() {
-    let className = 'document-viewer';
+    let className = 'document-viewer col-xs-12';
     if (this.props.panelIsOpen) {
-      className = 'document-viewer with-panel';
+      className = 'document-viewer with-panel col-xs-12 col-sm-8 col-md-9';
     }
     return (
       <div className="row">
-        <main className={'col-sm-8 col-sm-offset-2 ' + className}>
+        <main className={className}>
           <UploadBox />
           <UploadsList socket={this.socket}/>
         </main>

diff --git a/app/react/Viewer/components/Viewer.js b/app/react/Viewer/components/Viewer.js
@@ -33,17 +33,17 @@ export class Viewer extends Component {
   }
 
   render() {
-    let className = 'document-viewer';
+    let className = 'document-viewer col-xs-12';
     if (this.props.panelIsOpen) {
-      className = 'document-viewer with-panel';
+      className = 'document-viewer with-panel col-xs-12 col-sm-8 col-md-9';
     }
     if (this.props.targetDoc) {
-      className = 'document-viewer show-target-document';
+      className = 'document-viewer show-target-document col-xs-12';
     }
 
     return (
       <div>
-        <main className={className + ' col-sm-8 col-sm-offset-2'}>
+        <main className={className}>
           <SourceDocument />
           <TargetDocument />
         </main>